Index: lams_contentrepository/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r9521d8efcb3e577a474aed2d2bb69b2231d19801 -r2e997e1e672fbb98b6a24a29768fc1d0ac5f4ef4
--- lams_contentrepository/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 9521d8efcb3e577a474aed2d2bb69b2231d19801)
+++ lams_contentrepository/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 2e997e1e672fbb98b6a24a29768fc1d0ac5f4ef4)
@@ -5,42 +5,49 @@
    <form-beans >
       <form-bean name="loginRepositoryForm" type="com.lamsinternational.lams.contentrepository.struts.form.LoginRepositoryForm" />
       <form-bean name="nodeSelectionForm" type="com.lamsinternational.lams.contentrepository.struts.form.NodeSelectionForm" />
+      <form-bean name="addFileContentForm" type="com.lamsinternational.lams.contentrepository.struts.form.AddFileContentForm" />
    </form-beans>
 
    <global-exceptions>
-	   <exception
-	        key="exception.accessDenied"
-    	    type="com.lamsinternational.lams.contentrepository.AccessDeniedException"
-        	path="/error.jsp"/>
-	   <exception
-	        key="exception.loginFailed"
-    	    type="com.lamsinternational.lams.contentrepository.LoginException"
-        	path="/error.jsp"/>
-	   <exception
-	        key="exception.workspaceNotFound"
-    	    type="com.lamsinternational.lams.contentrepository.WorkspaceNotFoundException"
-        	path="/error.jsp"/>
-	   <exception
-	        key="exception.itemNotFound"
-    	    type="com.lamsinternational.lams.contentrepository.ItemNotFoundException"
-        	path="/error.jsp"/>
-	   <exception
-	        key="exception.file"
-    	    type="com.lamsinternational.lams.contentrepository.FileException"
-        	path="/error.jsp"/>
-	   <exception
-	        key="exception.repository"
-    	    type="com.lamsinternational.lams.contentrepository.RepositoryCheckedException"
-        	path="/error.jsp"/>
-	   <exception
-	        key="exception.repository"
-    	    type="java.lang.Exception"
-        	path="/error.jsp"/>
+   	<!-- the exception handling isn't working as I expected so I'm letting them bubble to the top. -->
+   	<!-- in a real application, the exceptions should be caught and handled -->
+	<!--	   <exception-->
+	<!--	        key="exception.accessDenied"-->
+	<!--    	    type="com.lamsinternational.lams.contentrepository.AccessDeniedException"-->
+	<!--        	path="/error.jsp"/>-->
+	<!--	   <exception-->
+	<!--	        key="exception.loginFailed"-->
+	<!--    	    type="com.lamsinternational.lams.contentrepository.LoginException"-->
+	<!--        	path="/error.jsp"/>-->
+	<!--	   <exception-->
+	<!--	        key="exception.workspaceNotFound"-->
+	<!--    	    type="com.lamsinternational.lams.contentrepository.WorkspaceNotFoundException"-->
+	<!--        	path="/error.jsp"/>-->
+	<!--	   <exception-->
+	<!--	        key="exception.itemNotFound"-->
+	<!--    	    type="com.lamsinternational.lams.contentrepository.ItemNotFoundException"-->
+	<!--        	path="/error.jsp"/>-->
+	<!--	   <exception-->
+	<!--	        key="exception.itemExists"-->
+	<!--    	    type="com.lamsinternational.lams.contentrepository.ItemExistsException"-->
+	<!--        	path="/error.jsp"/>-->
+	<!--	   <exception-->
+	<!--	        key="exception.file"-->
+	<!--    	    type="com.lamsinternational.lams.contentrepository.FileException"-->
+	<!--        	path="/error.jsp"/>-->
+	<!--	   <exception-->
+	<!--	        key="exception.repository"-->
+	<!--    	    type="com.lamsinternational.lams.contentrepository.RepositoryCheckedException"-->
+	<!--        	path="/error.jsp"/>-->
+	<!--	   <exception-->
+	<!--	        key="exception.repository"-->
+	<!--    	    type="java.lang.Exception"-->
+	<!--        	path="/error.jsp"/>-->
     </global-exceptions>
    
     
    <global-forwards >
-      <forward name="error" path="/error.do" />
+	     <forward name="logout" path="/loggedout.html" />
    </global-forwards>
 
    <action-mappings >
@@ -53,18 +60,27 @@
          attribute="loginRepositoryForm"
          input="/loginRepository.jsp"
          parameter="method">
-         <forward name="success" path="/nodeSelection.jsp"/>
+         <forward name="success" path="/nodeSelection.do?method=getList"/>
+	     <forward name="error" path="/error.jsp" />
       </action>
       <action
          path="/nodeSelection"
          type="com.lamsinternational.lams.contentrepository.struts.action.NodeSelectionAction"
          name="nodeSelectionForm"
          input="/nodeSelection.jsp"
-         parameter="method" />
+         parameter="method">
+	     <forward name="nodelist" path="/nodeSelection.jsp" />
+	     <forward name="error" path="/error.jsp" />
+      </action>
       <action
-         path="/error"
-         forward="/error.jsp"
-         />
+         path="/addFileContent"
+         type="com.lamsinternational.lams.contentrepository.struts.action.AddFileContentAction"
+         name="addFileContentForm"
+         input="/addNode.jsp"
+         parameter="method">
+         <forward name="success" path="/nodeSelection.do?method=getList"/>
+	     <forward name="error" path="/error.jsp" />
+      </action>
    </action-mappings>
 
    <controller bufferSize="4096" debug="0" />