Index: lams_contentrepository/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/build.xml,v
diff -u -r1.23 -r1.24
--- lams_contentrepository/build.xml 7 Nov 2005 01:44:06 -0000 1.23
+++ lams_contentrepository/build.xml 24 Feb 2006 11:43:18 -0000 1.24
@@ -77,34 +77,13 @@
-
-
-
-
-
-
-
-
-
- You must download several jar files before you can build Middlegen.
- Execute the "download-deps" target. Then try to build again.
-
- If you are behind a proxy, you should define the properties
- http.proxyHost and http.proxyPort. Example:
-
- ant -Dhttp.proxyHost=foo.com -Dhttp.proxyPort=8080
-
- It's also possible to download the jars manually.
-
-
-
@@ -244,15 +223,39 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
@@ -294,8 +297,7 @@
+ description="Generate the hibernate hbm.xml files from the Java source (using XDoclet)">
+
+
+
+
+
Index: lams_contentrepository/conf/xdoclet/global-forwards.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/conf/xdoclet/global-forwards.xml,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_contentrepository/conf/xdoclet/global-forwards.xml 24 Feb 2006 11:43:17 -0000 1.1
@@ -0,0 +1,3 @@
+
+
+
Index: lams_contentrepository/conf/xdoclet/listeners.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/conf/xdoclet/listeners.xml,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_contentrepository/conf/xdoclet/listeners.xml 24 Feb 2006 11:43:17 -0000 1.1
@@ -0,0 +1,6 @@
+
+
+ org.springframework.web.context.ContextLoaderListener
+
+
+
Index: lams_contentrepository/conf/xdoclet/servlet-mappings.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/conf/xdoclet/servlet-mappings.xml,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_contentrepository/conf/xdoclet/servlet-mappings.xml 24 Feb 2006 11:43:17 -0000 1.1
@@ -0,0 +1,14 @@
+
+ action
+ *.do
+
+
+
+ Download
+ /download/*
+
+
+
+ TestLogin
+ /testlogin
+
Index: lams_contentrepository/conf/xdoclet/servlets.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/conf/xdoclet/servlets.xml,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_contentrepository/conf/xdoclet/servlets.xml 24 Feb 2006 11:43:17 -0000 1.1
@@ -0,0 +1,36 @@
+
+ action
+ org.apache.struts.action.ActionServlet
+
+ config
+ /WEB-INF/struts/struts-config.xml
+
+
+ debug
+ 3
+
+
+ detail
+ 3
+
+ 0
+
+
+
+
+
+
+
+ Download file(s)
+ Download file
+ Download
+ org.lamsfoundation.lams.contentrepository.struts.action.Download
+ 1
+
+
+
+ Test Login
+ Test Login
+ TestLogin
+ org.lamsfoundation.lams.contentrepository.struts.action.TestLogin
+
Index: lams_contentrepository/conf/xdoclet/struts-message-resources.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/conf/xdoclet/struts-message-resources.xml,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_contentrepository/conf/xdoclet/struts-message-resources.xml 24 Feb 2006 11:43:17 -0000 1.1
@@ -0,0 +1 @@
+
Index: lams_contentrepository/conf/xdoclet/taglibs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/conf/xdoclet/taglibs.xml,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_contentrepository/conf/xdoclet/taglibs.xml 24 Feb 2006 11:43:17 -0000 1.1
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+ tags-bean
+ /WEB-INF/struts/tlds/struts-bean.tld
+
+
+
+ tags-html
+ /WEB-INF/struts/tlds/struts-html.tld
+
+
+
+ tags-logic
+ /WEB-INF/struts/tlds/struts-logic.tld
+
+
+
+ tags-tiles
+ /WEB-INF/struts/tlds/struts-tiles.tld
+
+
+
+
+
+
+ tags-fmt
+ /WEB-INF/jstl/tlds/fmt.tld
+
+
+
+ tags-core
+ /WEB-INF/jstl/tlds/c.tld
+
+
+
+ tags-function
+ /WEB-INF/jstl/tlds/fn.tld
+
+
+
+ tags-xml
+ /WEB-INF/jstl/tlds/x.tld
+
+
+
+
\ No newline at end of file
Index: lams_contentrepository/conf/xdoclet/web-settings.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/conf/xdoclet/web-settings.xml,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_contentrepository/conf/xdoclet/web-settings.xml 24 Feb 2006 11:43:17 -0000 1.1
@@ -0,0 +1,7 @@
+
+ contextConfigLocation
+
+ classpath:/org/lamsfoundation/lams/applicationContext.xml
+ classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
+
+
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/AddFileContentAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/AddFileContentAction.java,v
diff -u -r1.4 -r1.5
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/AddFileContentAction.java 21 Apr 2005 03:39:03 -0000 1.4
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/AddFileContentAction.java 24 Feb 2006 11:43:18 -0000 1.5
@@ -44,7 +44,14 @@
* Creation date: 11-30-2004
*
* XDoclet definition:
- * @struts:action path="/addFileContent" name="addFileContentForm" input="nodeSelection.jsp" scope="request" validate="true" parameter="method"
+ * @struts:action path="/addFileContent"
+ * name="addFileContentForm"
+ * input="nodeSelection.jsp"
+ * scope="request"
+ * validate="false"
+ * parameter="method"
+ * @struts:action-forward name="success" path="/nodeSelection.do?method=getList"
+ * @struts:action-forward name="error" path="/error.jsp"
*/
public class AddFileContentAction extends RepositoryDispatchAction {
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/LoginRepositoryAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/LoginRepositoryAction.java,v
diff -u -r1.5 -r1.6
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/LoginRepositoryAction.java 21 Apr 2005 03:39:03 -0000 1.5
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/LoginRepositoryAction.java 24 Feb 2006 11:43:18 -0000 1.6
@@ -47,8 +47,14 @@
* The exceptions will be handled by struts but are listed explicitly
* here so (1) I can log them and (2) you can see what exceptions are thrown.
*
- * XDoclet definition:
- * @struts:action path="/loginRepository" name="loginRepositoryForm" input="/loginRepository.jsp" scope="request" validate="true" parameter="method"
+ * @struts:action path="/loginRepository"
+ * validate="false"
+ * name="loginRepositoryForm"
+ * input="/loginRepository.jsp"
+ * scope="request"
+ * parameter="method"
+ * @struts:action-forward name="success" path="/nodeSelection.do?method=getList"
+ * @struts:action-forward name="error" path="/error.jsp"
*/
public class LoginRepositoryAction extends RepositoryDispatchAction {
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/NodeSelectionAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/NodeSelectionAction.java,v
diff -u -r1.5 -r1.6
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/NodeSelectionAction.java 30 Nov 2005 02:34:30 -0000 1.5
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/action/NodeSelectionAction.java 24 Feb 2006 11:43:18 -0000 1.6
@@ -50,7 +50,14 @@
* here so (1) I can log them and (2) you can see what exceptions are thrown.
*
* XDoclet definition:
- * @struts:action path="/nodeSelection" name="nodeSelectionForm" input="/nodeSelection.jsp" scope="request" parameter="method"
+ * @struts:action path="/nodeSelection"
+ * name="nodeSelectionForm"
+ * input="/nodeSelection.jsp"
+ * scope="request"
+ * parameter="method"
+ * @struts:action-forward name="nodelist" path="/nodeSelection.jsp"
+ * @struts:action-forward name="error" path="/error.jsp"
+ * @struts:action-forward name="packagelist" path="/packageList.jsp"
*/
public class NodeSelectionAction extends RepositoryDispatchAction {
Index: lams_contentrepository/web/addNode.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/web/addNode.jsp,v
diff -u -r1.4 -r1.5
--- lams_contentrepository/web/addNode.jsp 21 Feb 2005 06:14:50 -0000 1.4
+++ lams_contentrepository/web/addNode.jsp 24 Feb 2006 11:43:17 -0000 1.5
@@ -21,9 +21,9 @@
<%@ page language="java"%>
-<%@ taglib uri="/WEB-INF/struts/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts/struts-html.tld" prefix="html" %>
-<%@ taglib uri="/WEB-INF/struts/struts-logic.tld" prefix="logic" %>
+<%@ taglib uri="tags-bean" prefix="bean" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-logic" prefix="logic" %>
Index: lams_contentrepository/web/error.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/web/error.jsp,v
diff -u -r1.2 -r1.3
--- lams_contentrepository/web/error.jsp 21 Feb 2005 06:14:50 -0000 1.2
+++ lams_contentrepository/web/error.jsp 24 Feb 2006 11:43:17 -0000 1.3
@@ -19,7 +19,7 @@
http://www.gnu.org/licenses/gpl.txt
-->
<%@ page language="java"%>
-<%@ taglib uri="/WEB-INF/struts/struts-html.tld" prefix="html" %>
+<%@ taglib uri="tags-html" prefix="html" %>
Index: lams_contentrepository/web/loginRepository.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/web/loginRepository.jsp,v
diff -u -r1.3 -r1.4
--- lams_contentrepository/web/loginRepository.jsp 21 Feb 2005 06:14:50 -0000 1.3
+++ lams_contentrepository/web/loginRepository.jsp 24 Feb 2006 11:43:17 -0000 1.4
@@ -19,9 +19,9 @@
http://www.gnu.org/licenses/gpl.txt
-->
<%@ page language="java"%>
-<%@ taglib uri="/WEB-INF/struts/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts/struts-html.tld" prefix="html" %>
-<%@ taglib uri="/WEB-INF/struts/struts-logic.tld" prefix="logic" %>
+<%@ taglib uri="tags-bean" prefix="bean" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-logic" prefix="logic" %>
Index: lams_contentrepository/web/nodeSelection.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/web/nodeSelection.jsp,v
diff -u -r1.10 -r1.11
--- lams_contentrepository/web/nodeSelection.jsp 30 Nov 2005 02:34:30 -0000 1.10
+++ lams_contentrepository/web/nodeSelection.jsp 24 Feb 2006 11:43:17 -0000 1.11
@@ -27,9 +27,9 @@
<%@ page import="org.lamsfoundation.lams.contentrepository.PropertyName"%>
<%@ page import="org.lamsfoundation.lams.contentrepository.NodeType"%>
-<%@ taglib uri="/WEB-INF/struts/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts/struts-html.tld" prefix="html" %>
-<%@ taglib uri="/WEB-INF/struts/struts-logic.tld" prefix="logic" %>
+<%@ taglib uri="tags-bean" prefix="bean" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-logic" prefix="logic" %>