Index: lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java
===================================================================
diff -u -r000b1a618775ec928f4107cf902595cb4bdaa919 -rb9d108908940cd377d1c092fd32b2dea39d4c4f1
--- lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java (.../Tool.java) (revision 000b1a618775ec928f4107cf902595cb4bdaa919)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java (.../Tool.java) (revision b9d108908940cd377d1c092fd32b2dea39d4c4f1)
@@ -503,4 +503,9 @@
return new AuthoringToolDTO(this);
}
+ public BasicToolVO createBasicToolVO() {
+ BasicToolVO vo = new BasicToolVO();
+ vo.setAuthorUrl(this.getAuthorUrl());
+ return vo;
+ }
}
Index: lams_common/src/java/org/lamsfoundation/lams/tool/dao/IToolDAO.java
===================================================================
diff -u -rd07ab22c47381f20a9773e08503dacab3040f111 -rb9d108908940cd377d1c092fd32b2dea39d4c4f1
--- lams_common/src/java/org/lamsfoundation/lams/tool/dao/IToolDAO.java (.../IToolDAO.java) (revision d07ab22c47381f20a9773e08503dacab3040f111)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/dao/IToolDAO.java (.../IToolDAO.java) (revision b9d108908940cd377d1c092fd32b2dea39d4c4f1)
@@ -11,7 +11,6 @@
import java.util.List;
-import org.lamsfoundation.lams.tool.BasicToolVO;
import org.lamsfoundation.lams.tool.Tool;
@@ -26,6 +25,6 @@
public Tool getToolByID(Long toolID);
public List getAllTools();
- public BasicToolVO getToolBySignature(final String toolSignature);
+ public Tool getToolBySignature(final String toolSignature);
public long getToolDefaultContentIdBySignature(final String toolSignature);
}
Index: lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolDAO.java
===================================================================
diff -u -rd07ab22c47381f20a9773e08503dacab3040f111 -rb9d108908940cd377d1c092fd32b2dea39d4c4f1
--- lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolDAO.java (.../ToolDAO.java) (revision d07ab22c47381f20a9773e08503dacab3040f111)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolDAO.java (.../ToolDAO.java) (revision b9d108908940cd377d1c092fd32b2dea39d4c4f1)
@@ -30,7 +30,7 @@
public class ToolDAO extends HibernateDaoSupport implements IToolDAO
{
private static final String FIND_ALL = "from obj in class " + Tool.class.getName();
- private static final String LOAD_TOOL_BY_SIG = "from tool in class BasicToolVO where tool.toolSignature=:toolSignature";
+ private static final String LOAD_TOOL_BY_SIG = "from tool in class Tool where tool.toolSignature=:toolSignature";
/**
@@ -45,9 +45,9 @@
return this.getHibernateTemplate().find(FIND_ALL);
}
- public BasicToolVO getToolBySignature(final String toolSignature)
+ public Tool getToolBySignature(final String toolSignature)
{
- return (BasicToolVO) getHibernateTemplate().execute(new HibernateCallback()
+ return (Tool) getHibernateTemplate().execute(new HibernateCallback()
{
public Object doInHibernate(Session session) throws HibernateException
{
@@ -60,7 +60,7 @@
public long getToolDefaultContentIdBySignature(final String toolSignature)
{
- BasicToolVO tool= (BasicToolVO) getHibernateTemplate().execute(new HibernateCallback()
+ Tool tool= (Tool) getHibernateTemplate().execute(new HibernateCallback()
{
public Object doInHibernate(Session session) throws HibernateException
{
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java
===================================================================
diff -u -rd07ab22c47381f20a9773e08503dacab3040f111 -rb9d108908940cd377d1c092fd32b2dea39d4c4f1
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java (.../LamsToolService.java) (revision d07ab22c47381f20a9773e08503dacab3040f111)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java (.../LamsToolService.java) (revision b9d108908940cd377d1c092fd32b2dea39d4c4f1)
@@ -25,6 +25,7 @@
import java.util.List;
import org.lamsfoundation.lams.tool.BasicToolVO;
+import org.lamsfoundation.lams.tool.Tool;
import org.lamsfoundation.lams.tool.dao.IToolDAO;
@@ -39,8 +40,9 @@
*/
public class LamsToolService implements ILamsToolService
{
- protected IToolDAO toolDAO;
+ public IToolDAO toolDAO;
/**
+ * TODO Implement me!
* @see org.lamsfoundation.lams.tool.service.ILamsCoreToolService#getAllPotentialLearners(long)
*/
public List getAllPotentialLearners(long toolContentID) throws LamsToolServiceException
@@ -50,7 +52,8 @@
public BasicToolVO getToolBySignature(final String toolSignature)
{
- return toolDAO.getToolBySignature(toolSignature);
+ Tool tool = toolDAO.getToolBySignature(toolSignature);
+ return tool.createBasicToolVO();
}
public long getToolDefaultContentIdBySignature(final String toolSignature)
Index: lams_common/test/java/org/lamsfoundation/lams/tool/toolApplicationContext.xml
===================================================================
diff -u -r0735f8bbbe378127d27795e3d9773f3c1293ed41 -rb9d108908940cd377d1c092fd32b2dea39d4c4f1
--- lams_common/test/java/org/lamsfoundation/lams/tool/toolApplicationContext.xml (.../toolApplicationContext.xml) (revision 0735f8bbbe378127d27795e3d9773f3c1293ed41)
+++ lams_common/test/java/org/lamsfoundation/lams/tool/toolApplicationContext.xml (.../toolApplicationContext.xml) (revision b9d108908940cd377d1c092fd32b2dea39d4c4f1)
@@ -52,19 +52,22 @@
-
-
-
-
+
+
+
+
+
PROPAGATION_REQUIRED,readOnly
-
+
+
+
+
+