Index: lams_build/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_build/build.xml,v
diff -u -r1.54 -r1.55
--- lams_build/build.xml	27 Jun 2007 00:31:52 -0000	1.54
+++ lams_build/build.xml	14 Sep 2007 03:19:52 -0000	1.55
@@ -58,12 +58,7 @@
 
 	<!-- build sub-projects -->
 	<target name="build-subprojects" 
-		description="builds sub porjects">
-		<copy overwrite="yes" todir="${shareddtd}">
-			<fileset dir="${conf.auth}">
-				<include name="**/*.dtd"/>
-			</fileset>
-		</copy>
+		description="builds sub projects">
 		<ant antfile="../${lams_common}/build.xml" target="build-jar"
 			inheritAll="false" />
 		<ant antfile="../${lams_contentrepository}/build.xml"
@@ -330,15 +325,6 @@
 	                <filter token="confdir" value="${jboss.server.instance}/conf"/>
 	        </filterset>
 		</copy>
-		
-		<copy overwrite="yes" todir="${jboss.server.instance}/conf/">
-			<fileset dir="${conf.auth}/">
-				<include name="*.xml" />
-			</fileset>
-	        <filterset>
-	                <filter token="confdir" value="${jboss.server.instance}/conf"/>
-	        </filterset>
-		</copy>
 
 		<copy overwrite="yes" todir="${jboss.ear.deploy}">
 			<fileset dir="${conf.jboss}/service">
Index: lams_build/common.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_build/common.properties,v
diff -u -r1.24 -r1.25
--- lams_build/common.properties	24 May 2007 02:49:14 -0000	1.24
+++ lams_build/common.properties	14 Sep 2007 03:19:52 -0000	1.25
@@ -36,9 +36,6 @@
 # Directory where third party jars reside.
 sharedlib=../lams_build/lib
 
-# Directory where shared dtd reside
-shareddtd=../lams_common/build/dtd
-
 #deploy tool directory
 deploy.tool.dir=../lams_build/deploy-tool
 
@@ -85,7 +82,6 @@
 build.classes.java=${build}/classes/java
 build.classes.test=${build}/classes/test/java
 build.lib=${build}/lib
-build.auth.dtd=${build}/dtd
 build.report=${build}/report
 build.web=${build}/web
 build.deploy=${build}/deploy
@@ -95,7 +91,6 @@
 src.dir=${basedir}/src
 src.java.dir=${src.dir}/java
 src.test.dir=${basedir}/test/java
-src.lams.resources = ${src.java.dir}/org/lamsfoundation/lams/resources
 
 #JBoss deploy directory - see OS dependent properties file
 
Index: lams_build/unix.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_build/unix.properties,v
diff -u -r1.12 -r1.13
--- lams_build/unix.properties	8 May 2007 07:50:30 -0000	1.12
+++ lams_build/unix.properties	14 Sep 2007 03:19:52 -0000	1.13
@@ -24,15 +24,15 @@
 
 conf=${basedir}/conf/unix
 conf.jboss=${conf}/jboss
-conf.auth=${conf}/authentication
 
 contentrepository.directory=/var/opt/${conf.application}/repository
 
 #JBoss deploy directory (Unix)
 jboss.home=/usr/local/jboss-4.0.2/
-jboss.ear.deploy=${jboss.home}server/default/deploy/
-jboss.deploy=${jboss.home}server/default/deploy/${conf.application}.ear
 jboss.server=${jboss.home}server/
 jboss.server.instance=${jboss.server}default
+jboss.ear.deploy=${jboss.server.instance}/deploy/
+jboss.deploy=${jboss.ear.deploy}/${conf.application}.ear
 
-j2eelibs=${jboss.home}server/default/lib
\ No newline at end of file
+
+j2eelibs=${jboss.server.instance}/lib
\ No newline at end of file
Index: lams_build/windows.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_build/windows.properties,v
diff -u -r1.13 -r1.14
--- lams_build/windows.properties	8 May 2007 07:50:30 -0000	1.13
+++ lams_build/windows.properties	14 Sep 2007 03:19:51 -0000	1.14
@@ -22,16 +22,16 @@
 
 conf=${basedir}/conf/windows
 conf.jboss=${conf}/jboss
-conf.auth=${conf}/authentication
 
 contentrepository.directory=C:/${conf.application}/repository
 
 #JBoss deploy directory (Windows)
-jboss.home=D:/jboss-4.0.2/
-jboss.ear.deploy=${jboss.home}server/default/deploy/
-jboss.deploy=${jboss.home}server/default/deploy/${conf.application}.ear
+jboss.home=E:/jboss-4.0.2/
 jboss.server=${jboss.home}server/
 jboss.server.instance=${jboss.server}default
+jboss.ear.deploy=${jboss.server.instance}/deploy/
+jboss.deploy=${jboss.ear.deploy}/${conf.application}.ear
 
-j2eelibs=${jboss.home}server/default/lib
 
+j2eelibs=${jboss.server.instance}/lib
+
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_build/conf/unix/authentication/lamsauthentication.dtd'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_build/conf/unix/authentication/lamsauthentication.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_build/conf/windows/authentication/lamsauthentication.dtd'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_build/conf/windows/authentication/lamsauthentication.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.7 refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/security/AuthenticationMethodConfigurer.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/src/java/org/lamsfoundation/lams/security/DatabaseAuthenticator.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/security/DatabaseAuthenticator.java,v
diff -u -r1.5 -r1.6
--- lams_central/src/java/org/lamsfoundation/lams/security/DatabaseAuthenticator.java	20 Aug 2007 04:28:21 -0000	1.5
+++ lams_central/src/java/org/lamsfoundation/lams/security/DatabaseAuthenticator.java	14 Sep 2007 03:19:53 -0000	1.6
@@ -27,25 +27,18 @@
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.sql.DataSource;
 
-import org.lamsfoundation.lams.usermanagement.AuthenticationMethod;
 
 
-
 public class DatabaseAuthenticator
 {
 	private String dsJndiName;
 	private String principalsQuery;
 	
-	public DatabaseAuthenticator(AuthenticationMethod method)
-	{
-		this.dsJndiName = method.getParameterByName("dsJndiName").getValue();
-		this.principalsQuery = method.getParameterByName("principalsQuery").getValue();
-	}
-	
 	public DatabaseAuthenticator(String dsJndiName, String principalsQuery) {
 		this.dsJndiName = dsJndiName;
 		this.principalsQuery = principalsQuery;
Index: lams_common/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/build.xml,v
diff -u -r1.59 -r1.60
--- lams_common/build.xml	14 Jun 2007 23:49:06 -0000	1.59
+++ lams_common/build.xml	14 Sep 2007 03:19:52 -0000	1.60
@@ -152,7 +152,6 @@
 		<mkdir dir="${build.classes.java}"/>
 		<mkdir dir="${build.classes.test}"/>
 		<mkdir dir="${build.lib}"/>
-		<mkdir dir="${build.auth.dtd}"/>
 	</target>
 
 	<target name="clean" depends="preparedirs" description="removes all class files">
@@ -163,20 +162,8 @@
 		<mkdir dir="${build.classes.java}"/>
 		<mkdir dir="${build.lib}"/>
 	</target>
-
-	<target name="copy-dtd" description="copy required dtd files.">
-		<delete failonerror="false">
-			<fileset dir="${src.lams.resources}"/>
-		</delete>
-		<mkdir dir="${src.lams.resources}"/>
-		<copy overwrite="yes" todir="${src.lams.resources}">
-			<fileset dir="${build.auth.dtd}">
-				<include name="**/*.dtd"/>
-			</fileset>
-		</copy>
-	</target>
 	
-	<target name="compile" depends="clean, copy-dtd" description="compile java sources">
+	<target name="compile" depends="clean" description="compile java sources">
 		<javac srcdir="${src.java.dir}" compiler="modern"
 	         	 	destdir="${build.classes.java}" deprecation="on" debug="on">
 			<classpath>
@@ -191,11 +178,6 @@
 						<include name="**/*.properties"/>
 				</fileset>
 		</copy>
-		<copy overwrite="yes" todir="${build.classes.java}/org/lamsfoundation/lams/resources/">
-			<fileset dir="${src.lams.resources}">
-				<include name="**/*.dtd"/>
-			</fileset>
-		</copy>
 		<copy overwrite="yes" todir="${build.classes.java}" verbose="true">
 			<fileset dir="${src.java.dir}">
 				<include name="**/*.properties"/>
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/AuthenticationMethod.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/AuthenticationMethod.java,v
diff -u -r1.7 -r1.8
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/AuthenticationMethod.java	17 Sep 2006 06:14:17 -0000	1.7
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/AuthenticationMethod.java	14 Sep 2007 03:19:52 -0000	1.8
@@ -25,7 +25,6 @@
 
 import java.io.Serializable;
 import java.util.Set;
-import java.util.List;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
@@ -56,8 +55,6 @@
     private Set users;
     
     private boolean enabled = true;
-    
-    private List authenticationMethodParameters;
 
     /** full constructor */
     public AuthenticationMethod(String authenticationMethodName, AuthenticationMethodType authenticationMethodType, Set users) {
@@ -148,30 +145,7 @@
 	public void setEnabled(boolean enabled) {
 		this.enabled = enabled;
 	}
-    
-	/**
-	 * @return Returns the authenticationMethodParameters.
-	 */
-	public List getAuthenticationMethodParameters() {
-		return authenticationMethodParameters;
-	}
-	/**
-	 * @param authenticationMethodParameters The authenticationMethodParameters to set.
-	 */
-	public void setAuthenticationMethodParameters(
-			List authenticationMethodParameters) {
-		this.authenticationMethodParameters = authenticationMethodParameters;
-	}
 	
-	public AuthenticationMethodParameter getParameterByName(String name){
-		for(int i=0; i<authenticationMethodParameters.size(); i++){
-			if(((AuthenticationMethodParameter)authenticationMethodParameters.get(i)).getName().equals(name)){
-				return (AuthenticationMethodParameter)authenticationMethodParameters.get(i);
-			}
-		}
-		return null;
-	}
-	
     public String toString() {
         return new ToStringBuilder(this)
             .append("authenticationMethodId", getAuthenticationMethodId())
Fisheye: Tag 1.6 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/usermanagement/AuthenticationMethodParameter.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/util/AuthEntityResolver.java'.
Fisheye: No comparison available.  Pass `N' to diff?