Index: lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java,v
diff -u -r1.8 -r1.9
--- lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java 1 Jun 2005 02:45:21 -0000 1.8
+++ lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java 28 Jun 2005 01:35:31 -0000 1.9
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/dao/IToolDAO.java,v
diff -u -r1.4 -r1.5
--- lams_common/src/java/org/lamsfoundation/lams/tool/dao/IToolDAO.java 27 Jun 2005 00:41:36 -0000 1.4
+++ lams_common/src/java/org/lamsfoundation/lams/tool/dao/IToolDAO.java 28 Jun 2005 01:35:46 -0000 1.5
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolDAO.java,v
diff -u -r1.4 -r1.5
--- lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolDAO.java 27 Jun 2005 00:41:37 -0000 1.4
+++ lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolDAO.java 28 Jun 2005 01:35:52 -0000 1.5
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java,v
diff -u -r1.10 -r1.11
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java 27 Jun 2005 00:41:37 -0000 1.10
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java 28 Jun 2005 01:36:07 -0000 1.11
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/tool/Attic/toolApplicationContext.xml,v
diff -u -r1.9 -r1.10
--- lams_common/test/java/org/lamsfoundation/lams/tool/toolApplicationContext.xml 18 Mar 2005 03:19:26 -0000 1.9
+++ lams_common/test/java/org/lamsfoundation/lams/tool/toolApplicationContext.xml 28 Jun 2005 01:36:15 -0000 1.10
@@ -52,19 +52,22 @@
-
-
-
-
+
+
+
+
+
PROPAGATION_REQUIRED,readOnly
-
+
+
+
+
+