Index: lams_admin/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.15 -r1.15.2.1
--- lams_admin/web/WEB-INF/struts/struts-config.xml	20 Oct 2006 07:04:30 -0000	1.15
+++ lams_admin/web/WEB-INF/struts/struts-config.xml	12 Mar 2007 00:40:42 -0000	1.15.2.1
@@ -21,6 +21,18 @@
       name="CacheActionForm"
       type="org.lamsfoundation.lams.admin.web.CacheActionForm"
     />
+    <form-bean
+      name="ImportV1ContentsForm"
+      type="org.lamsfoundation.lams.admin.web.form.ImportV1ContentsForm"
+    />
+    <form-bean
+      name="ImportV1Form"
+      type="org.lamsfoundation.lams.admin.web.form.ImportV1Form"
+    />
+    <form-bean
+      name="ImportExcelForm"
+      type="org.lamsfoundation.lams.admin.web.ImportExcelForm"
+    />
 
    <form-bean name="OrganisationForm" type="org.apache.struts.action.DynaActionForm">
 	<form-property name="orgId" type="java.lang.Integer" />
@@ -29,7 +41,7 @@
 	<form-property name="name" type="java.lang.String" />
 	<form-property name="code" type="java.lang.String" />
 	<form-property name="description" type="java.lang.String" />
-	<form-property name="localeId" type="java.lang.Byte" initial="1"/>
+	<form-property name="localeId" type="java.lang.Integer" initial="1"/>
 	<form-property name="typeId" type="java.lang.Integer" />
 	<form-property name="stateId" type="java.lang.Integer" />
 	<form-property name="courseAdminCanAddNewUsers" type="java.lang.Boolean" initial="false"/>
@@ -64,7 +76,7 @@
 	<form-property name="mobilePhone" type="java.lang.String" />
 	<form-property name="fax" type="java.lang.String" />
 	<form-property name="email" type="java.lang.String" />
-	<form-property name="localeId" type="java.lang.Byte" />
+	<form-property name="localeId" type="java.lang.Integer" />
 </form-bean>
 
 <form-bean name="UserOrgForm" type="org.apache.struts.action.DynaActionForm">
@@ -79,6 +91,8 @@
     <form-property name="sFirstName" type="java.lang.String" />
     <form-property name="sLastName" type="java.lang.String" />
     <form-property name="searched" type="java.lang.Boolean" initial="false" />
+    <form-property name="showAll" type="java.lang.Boolean" initial="false" />
+    <form-property name="resultsSection" type="java.lang.String" />
 </form-bean>
 
 <form-bean name="LoginMaintainForm" type="org.apache.struts.action.DynaActionForm">
@@ -109,6 +123,8 @@
 
 <form-bean name="RegisterForm" type="org.apache.struts.action.DynaActionForm">
 	<form-property name="sitename" type="java.lang.String" />
+	<form-property name="rname" type="java.lang.String" />
+	<form-property name="remail" type="java.lang.String" />
 	<form-property name="serverurl" type="java.lang.String" />
 	<form-property name="serverversion" type="java.lang.String" />
 	<form-property name="serverbuild" type="java.lang.String" />
@@ -124,9 +140,9 @@
 	<form-property name="monitorno" type="java.lang.Integer" />
 	<form-property name="managerno" type="java.lang.Integer" />
 	<form-property name="learnerno" type="java.lang.Integer" />
+	<form-property name="authoradminno" type="java.lang.Integer" />
+	<form-property name="userno" type="java.lang.Integer" />
 	<form-property name="public" type="java.lang.Boolean" initial="true" />
-	<form-property name="rname" type="java.lang.String" />
-	<form-property name="remail" type="java.lang.String" />
 </form-bean>
   </form-beans>
 
@@ -158,16 +174,36 @@
     >
       <forward
         name="organisation"
-        path=".organisation"
+        path="/organisation.do?method=edit"
         redirect="false"
       />
       <forward
         name="orglist"
         path="/orgmanage.do"
         redirect="false"
       />
+      <forward
+        name="userlist"
+        path="/usermanage.do"
+        redirect="false"
+      />
     </action>
     <action
+      path="/usersearch"
+      type="org.lamsfoundation.lams.admin.web.UserSearchAction"
+      name="UserSearchForm"
+      scope="request"
+      input=".usersearchlist"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="usersearchlist"
+        path=".usersearchlist"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/orgmanage"
       type="org.lamsfoundation.lams.admin.web.OrgManageAction"
       unknown="false"
@@ -180,21 +216,38 @@
       />
     </action>
     <action
-      path="/usersearch"
-      type="org.lamsfoundation.lams.admin.web.UserSearchAction"
-      name="UserSearchForm"
-      scope="request"
-      input=".usersearchlist"
+      path="/importv1contentssave"
+      type="org.lamsfoundation.lams.admin.web.action.ImportV1ContentsSaveAction"
+      name="ImportV1ContentsForm"
+      scope="session"
+      input=".importv1contents"
       unknown="false"
       validate="false"
     >
       <forward
-        name="usersearchlist"
-        path=".usersearchlist"
+        name="importv1result"
+        path=".importv1result"
         redirect="false"
       />
+      <forward
+        name="sysadmin"
+        path="/sysadminstart.do"
+        redirect="false"
+      />
     </action>
     <action
+      path="/libraryManage"
+      type="org.lamsfoundation.lams.admin.web.LibraryManageAction"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="success"
+        path=".librarylist"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/serverlist"
       type="org.lamsfoundation.lams.admin.web.ServerListAction"
       unknown="false"
@@ -207,6 +260,26 @@
       />
     </action>
     <action
+      path="/importexcelsave"
+      type="org.lamsfoundation.lams.admin.web.ImportExcelSaveAction"
+      name="ImportExcelForm"
+      scope="request"
+      input=".importexcel"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="importresult"
+        path=".importresult"
+        redirect="false"
+      />
+      <forward
+        name="sysadmin"
+        path="/sysadminstart.do"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/usersave"
       type="org.lamsfoundation.lams.admin.web.UserSaveAction"
       name="UserForm"
@@ -252,22 +325,34 @@
       />
     </action>
     <action
-      path="/organisation"
-      type="org.lamsfoundation.lams.admin.web.OrganisationAction"
-      name="OrganisationForm"
+      path="/sysadminstart"
+      type="org.lamsfoundation.lams.admin.web.action.SysAdminStartAction"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="sysadmin"
+        path=".sysadmin"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/importv1save"
+      type="org.lamsfoundation.lams.admin.web.action.ImportV1SaveAction"
+      name="ImportV1Form"
       scope="request"
-      parameter="method"
+      input=".importv1"
       unknown="false"
       validate="false"
     >
       <forward
-        name="organisation"
-        path=".organisation"
+        name="importv1contents"
+        path="/importv1contents.do"
         redirect="false"
       />
       <forward
-        name="orglist"
-        path="/orgmanage.do"
+        name="sysadmin"
+        path="/sysadminstart.do"
         redirect="false"
       />
     </action>
@@ -292,6 +377,26 @@
       />
     </action>
     <action
+      path="/organisation"
+      type="org.lamsfoundation.lams.admin.web.OrganisationAction"
+      name="OrganisationForm"
+      scope="request"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="organisation"
+        path=".organisation"
+        redirect="false"
+      />
+      <forward
+        name="orglist"
+        path="/orgmanage.do"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/config"
       type="org.lamsfoundation.lams.admin.web.ConfigAction"
       name="ConfigForm"
@@ -308,7 +413,7 @@
       />
       <forward
         name="sysadmin"
-        path=".sysadmin"
+        path="/sysadminstart.do"
         redirect="false"
       />
     </action>
@@ -348,6 +453,25 @@
       />
     </action>
     <action
+      path="/importv1contents"
+      type="org.lamsfoundation.lams.admin.web.action.ImportV1ContentsAction"
+      name="ImportV1ContentsForm"
+      scope="session"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="importv1contents"
+        path=".importv1contents"
+        redirect="false"
+      />
+      <forward
+        name="sysadmin"
+        path="/sysadminstart.do"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/loginsave"
       type="org.lamsfoundation.lams.admin.web.LoginSaveAction"
       name="LoginMaintainForm"
@@ -359,7 +483,7 @@
     >
       <forward
         name="sysadmin"
-        path=".sysadmin"
+        path="/sysadminstart.do"
         redirect="false"
       />
       <forward
@@ -369,6 +493,20 @@
       />
     </action>
     <action
+      path="/importv1"
+      type="org.lamsfoundation.lams.admin.web.action.ImportV1Action"
+      name="ImportV1Form"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="importv1"
+        path=".importv1"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/joblist"
       type="org.lamsfoundation.lams.admin.web.ScheduledJobListAction"
       unknown="false"
@@ -421,8 +559,30 @@
         path="/usermanage.do"
         redirect="false"
       />
+      <forward
+        name="userorg"
+        path="/userorg.do"
+        redirect="false"
+      />
     </action>
     <action
+      path="/toolcontentlist"
+      type="org.lamsfoundation.lams.admin.web.ToolContentListAction"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="toolcontentlist"
+        path=".toolcontentlist"
+        redirect="false"
+      />
+      <forward
+        name="error"
+        path=".error"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/servermaintain"
       type="org.lamsfoundation.lams.admin.web.ServerMaintainAction"
       name="ServerOrgMapForm"
@@ -443,6 +603,20 @@
       />
     </action>
     <action
+      path="/importexcel"
+      type="org.lamsfoundation.lams.admin.web.ImportExcelAction"
+      name="ImportExcelForm"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="importexcel"
+        path=".importexcel"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/register"
       type="org.lamsfoundation.lams.admin.web.RegisterAction"
       name="RegisterForm"
@@ -459,10 +633,15 @@
       />
       <forward
         name="sysadmin"
-        path=".sysadmin"
+        path="/sysadminstart.do"
         redirect="false"
       />
       <forward
+        name="success"
+        path="http://lamscommunity.org/registration"
+        redirect="false"
+      />
+      <forward
         name="error"
         path=".error"
         redirect="false"
@@ -564,10 +743,6 @@
       />
     </action>
 
-       <action
-      path="/sysadminstart"
-      forward=".sysadmin"
-    />
   </action-mappings>
 
    <!-- Define your Struts controller in a file called struts-controller.xml and place it in your merge directory. -->