Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/applicationResources.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/security/AbstractServerLoginModule.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/security/AuthenticationMethodConfigurer.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/security/DatabaseAuthenticator.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/security/JspRedirectStrategy.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/security/LDAPAuthenticator.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/security/NestableGroup.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/security/SimpleGroup.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/security/SimplePrincipal.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/security/UsernamePasswordLoginModule.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/security/WebAuthAuthenticator.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/security/WebAuthServlet.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/web/AttributeNames.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/web/HomeAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/web/HttpSessionManager.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/web/PasswordChangeActionForm.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/web/SessionListener.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_common/web/adminHeader.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/web/changeStyle.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/web/errorContent.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_common/web/footer.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/web/getSysInfo.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.6 refers to a dead (removed) revision in file `lams_common/web/header.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.8 refers to a dead (removed) revision in file `lams_common/web/index.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.5 refers to a dead (removed) revision in file `lams_common/web/indexContent.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.7 refers to a dead (removed) revision in file `lams_common/web/login.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_common/web/loginContent.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_common/web/loginHeader.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.5 refers to a dead (removed) revision in file `lams_common/web/openUrls.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_common/web/passwordChangeContent.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_common/web/passwordChangeOkContent.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/web/style.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_common/web/template.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/web/WEB-INF/Attic/web.xml,v
diff -u -r1.9 -r1.10
--- lams_common/web/WEB-INF/web.xml	10 May 2005 23:56:34 -0000	1.9
+++ lams_common/web/WEB-INF/web.xml	6 Sep 2005 05:19:24 -0000	1.10
@@ -23,13 +23,17 @@
 
 http://www.gnu.org/licenses/gpl.txt
 -->
-<context-param>
-	<param-name>contextConfigLocation</param-name>
-	<param-value>/WEB-INF/spring/applicationContext.xml		  
-	/WEB-INF/spring/learningDesignApplicationContext.xml		  
-	/WEB-INF/spring/workspaceApplicationContext.xml 
-	</param-value>
-</context-param>
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>
+			classpath:/org/lamsfoundation/lams/applicationContext.xml
+		</param-value>
+	</context-param>
+	<listener>
+		<listener-class>
+			org.springframework.web.context.ContextLoaderListener
+		</listener-class>
+	</listener>	
 
     <!--
     To use non XDoclet filters, create a filters.xml file that
Index: lams_common/web/WEB-INF/struts/.cvsignore
===================================================================
RCS file: /usr/local/cvsroot/lams_common/web/WEB-INF/struts/Attic/.cvsignore,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_common/web/WEB-INF/struts/.cvsignore	6 Sep 2005 05:19:24 -0000	1.1
@@ -0,0 +1 @@
+.struts-config.mex
Index: lams_common/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.10 -r1.11
--- lams_common/web/WEB-INF/struts/struts-config.xml	10 May 2005 23:56:40 -0000	1.10
+++ lams_common/web/WEB-INF/struts/struts-config.xml	6 Sep 2005 05:19:24 -0000	1.11
@@ -54,26 +54,6 @@
       />
     </action>
     <action
-      path="/passwordChanged"
-      type="org.lamsfoundation.lams.web.PasswordChangeAction"
-      name="PasswordChangeActionForm"
-      scope="request"
-      input=".passwordChange"
-      unknown="false"
-      validate="true"
-    >
-      <forward
-        name="okay"
-        path=".passwordChangeOk"
-        redirect="false"
-      />
-      <forward
-        name="cancelled"
-        path="/index.jsp"
-        redirect="false"
-      />
-    </action>
-    <action
       path="/admin"
       type="org.lamsfoundation.lams.usermanagement.web.AdminAction"
       parameter="method"
@@ -176,59 +156,6 @@
         redirect="false"
       />
     </action>
-    <action
-      path="/home"
-      type="org.lamsfoundation.lams.web.HomeAction"
-      parameter="method"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="admin"
-        path=".admin"
-        redirect="false"
-      />
-      <forward
-        name="learner"
-        path="/learner.jsp"
-        redirect="false"
-      />
-      <forward
-        name="author"
-        path="/author.jsp"
-        redirect="false"
-      />
-      <forward
-        name="staff"
-        path="/staff.jsp"
-        redirect="false"
-      />
-      <forward
-        name="error"
-        path=".error"
-        redirect="false"
-      />
-      <forward
-        name="passwordChange"
-        path=".passwordChange"
-        redirect="false"
-      />
-    </action>
-    <action
-      path="/workspace"
-      type="org.lamsfoundation.lams.workspace.web.WorkspaceAction"
-      name="WorkspaceAction"
-      scope="request"
-      parameter="method"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="success"
-        path="/index.jsp"
-        redirect="false"
-      />
-    </action>
 
     <!-- If you have non XDoclet actions, define them in a file called struts-actions.xml and place it in your merge directory. -->
   </action-mappings>