Index: lams_common/conf/jboss/login-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/jboss/Attic/login-config.xml,v
diff -u -r1.1 -r1.2
--- lams_common/conf/jboss/login-config.xml	7 Dec 2004 07:06:56 -0000	1.1
+++ lams_common/conf/jboss/login-config.xml	9 Dec 2004 00:53:16 -0000	1.2
@@ -27,6 +27,116 @@
 -->
 
 <policy>
+    <!-- Used by clients within the application server VM such as
+    mbeans and servlets that access EJBs.
+    -->
+    <application-policy name = "client-login">
+       <authentication>
+          <login-module code = "org.jboss.security.ClientLoginModule"
+             flag = "required">
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    <!-- Security domain for JBossMQ -->
+    <application-policy name = "jbossmq">
+       <authentication>
+          <login-module code = "org.jboss.security.auth.spi.DatabaseServerLoginModule"
+             flag = "required">
+             <module-option name = "unauthenticatedIdentity">guest</module-option>
+             <module-option name = "dsJndiName">java:/DefaultDS</module-option>
+             <module-option name = "principalsQuery">SELECT PASSWD FROM JMS_USERS WHERE USERID=?</module-option>
+             <module-option name = "rolesQuery">SELECT ROLEID, 'Roles' FROM JMS_ROLES WHERE USERID=?</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    <!-- Security domains for testing new jca framework -->
+    <application-policy name = "HsqlDbRealm">
+       <authentication>
+          <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule"
+             flag = "required">
+             <module-option name = "principal">sa</module-option>
+             <module-option name = "userName">sa</module-option>
+             <module-option name = "password"></module-option>
+             <module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=DefaultDS</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    <application-policy name = "FirebirdDBRealm">
+       <authentication>
+          <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule"
+             flag = "required">
+             <module-option name = "principal">sysdba</module-option>
+             <module-option name = "userName">sysdba</module-option>
+             <module-option name = "password">masterkey</module-option>
+             <module-option name = "managedConnectionFactoryName">jboss.jca:service=XaTxCM,name=FirebirdDS</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    <application-policy name = "JmsXARealm">
+       <authentication>
+          <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule"
+             flag = "required">
+             <module-option name = "principal">guest</module-option>
+             <module-option name = "userName">guest</module-option>
+             <module-option name = "password">guest</module-option>
+             <module-option name = "managedConnectionFactoryName">jboss.jca:service=TxCM,name=JmsXA</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    <!-- A template configuration for the jmx-console web application. This
+      defaults to the UsersRolesLoginModule the same as other and should be
+      changed to a stronger authentication mechanism as required.
+    -->
+    <application-policy name = "jmx-console">
+       <authentication>
+          <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+             flag = "required">
+             <module-option name="usersProperties">jmx-console-users.properties</module-option>
+             <module-option name="rolesProperties">jmx-console-roles.properties</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    <!-- A template configuration for the web-console web application. This
+      defaults to the UsersRolesLoginModule the same as other and should be
+      changed to a stronger authentication mechanism as required.
+    -->
+    <application-policy name = "web-console">
+       <authentication>
+          <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+             flag = "required">
+             <module-option name="usersProperties">web-console-users.properties</module-option>
+             <module-option name="rolesProperties">web-console-roles.properties</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    <!-- The default login configuration used by any security domain that
+    does not have a application-policy entry with a matching name
+    -->
+    <application-policy name = "other">
+       <!-- A simple server login module, which can be used when the number 
+       of users is relatively small. It uses two properties files:
+       users.properties, which holds users (key) and their password (value).
+       roles.properties, which holds users (key) and a comma-separated list of
+       their roles (value).
+       The unauthenticatedIdentity property defines the name of the principal
+       that will be used when a null username and password are presented as is
+       the case for an unuathenticated web client or MDB. If you want to
+       allow such users to be authenticated add the property, e.g.,
+       unauthenticatedIdentity="nobody"
+       -->
+       <authentication>
+          <login-module code = "org.jboss.security.auth.spi.UsersRolesLoginModule"
+             flag = "required" />
+       </authentication>
+    </application-policy>
+
 	<application-policy name = "lams">
        <authentication>
           <login-module code = "org.jboss.security.auth.spi.DatabaseServerLoginModule" flag = "required">
@@ -36,5 +146,6 @@
           </login-module>
        </authentication>
     </application-policy>
+
 </policy>
 
Index: lams_common/conf/jboss/service/mysql-ds.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/jboss/service/Attic/mysql-ds.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_common/conf/jboss/service/mysql-ds.xml	9 Dec 2004 00:53:22 -0000	1.1
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  JBoss Server Configuration                                           -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<datasources>
+  <local-tx-datasource>
+    <jndi-name>MySqlDS</jndi-name>
+    <connection-url>jdbc:mysql://localhost:3306/lams</connection-url>
+    <driver-class>com.mysql.jdbc.Driver</driver-class>
+    <user-name>root</user-name>
+    <password></password>
+  </local-tx-datasource>
+</datasources>
\ No newline at end of file
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/conf/jboss/service/mysql-service.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/conf/spring/applicationContext.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/conf/spring/dbConnection.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/web/WEB-INF/applicationContext.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_common/web/WEB-INF/dbConnection.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/web/WEB-INF/log4j.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/web/WEB-INF/Attic/log4j.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_common/web/WEB-INF/log4j.xml	9 Dec 2004 00:58:30 -0000	1.1
@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id: log4j.xml,v 1.1 2004/12/09 00:58:30 fyang Exp $ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+  <!-- ================================= -->
+  <!-- Preserve messages in a local file -->
+  <!-- ================================= -->
+
+  <!-- A time/date based rolling appender -->
+  <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+    <param name="File" value="${jboss.server.home.dir}/log/server.log"/>
+    <param name="Append" value="false"/>
+    <param name="Threshold" value="INFO"/>
+
+    <!-- Rollover at midnight each day -->
+    <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+    <!-- Rollover at the top of each hour
+    <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
+    -->
+
+    <layout class="org.apache.log4j.PatternLayout">
+      <!-- The default pattern: Date Priority [Category] Message\n -->
+      <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c] %m%n"/>
+
+      <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
+      <param name="ConversionPattern" value="%d{ABSOLUTE} %-5r %-5p [%c] (%t:%x) %m%n"/>
+       -->
+    </layout>	    
+  </appender>
+
+  <!-- A size based file rolling appender
+  <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
+    <param name="File" value="${jboss.server.home.dir}/log/server.log"/>
+    <param name="Append" value="false"/>
+    <param name="MaxFileSize" value="500KB"/>
+    <param name="MaxBackupIndex" value="1"/>
+    <param name="Threshold" value="INFO"/>
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c] %m%n"/>
+    </layout>	    
+  </appender>
+  -->
+
+  <!-- ============================== -->
+  <!-- Append messages to the console -->
+  <!-- ============================== -->
+
+  <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+    <param name="Threshold" value="INFO"/>
+    <param name="Target" value="System.out"/>
+    <layout class="org.apache.log4j.PatternLayout">
+      <!-- The default pattern: Date Priority [Category] Message\n -->
+      <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+    </layout>
+  </appender>
+
+
+  <!-- ====================== -->
+  <!-- More Appender examples -->
+  <!-- ====================== -->
+
+  <!-- Buffer events and log them asynchronously
+  <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
+    <appender-ref ref="FILE"/>
+    <appender-ref ref="CONSOLE"/>
+    <appender-ref ref="SMTP"/>
+  </appender>
+  -->
+
+  <!-- EMail events to an administrator
+  <appender name="SMTP" class="org.apache.log4j.net.SMTPAppender">
+    <param name="Threshold" value="ERROR"/>
+    <param name="To" value="admin@myhost.domain.com"/>
+    <param name="From" value="nobody@myhost.domain.com"/>
+    <param name="Subject" value="JBoss Sever Errors"/>
+    <param name="SMTPHost" value="localhost"/>
+    <param name="BufferSize" value="10"/>
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
+    </layout>
+  </appender>
+  -->
+
+  <!-- Syslog events
+  <appender name="SYSLOG" class="org.apache.log4j.net.SyslogAppender">
+    <param name="Facility" value="LOCAL7"/>
+    <param name="FacilityPrinting" value="true"/>
+    <param name="SyslogHost" value="localhost"/>
+  </appender>
+  -->
+
+  <!-- Log events to JMS (requires a topic to be created)
+  <appender name="JMS" class="org.apache.log4j.net.JMSAppender">
+    <param name="Threshold" value="ERROR"/>
+    <param name="TopicConnectionFactoryBindingName" value="java:/ConnectionFactory"/>
+    <param name="TopicBindingName" value="topic/MyErrorsTopic"/>
+  </appender>
+  -->
+  <!-- ======================= -->
+  <!-- LAMS Setup              -->
+  <!-- ======================= -->
+  
+  <appender name="LAMSFILE" class="org.jboss.logging.appender.RollingFileAppender">
+    <param name="File" value="${jboss.server.home.dir}/log/lams.log"/>
+    <param name="Append" value="true"/>
+    <param name="MaxFileSize" value="5MB"/>
+    <param name="MaxBackupIndex" value="20"/>
+    <layout class="org.apache.log4j.PatternLayout">
+      <!-- Date [Thread:NDC] LEVEL Category - Message\n -->
+      <param name="ConversionPattern" value="%d{ABSOLUTE} [%t:%x] %-5p %c - %m%n"/>
+    </layout>	    
+  </appender>
+
+  <appender name="LAMSCONSOLE" class="org.apache.log4j.ConsoleAppender">
+    <param name="Target" value="System.out"/>
+    <layout class="org.apache.log4j.PatternLayout">
+      <!-- Date Priority Category - Message\n -->
+      <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+    </layout>
+  </appender>
+
+  <appender name="HIBERNATEFILE" class="org.jboss.logging.appender.RollingFileAppender">
+    <param name="File" value="${jboss.server.home.dir}/log/hibernatelams.log"/>
+    <param name="Append" value="true"/>
+    <param name="MaxFileSize" value="5MB"/>
+    <param name="MaxBackupIndex" value="20"/>
+    <layout class="org.apache.log4j.PatternLayout">
+		<!-- Date [Thread] Priority Category - Message\n -->
+		<param name="ConversionPattern" value="%d{ABSOLUTE} [%t] %-5p %c - %m%n"/>
+    </layout>	    
+  </appender>
+  
+  <category name="com.lamsinternational.lams" additivity="false">
+    <priority value="DEBUG"/>
+    <appender-ref ref="LAMSFILE"/>
+    <appender-ref ref="LAMSCONSOLE"/>
+  </category>
+  
+  <category name="com.webmcq.ld.activities">
+    <priority value="DEBUG"/>
+  </category>
+  
+  <!--   
+  <category name="net.sf.hibernate" additivity="false">
+    <priority value="INFO"/>
+    <appender-ref ref="HIBERNATEFILE"/>
+  </category>
+  -->
+  
+  <category name="org.apache">
+    <priority value="INFO"/>
+  </category>
+  
+  <category name="org.jboss">
+    <priority value="INFO"/>
+  </category>
+
+
+  <!-- ================ -->
+  <!-- Limit categories -->
+  <!-- ================ -->
+
+  <!-- Limit JBoss categories to INFO
+  <category name="org.jboss">
+    <priority value="INFO"/>
+  </category>
+  -->
+
+  <!-- Increase the priority threshold for the DefaultDS category
+  <category name="DefaultDS">
+    <priority value="FATAL"/>
+  </category>
+  -->
+
+  <!-- Decrease the priority threshold for the org.jboss.varia category
+  <category name="org.jboss.varia">
+    <priority value="DEBUG"/>
+  </category>
+  -->
+
+  <!--
+     | An example of enabling the custom TRACE level priority that is used
+     | by the JBoss internals to diagnose low level details. This example
+     | turns on TRACE level msgs for the org.jboss.ejb.plugins package and its
+     | subpackages. This will produce A LOT of logging output.
+       If you use replace the log4j 1.2 jar with a 1.1.3 jar you will need to
+       change this from XLevel to XPriority.
+  <category name="org.jboss.system">
+    <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+  </category>
+  <category name="org.jboss.ejb.plugins">
+    <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+  </category>
+  -->
+
+
+  <!-- ======================= -->
+  <!-- Setup the Root category -->
+  <!-- ======================= -->
+
+  <root>
+    <appender-ref ref="CONSOLE"/>
+    <appender-ref ref="FILE"/>
+  </root>
+  
+  <!-- Clustering logging -->
+  <!-- Uncomment the following to redirect the org.javagroups and
+     org.jboss.ha categories to a cluster.log file.-->
+
+<!--  <appender name="CLUSTER" class="org.jboss.logging.appender.RollingFileAppender">
+    <param name="File" value="${jboss.server.home.dir}/log/cluster.log"/>
+    <param name="Append" value="false"/>
+    <param name="MaxFileSize" value="500KB"/>
+    <param name="MaxBackupIndex" value="1"/>
+	<layout class="org.apache.log4j.PatternLayout">-->
+		<!-- Date Priority [Category] Message\n -->
+<!--		<param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c] %m%n"/>
+    </layout>	    
+  </appender>
+  <category name="org.javagroups">
+    <priority value="DEBUG" />
+    <appender-ref ref="CLUSTER"/>
+  </category>
+  <category name="org.jboss.ha">
+    <priority value="DEBUG" />
+    <appender-ref ref="CLUSTER"/>
+  </category>
+  -->
+  
+
+
+</log4j:configuration>
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.1 -r1.2
--- lams_common/web/WEB-INF/web.xml	7 Dec 2004 07:21:31 -0000	1.1
+++ lams_common/web/WEB-INF/web.xml	9 Dec 2004 00:58:30 -0000	1.2
@@ -16,15 +16,6 @@
 	<description>Learning Acitivity Management System</description>
 	
 	<!--
-	  - Key of the system property that should specify the root directory of this
-	  - web app. Applied by WebAppRootListener or Log4jConfigListener.
-	  -->
-	<context-param>
-		<param-name>webAppRootKey</param-name>
-		<param-value>lams.root</param-value>
-	</context-param>
-
-	<!--
 	  - Location of the Log4J config file, for initialization and refresh checks.
 	  - Applied by Log4jConfigListener.
 	  -->
@@ -175,11 +166,12 @@
 			<web-resource-name>Secure Content</web-resource-name>
 			<url-pattern>*.jsp</url-pattern>
 			<url-pattern>*.html</url-pattern>
-			<url-pattern>/home.do</url-pattern>
 		</web-resource-collection>
+		<!-- 
 		<auth-constraint>
 			<role-name>*</role-name>
 		</auth-constraint>
+		-->
 	</security-constraint>
 
 	<login-config>
@@ -190,29 +182,4 @@
 		</form-login-config>
 	</login-config>
 
-	<security-role>
-		<description>Student</description>
-		<role-name>LEARNER</role-name>
-	</security-role>
-
-	<security-role>
-		<description>Can create/modify a learning design</description>
-		<role-name>AUTHOR</role-name>
-	</security-role>
-
-	<security-role>
-		<description>Can create a lesson</description>
-		<role-name>STAFF</role-name>
-	</security-role>
-
-	<security-role>
-		<description>Can manage people and organisation</description>
-		<role-name>ADMIN</role-name>
-	</security-role>
-
-	<security-role>
-		<description>Can manage people and the root organisation</description>
-		<role-name>SYSADMIN</role-name>
-	</security-role>
-
 </web-app>