Index: lams_build/build.xml =================================================================== RCS file: /usr/local/cvsroot/lams_build/build.xml,v diff -u -r1.53 -r1.53.2.1 --- lams_build/build.xml 23 Apr 2007 00:52:50 -0000 1.53 +++ lams_build/build.xml 18 Sep 2007 07:20:55 -0000 1.53.2.1 @@ -58,12 +58,7 @@ - - - - - + description="builds sub projects"> - - - - - - - - - Index: lams_build/common.properties =================================================================== RCS file: /usr/local/cvsroot/lams_build/common.properties,v diff -u -r1.24 -r1.24.2.1 --- lams_build/common.properties 24 May 2007 02:49:14 -0000 1.24 +++ lams_build/common.properties 18 Sep 2007 07:20:55 -0000 1.24.2.1 @@ -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.12.2.1 --- lams_build/unix.properties 8 May 2007 07:50:30 -0000 1.12 +++ lams_build/unix.properties 18 Sep 2007 07:20:55 -0000 1.12.2.1 @@ -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.13.2.1 --- lams_build/windows.properties 8 May 2007 07:50:30 -0000 1.13 +++ lams_build/windows.properties 18 Sep 2007 07:20:55 -0000 1.13.2.1 @@ -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.1.6.1 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.3.2.1 refers to a dead (removed) revision in file `lams_build/conf/unix/authentication/lamsauthentication.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_build/conf/unix/jboss/login-config.xml =================================================================== RCS file: /usr/local/cvsroot/lams_build/conf/unix/jboss/login-config.xml,v diff -u -r1.4 -r1.4.6.1 --- lams_build/conf/unix/jboss/login-config.xml 17 Oct 2006 08:19:21 -0000 1.4 +++ lams_build/conf/unix/jboss/login-config.xml 18 Sep 2007 07:20:56 -0000 1.4.6.1 @@ -150,13 +150,13 @@ - + - - java:/MySqlDS + + java:/jdbc/lams-ds select password from lams_user where login=? - SELECT DISTINCT r.name,'Roles' FROM + SELECT DISTINCT r.name,'Roles' FROM lams_user u LEFT OUTER JOIN lams_user_organisation uo USING(user_id) LEFT OUTER JOIN lams_user_organisation_role urr USING(user_organisation_id) LEFT OUTER JOIN lams_role r USING (role_id) @@ -166,14 +166,6 @@ - - - - @confdir@/lamsauthentication.xml - - - - Fisheye: Tag 1.1.6.1 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.3.2.1 refers to a dead (removed) revision in file `lams_build/conf/windows/authentication/lamsauthentication.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_build/conf/windows/jboss/login-config.xml =================================================================== RCS file: /usr/local/cvsroot/lams_build/conf/windows/jboss/login-config.xml,v diff -u -r1.4 -r1.4.6.1 --- lams_build/conf/windows/jboss/login-config.xml 17 Oct 2006 08:19:21 -0000 1.4 +++ lams_build/conf/windows/jboss/login-config.xml 18 Sep 2007 07:20:56 -0000 1.4.6.1 @@ -150,10 +150,10 @@ - + - - java:/MySqlDS + + java:/jdbc/lams-ds select password from lams_user where login=? SELECT DISTINCT r.name,'Roles' FROM @@ -166,13 +166,5 @@ - - - - @confdir@/lamsauthentication.xml - - - -