Index: maven.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/maven.xml,v
retrieving revision 1.46
diff -u -r1.46 maven.xml
--- maven.xml	24 Apr 2004 19:55:25 -0000	1.46
+++ maven.xml	27 Apr 2004 18:52:23 -0000
@@ -17,8 +17,8 @@
          xmlns:j="jelly:core"
          xmlns:maven="jelly:maven"
          xmlns:ant="jelly:ant">
-         
-           
+
+
   <goal name="allClean"
         description="Clean the master project and all subprojects">
     <attainGoal name="subClean"/>
@@ -53,7 +53,7 @@
   <goal name="allBuild"
         description="Build all jars and war">
   	<attainGoal name="db.scripts.gen"/>
-  	<attainGoal name="db.create"/>
+  	<attainGoal name="db.create.test.db"/>
 
     <!-- Build jars -->
     <maven:reactor
@@ -69,7 +69,7 @@
                goals="install"
                banner="Build and Install the common jar"
                postProcessing="false"
-               ignoreFailures="false"/>               
+               ignoreFailures="false"/>
     <maven:reactor
                basedir="${basedir}/commons"
                includes="project.xml"
@@ -149,7 +149,6 @@
                banner="Build and Install the Portlet WAR"
                postProcessing="false"
                ignoreFailures="false"/>
-        
 
      <maven:reactor
                basedir="${basedir}/applications/demo"
@@ -167,11 +166,11 @@
                banner="Build and Install the Demo application WAR"
                postProcessing="false"
                ignoreFailures="false"/>
-               
+
           <attainGoal name="copy.shared.deps" />
   </goal>
-  
-  <goal name="copy.shared.deps"> 
+
+  <goal name="copy.shared.deps">
       <maven:reactor
                basedir="${basedir}"
                includes="portal/project.xml"
@@ -186,10 +185,10 @@
                goals="catalina:shared"
                banner="Deploys container jars to shared/lib to Tomcat"
                postProcessing="false"
-               ignoreFailures="false"/>  
+               ignoreFailures="false"/>
   </goal>
 
- 
+
   <goal name="show.maven.props">
   	<echo message="maven.home.local = ${maven.home.local}" />
   	<echo message="maven.repo.local = ${maven.repo.local}" />
@@ -197,44 +196,44 @@
 
   <goal name="start.production.server">
   	<echo message="====================================" />
-  	<echo message="  Production/Deployment Database    " />  	
+  	<echo message="  Production/Deployment Database    " />
   	<echo message="====================================" />
          <java classname="org.hsqldb.Server" fork="yes">
           <classpath>
             <path refid="maven.dependency.classpath"/>
             <pathelement path="${maven.build.dest}"/>
           </classpath>
-            <arg value="-database" />          
+            <arg value="-database" />
             <arg value="./src/database/hsql/Production" />
-            <arg value="-port" />          
+            <arg value="-port" />
             <arg value="9001" />
-            <arg value="-silent" />          
+            <arg value="-silent" />
             <arg value="true" />
-            <arg value="-trace" />          
+            <arg value="-trace" />
             <arg value="false" />
-        </java>  
+        </java>
   </goal>
-  
+
   <goal name="start.test.server">
   	<echo message="====================================" />
-  	<echo message="        Testing Database            " />  	
+  	<echo message="        Testing Database            " />
   	<echo message="====================================" />
          <java classname="org.hsqldb.Server" fork="yes">
           <classpath>
             <path refid="maven.dependency.classpath"/>
             <pathelement path="${maven.build.dest}"/>
           </classpath>
-            <arg value="-database" />          
+            <arg value="-database" />
             <arg value="./src/database/hsql/Test" />
-            <arg value="-port" />          
+            <arg value="-port" />
             <arg value="9001" />
-            <arg value="-silent" />          
+            <arg value="-silent" />
             <arg value="true" />
-            <arg value="-trace" />          
+            <arg value="-trace" />
             <arg value="false" />
-        </java>  
+        </java>
   </goal>
-      
+
   <goal name="db.scripts.gen" prereqs="torque:init"
         description="Build SQL scripts using Torque generator">
 
@@ -288,9 +287,26 @@
         excludes="${torque.schema.sql.excludes}"
       />
     </torque-sql>
-                 
+
+  </goal>
+
+  <goal name="db.test.properties">
+    <j:set var="org.apache.jetspeed.database.default.name" value="${org.apache.jetspeed.test.database.default.name}"/>
+    <j:set var="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.test.database.url}"/>
+    <j:set var="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.test.database.driver}"/>
+    <j:set var="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.test.database.user}"/>
+    <j:set var="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.test.database.password}"/>
+    <j:set var="org.apache.jetspeed.jdbc.drivers.path" value="${org.apache.jetspeed.test.jdbc.drivers.path}"/>
+  </goal>
+
+  <goal name="db.production.properties">
+    <j:set var="org.apache.jetspeed.database.default.name" value="${org.apache.jetspeed.production.database.default.name}"/>
+    <j:set var="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.production.database.url}"/>
+    <j:set var="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.production.database.driver}"/>
+    <j:set var="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.production.database.user}"/>
+    <j:set var="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.production.database.password}"/>
+    <j:set var="org.apache.jetspeed.jdbc.drivers.path" value="${org.apache.jetspeed.production.jdbc.drivers.path}"/>
   </goal>
-                
 
   <!-- ================================================================ -->
   <!-- EXECUTE a DB SCRIPT                                              -->
@@ -298,11 +314,14 @@
   <!-- ================================================================ -->
   <goal name="db.execute">
     <sql driver="${org.apache.jetspeed.database.driver}"
-         classpathref="maven.dependency.classpath"
          url="${org.apache.jetspeed.database.url}"
          userid="${org.apache.jetspeed.database.user}"
          password="${org.apache.jetspeed.database.password}"
          src="${database.arg.script}">
+      <classpath>
+        <path refid="maven.dependency.classpath"/>
+        <pathelement path="${org.apache.jetspeed.jdbc.drivers.path}"/>
+      </classpath>
     </sql>
   </goal>
 
@@ -310,22 +329,32 @@
   <!-- EXECUTE CREATE DB SQL SCRIPTS                                    -->
   <!-- TODO: I'd like to implement this as a plugin or use commons SQL  -->
   <!-- ================================================================ -->
+  <goal name="db.create.test.db">
+    <attainGoal name="db.test.properties"/>
+    <attainGoal name="db.create"/>
+  </goal>
+
+  <goal name="db.create.production.db">
+    <attainGoal name="db.production.properties"/>
+    <attainGoal name="db.create"/>
+  </goal>
+
   <goal name="db.create">
-    <j:set var="database.arg.script" value="./target/src/sql/${database.default.name}/phase3ojb-schema.sql" />
+    <j:set var="database.arg.script" value="./target/src/sql/${org.apache.jetspeed.database.default.name}/phase3ojb-schema.sql" />
     <attainGoal name="db.execute" />
-    <j:set var="database.arg.script" value="./target/src/sql/${database.default.name}/phase1-schema.sql" />
+    <j:set var="database.arg.script" value="./target/src/sql/${org.apache.jetspeed.database.default.name}/phase1-schema.sql" />
     <attainGoal name="db.execute" />
-    <j:set var="database.arg.script" value="./target/src/sql/${database.default.name}/phase2-schema.sql" />
+    <j:set var="database.arg.script" value="./target/src/sql/${org.apache.jetspeed.database.default.name}/phase2-schema.sql" />
     <attainGoal name="db.execute" />
-    <j:set var="database.arg.script" value="./target/src/sql/${database.default.name}/registry-schema.sql" />
+    <j:set var="database.arg.script" value="./target/src/sql/${org.apache.jetspeed.database.default.name}/registry-schema.sql" />
     <attainGoal name="db.execute" />
-    <j:set var="database.arg.script" value="./target/src/sql/${database.default.name}/prefs-schema.sql" />
+    <j:set var="database.arg.script" value="./target/src/sql/${org.apache.jetspeed.database.default.name}/prefs-schema.sql" />
     <attainGoal name="db.execute" />
-    <j:set var="database.arg.script" value="./target/src/sql/${database.default.name}/security-schema.sql" />
+    <j:set var="database.arg.script" value="./target/src/sql/${org.apache.jetspeed.database.default.name}/security-schema.sql" />
     <attainGoal name="db.execute" />
     <j:set var="database.arg.script" value="./src/sql/populate-db-default.sql" />
     <attainGoal name="db.execute" />
-    <j:set var="database.arg.script" value="./target/src/sql/${database.default.name}/test-persistence-schema.sql" />
+    <j:set var="database.arg.script" value="./target/src/sql/${org.apache.jetspeed.database.default.name}/test-persistence-schema.sql" />
     <attainGoal name="db.execute" />
   </goal>
 
@@ -334,9 +363,9 @@
   <!-- TODO: I'd like to implement this as a plugin or use commons SQL  -->
   <!-- ================================================================ -->
   <goal name="db.drop">
-    <j:set var="database.arg.script" value="./src/sql/${database.default.name}/drop-db.sql" />
+    <j:set var="database.arg.script" value="./src/sql/${org.apache.database.default.name}/drop-db.sql" />
     <attainGoal name="db.execute" />
-    <j:set var="database.arg.script" value="./src/sql/${database.default.name}/registry-drop-db.sql" />
+    <j:set var="database.arg.script" value="./src/sql/${org.apache.database.default.name}/registry-drop-db.sql" />
     <attainGoal name="db.execute" />
   </goal>
 
@@ -346,9 +375,9 @@
   <!-- ================================================================ -->
   <goal name="db.recreate">
 <!--    <attainGoal name="db.drop" /> -->
-    <attainGoal name="db.create" />
+    <attainGoal name="db.create.production.db" />
   </goal>
-  
+
     <goal name="quickStart"
         description="Creates the production DB and calls portal/maven fulDeploy">
         <attainGoal name="db.recreate" />
@@ -359,6 +388,6 @@
                banner="Deploying basic Jetspeed portal suite"
                postProcessing="false"
                ignoreFailures="false"/>
-    </goal>        
+    </goal>
 
 </project>
Index: project.properties
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/project.properties,v
retrieving revision 1.15
diff -u -r1.15 project.properties
--- project.properties	24 Apr 2004 19:55:25 -0000	1.15
+++ project.properties	27 Apr 2004 18:52:23 -0000
@@ -3,9 +3,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -37,12 +37,23 @@
 org.apache.jetspeed.database.user \
 org.apache.jetspeed.database.password
 
-org.apache.jetspeed.database.url = jdbc:hsqldb:hsql://127.0.0.1:9001
-org.apache.jetspeed.database.driver = org.hsqldb.jdbcDriver
-org.apache.jetspeed.database.user = sa
-org.apache.jetspeed.database.password = 
-
-database.default.name=hsql
+org.apache.jetspeed.test.database.url = jdbc:hsqldb:hsql://127.0.0.1:9001
+org.apache.jetspeed.test.database.driver = org.hsqldb.jdbcDriver
+org.apache.jetspeed.test.database.user = sa
+org.apache.jetspeed.test.database.password =
+
+org.apache.jetspeed.test.jdbc.drivers.path=
+org.apache.jetspeed.test.database.default.name=hsql
+org.apache.jetspeed.test.database.ojb.platform=Hsqldb
+
+org.apache.jetspeed.production.database.url = jdbc:hsqldb:hsql://127.0.0.1:9001
+org.apache.jetspeed.production.database.driver = org.hsqldb.jdbcDriver
+org.apache.jetspeed.production.database.user = sa
+org.apache.jetspeed.production.database.password =
+
+org.apache.jetspeed.production.jdbc.drivers.path=
+org.apache.jetspeed.production.database.default.name=hsql
+org.apache.jetspeed.production.database.ojb.platform=Hsqldb
 
 # ---------------------------------------------------------------------------
 # Torque settings
@@ -50,7 +61,7 @@
 torque.schema.sql.includes = *-schema.xml
 torque.schema.sql.excludes =
 torque.schema.dir = ${maven.src.dir}/schema
-torque.idTableXMLFile = 
+torque.idTableXMLFile =
 torque.template.sql = sql/base/Control.vm
 
 # ---------------------------------------------------------------------------
Index: components/jetspeed/maven.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/components/jetspeed/maven.xml,v
retrieving revision 1.4
diff -u -r1.4 maven.xml
--- components/jetspeed/maven.xml	18 Mar 2004 14:38:17 -0000	1.4
+++ components/jetspeed/maven.xml	27 Apr 2004 18:52:28 -0000
@@ -14,16 +14,27 @@
 limitations under the License.
 -->
 <project default="java:jar"
-         xmlns:j="jelly:core" 
+         xmlns:j="jelly:core"
          xmlns:define="jelly:define"
+         xmlns:maven="jelly:maven"
          xmlns:reactor="reactor">
 
   <!-- Target of maven test:single test -->
-  <property name='testcase' value='org.apache.jetspeed.idgenerator.TestIdGenerator'/> 
-  
+  <property name='testcase' value='org.apache.jetspeed.idgenerator.TestIdGenerator'/>
+
    <goal name="deployJar">
   	<attainGoal name="jar:install"/>
   	<copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
   </goal>
+
+  <preGoal name="test:test">
+    <j:set var="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.test.database.url}"/>
+    <j:set var="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.test.database.driver}"/>
+    <j:set var="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.test.database.user}"/>
+    <j:set var="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.test.database.password}"/>
+
+    <path id="jdbc.drivers.path" path="${org.apache.jetspeed.test.jdbc.drivers.path}"/>
+    <maven:addPath id="maven.dependency.classpath" refid="jdbc.drivers.path"/>
+  </preGoal>
 
 </project>
Index: components/jetspeed/project.properties
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/components/jetspeed/project.properties,v
retrieving revision 1.4
diff -u -r1.4 project.properties
--- components/jetspeed/project.properties	29 Mar 2004 04:53:32 -0000	1.4
+++ components/jetspeed/project.properties	27 Apr 2004 18:52:28 -0000
@@ -3,9 +3,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -41,10 +41,14 @@
 maven.junit.sysproperties=org.apache.jetspeed.database.url \
 org.apache.jetspeed.database.driver \
 org.apache.jetspeed.database.user \
-org.apache.jetspeed.database.password
-
-org.apache.jetspeed.database.url = jdbc:hsqldb:hsql://127.0.0.1:9001
-org.apache.jetspeed.database.driver = org.hsqldb.jdbcDriver
-org.apache.jetspeed.database.user = sa
-org.apache.jetspeed.database.password = 
+org.apache.jetspeed.database.password \
+p6.home
 
+org.apache.jetspeed.test.database.url = jdbc:hsqldb:hsql://127.0.0.1:9001
+org.apache.jetspeed.test.database.driver = org.hsqldb.jdbcDriver
+org.apache.jetspeed.test.database.user = sa
+org.apache.jetspeed.test.database.password =
+
+org.apache.jetspeed.test.jdbc.drivers.path=
+org.apache.jetspeed.test.database.default.name=hsql
+org.apache.jetspeed.test.database.ojb.platform=Hsqldb
Index: components/persistence/maven.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/components/persistence/maven.xml,v
retrieving revision 1.3
diff -u -r1.3 maven.xml
--- components/persistence/maven.xml	18 Mar 2004 14:38:25 -0000	1.3
+++ components/persistence/maven.xml	27 Apr 2004 18:52:30 -0000
@@ -14,18 +14,34 @@
 limitations under the License.
 -->
 <project default="java:jar"
-         xmlns:j="jelly:core" 
+         xmlns:j="jelly:core"
          xmlns:define="jelly:define"
+         xmlns:maven="jelly:maven"
          xmlns:reactor="reactor">
 
   <!-- Target of maven test:single test -->
-  <property name='testcase' value='org.apache.jetspeed.components.TestComponentManager'/> 
-  
- 
+  <property name='testcase' value='org.apache.jetspeed.components.TestComponentManager'/>
+
+
    <goal name="deployJar">
   	<attainGoal name="jar:install"/>
 
   	<copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
   </goal>
+
+  <preGoal name="test:test">
+    <j:set var="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.test.database.url}"/>
+    <j:set var="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.test.database.driver}"/>
+    <j:set var="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.test.database.user}"/>
+    <j:set var="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.test.database.password}"/>
+    <copy file="src/test/repository_database.xml" todir="${maven.test.dest}" overwrite="true">
+    <filterset begintoken="@" endtoken="@">
+        <filter token="PLATFORM" value="${org.apache.jetspeed.test.database.ojb.platform}"/>
+    </filterset>
+    </copy>
+
+    <path id="jdbc.drivers.path" path="${org.apache.jetspeed.test.jdbc.drivers.path}"/>
+    <maven:addPath id="maven.dependency.classpath" refid="jdbc.drivers.path"/>
+  </preGoal>
 
 </project>
Index: components/persistence/project.properties
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/components/persistence/project.properties,v
retrieving revision 1.4
diff -u -r1.4 project.properties
--- components/persistence/project.properties	29 Mar 2004 05:02:33 -0000	1.4
+++ components/persistence/project.properties	27 Apr 2004 18:52:30 -0000
@@ -3,9 +3,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -39,16 +39,18 @@
 # Include private method and field in Javadoc.
 maven.multiproject.type=jar
 
-database.default.name=hsql
-
 # Sets up the system properties for the test JDBC datasource
 maven.junit.sysproperties=org.apache.jetspeed.database.url \
 org.apache.jetspeed.database.driver \
 org.apache.jetspeed.database.user \
-org.apache.jetspeed.database.password
-
-org.apache.jetspeed.database.url = jdbc:hsqldb:hsql://127.0.0.1:9001
-org.apache.jetspeed.database.driver = org.hsqldb.jdbcDriver
-org.apache.jetspeed.database.user = sa
-org.apache.jetspeed.database.password = 
+org.apache.jetspeed.database.password \
+p6.home
 
+org.apache.jetspeed.test.database.url = jdbc:hsqldb:hsql://127.0.0.1:9001
+org.apache.jetspeed.test.database.driver = org.hsqldb.jdbcDriver
+org.apache.jetspeed.test.database.user = sa
+org.apache.jetspeed.test.database.password =
+
+org.apache.jetspeed.test.jdbc.drivers.path=
+org.apache.jetspeed.test.database.default.name=hsql
+org.apache.jetspeed.test.database.ojb.platform=Hsqldb
Index: components/persistence/project.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/components/persistence/project.xml,v
retrieving revision 1.8
diff -u -r1.8 project.xml
--- components/persistence/project.xml	29 Mar 2004 05:02:33 -0000	1.8
+++ components/persistence/project.xml	27 Apr 2004 18:52:30 -0000
@@ -26,12 +26,12 @@
 	  Persistence Components
   </description>
   <shortDescription>Persistence Components</shortDescription>
-  <repository>                 
+  <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-jetspeed-2/components/persistence</connection>
     <url>http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/persistence/</url>
   </repository>
 
-  <dependencies>  
+  <dependencies>
   	<dependency>
       <id>jetspeed-cm</id>
       <groupId>jetspeed2</groupId>
@@ -39,7 +39,7 @@
       <properties>
         <war.bundle.jar>true</war.bundle.jar>
       </properties>
-    </dependency> 
+    </dependency>
      <dependency>
       <id>jetspeed-commons</id>
       <groupId>jetspeed2</groupId>
@@ -56,7 +56,7 @@
       <properties>
         <war.bundle.jar>false</war.bundle.jar>
       </properties>
-    </dependency>       	
+    </dependency>
   	 <dependency>
       <id>commons-lang</id>
       <version>2.0</version>
@@ -92,8 +92,8 @@
       <properties>
         <war.bundle.jar>true</war.bundle.jar>
       </properties>
-    </dependency>   
-    
+    </dependency>
+
     <dependency>
       <id>commons-configuration</id>
       <version>1.0-dev</version>
@@ -143,8 +143,8 @@
       <properties>
         <war.bundle.jar>true</war.bundle.jar>
       </properties>
-    </dependency>    
-    <dependency>    	
+    </dependency>
+    <dependency>
       <id>jdbc-se</id>
       <jar>jdbc-se2.0.jar</jar>
       <properties>
@@ -200,7 +200,7 @@
       <properties>
         <war.bundle.jar>true</war.bundle.jar>
       </properties>
-    </dependency>    
+    </dependency>
      <dependency>
       <id>groovy</id>
      <version>1.0-beta-4-snapshot</version>
@@ -242,15 +242,15 @@
   <build>
     <sourceDirectory>src/java</sourceDirectory>
     <sourceModifications >
-    	
+
     <sourceModification >
     	<className>foo.bar</className>
       <excludes>
          <exclude>**/otm/*.java</exclude>
-      </excludes>	
+      </excludes>
     </sourceModification>
     </sourceModifications>
-    
+
     <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
     <unitTest>
        <includes>
@@ -261,11 +261,12 @@
           <directory>${basedir}/src/test</directory>
           <excludes>
            <exclude>**/*.java</exclude>
+          <exclude>repository_database.xml</exclude>
           </excludes>
         </resource>
       </resources>
     </unitTest>
-    
+
     <resources>
       <resource>
         <directory>${basedir}/src/java</directory>
@@ -274,6 +275,6 @@
         </excludes>
       </resource>
     </resources>
-    
+
   </build>
 </project>
Index: components/persistence/src/test/repository_database.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/components/persistence/src/test/repository_database.xml,v
retrieving revision 1.1
diff -u -r1.1 repository_database.xml
--- components/persistence/src/test/repository_database.xml	24 Feb 2004 00:35:37 -0000	1.1
+++ components/persistence/src/test/repository_database.xml	27 Apr 2004 18:52:32 -0000
@@ -16,12 +16,12 @@
 
     <jdbc-connection-descriptor
         jcd-alias="jetspeed"
-        platform="Hsqldb"
+        platform="@PLATFORM@"
         default-connection="true"
         jdbc-level="2.0"
          jndi-datasource-name="java:comp/env/jdbc/jetspeed"
         batch-mode="false"
-     >     
+     >
 
         <connection-pool
             maxActive="21"
Index: components/prefs/maven.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/components/prefs/maven.xml,v
retrieving revision 1.6
diff -u -r1.6 maven.xml
--- components/prefs/maven.xml	18 Mar 2004 14:38:33 -0000	1.6
+++ components/prefs/maven.xml	27 Apr 2004 18:52:32 -0000
@@ -14,19 +14,20 @@
 limitations under the License.
 -->
 <project default="java:jar"
-         xmlns:j="jelly:core" 
+         xmlns:j="jelly:core"
          xmlns:define="jelly:define"
+         xmlns:maven="jelly:maven"
          xmlns:reactor="reactor">
 
   <!-- Target of maven test:single test -->
-  <property name='testcase' value='org.apache.jetspeed.prefs.TestPropertyManager'/> 
-    
+  <property name='testcase' value='org.apache.jetspeed.prefs.TestPropertyManager'/>
+
   <goal name="deployJar">
   	<attainGoal name="jar:install"/>
 
   	<copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
   </goal>
-  
+
   <!-- ================================================================ -->
   <!-- Merge OJB desriptor with Jetspeed main OJB descriptor            -->
   <!-- ================================================================ -->
@@ -40,10 +41,25 @@
 
   	<copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
   </goal>
-  
+
   <goal name="build.prefs">
   	<attainGoal name="ojb.registry"/>
   	<attainGoal name="jar:install"/>
 </goal>
+
+  <preGoal name="test:test">
+    <j:set var="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.test.database.url}"/>
+    <j:set var="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.test.database.driver}"/>
+    <j:set var="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.test.database.user}"/>
+    <j:set var="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.test.database.password}"/>
+    <copy file="src/test/repository_database.xml" todir="${maven.test.dest}" overwrite="true">
+    <filterset begintoken="@" endtoken="@">
+        <filter token="PLATFORM" value="${org.apache.jetspeed.test.database.ojb.platform}"/>
+    </filterset>
+    </copy>
+
+    <path id="jdbc.drivers.path" path="${org.apache.jetspeed.test.jdbc.drivers.path}"/>
+    <maven:addPath id="maven.dependency.classpath" refid="jdbc.drivers.path"/>
+  </preGoal>
 
 </project>
Index: components/prefs/project.properties
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/components/prefs/project.properties,v
retrieving revision 1.7
diff -u -r1.7 project.properties
--- components/prefs/project.properties	29 Mar 2004 04:54:39 -0000	1.7
+++ components/prefs/project.properties	27 Apr 2004 18:52:32 -0000
@@ -3,9 +3,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -41,15 +41,18 @@
 
 maven.junit.fork=true
 
-database.default.name=hsql
-
 # Sets up the system properties for the test JDBC datasource
 maven.junit.sysproperties=org.apache.jetspeed.database.url \
 org.apache.jetspeed.database.driver \
 org.apache.jetspeed.database.user \
-org.apache.jetspeed.database.password
+org.apache.jetspeed.database.password \
+p6.home
 
-org.apache.jetspeed.database.url = jdbc:hsqldb:hsql://127.0.0.1:9001
-org.apache.jetspeed.database.driver = org.hsqldb.jdbcDriver
-org.apache.jetspeed.database.user = sa
-org.apache.jetspeed.database.password = 
\ No newline at end of file
+org.apache.jetspeed.test.database.url = jdbc:hsqldb:hsql://127.0.0.1:9001
+org.apache.jetspeed.test.database.driver = org.hsqldb.jdbcDriver
+org.apache.jetspeed.test.database.user = sa
+org.apache.jetspeed.test.database.password =
+
+org.apache.jetspeed.test.jdbc.drivers.path=
+org.apache.jetspeed.test.database.default.name=hsql
+org.apache.jetspeed.test.database.ojb.platform=Hsqldb
Index: components/prefs/project.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/components/prefs/project.xml,v
retrieving revision 1.5
diff -u -r1.5 project.xml
--- components/prefs/project.xml	29 Mar 2004 04:54:39 -0000	1.5
+++ components/prefs/project.xml	27 Apr 2004 18:52:32 -0000
@@ -26,12 +26,12 @@
   </description>
   <shortDescription>Preferences SPI Components</shortDescription>
 
-  <repository>                 
+  <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-jetspeed-2/components/perfs</connection>
     <url>http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/perfs/</url>
   </repository>
 
-  <dependencies>  
+  <dependencies>
     <dependency>
       <id>jetspeed-cm</id>
       <groupId>jetspeed2</groupId>
@@ -39,7 +39,7 @@
       <properties>
         <war.bundle.jar>true</war.bundle.jar>
       </properties>
-    </dependency>  
+    </dependency>
     <dependency>
       <id>jetspeed-persistence</id>
       <groupId>jetspeed2</groupId>
@@ -56,7 +56,7 @@
       <properties>
         <war.bundle.jar>false</war.bundle.jar>
       </properties>
-    </dependency>    	
+    </dependency>
   	 <dependency>
       <id>commons-lang</id>
       <version>2.0</version>
@@ -92,8 +92,8 @@
       <properties>
         <war.bundle.jar>true</war.bundle.jar>
       </properties>
-    </dependency>   
-    
+    </dependency>
+
     <dependency>
       <id>commons-configuration</id>
       <version>1.0-dev</version>
@@ -144,8 +144,8 @@
       <properties>
         <war.bundle.jar>true</war.bundle.jar>
       </properties>
-    </dependency>    
-    <dependency>    	
+    </dependency>
+    <dependency>
       <id>jdbc-se</id>
       <jar>jdbc-se2.0.jar</jar>
       <properties>
@@ -202,7 +202,7 @@
       <properties>
         <war.bundle.jar>true</war.bundle.jar>
       </properties>
-    </dependency>    
+    </dependency>
      <dependency>
       <id>groovy</id>
      <version>1.0-beta-4-snapshot</version>
@@ -216,7 +216,7 @@
       <properties>
         <war.bundle.jar>true</war.bundle.jar>
       </properties>
-    </dependency>    
+    </dependency>
     <dependency>
       <id>jta</id>
       <jar>jta1.0.1.jar</jar>
@@ -245,6 +245,7 @@
           <directory>${basedir}/src/test</directory>
           <excludes>
            <exclude>**/*.java</exclude>
+           <exclude>repository_database.xml</exclude>
           </excludes>
         </resource>
         <resource>
@@ -255,7 +256,7 @@
       </resource>
       </resources>
     </unitTest>
-    
+
     <resources>
       <resource>
         <directory>${basedir}/src/java</directory>
@@ -264,6 +265,6 @@
         </excludes>
       </resource>
     </resources>
-    
+
   </build>
 </project>
Index: components/prefs/src/test/repository_database.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/components/prefs/src/test/repository_database.xml,v
retrieving revision 1.3
diff -u -r1.3 repository_database.xml
--- components/prefs/src/test/repository_database.xml	18 Mar 2004 19:32:27 -0000	1.3
+++ components/prefs/src/test/repository_database.xml	27 Apr 2004 18:52:34 -0000
@@ -31,12 +31,12 @@
 
     <jdbc-connection-descriptor
         jcd-alias="jetspeed"
-        platform="Hsqldb"
+        platform="@PLATFORM@"
         default-connection="true"
         jdbc-level="2.0"
         jndi-datasource-name="java:comp/env/jdbc/jetspeed"
         batch-mode="false"
-     >     
+     >
 
         <connection-pool
             maxActive="21"
Index: components/rdbms/maven.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/components/rdbms/maven.xml,v
retrieving revision 1.2
diff -u -r1.2 maven.xml
--- components/rdbms/maven.xml	18 Mar 2004 14:38:42 -0000	1.2
+++ components/rdbms/maven.xml	27 Apr 2004 18:52:34 -0000
@@ -14,12 +14,13 @@
 limitations under the License.
 -->
 <project default="java:jar"
-         xmlns:j="jelly:core" 
+         xmlns:j="jelly:core"
+         xmlns:maven="jelly:maven"
          xmlns:define="jelly:define"
          xmlns:reactor="reactor">
 
   <!-- Target of maven test:single test -->
-  <property name='testcase' value='org.apache.jetspeed.components.TestComponentManager'/> 
+  <property name='testcase' value='org.apache.jetspeed.components.TestComponentManager'/>
    <goal name="deployJar">
    	<echo message="BaseDir=${basedir}"/>
   	<attainGoal name="jar:install"/>
@@ -27,5 +28,15 @@
 
   	<copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
   </goal>
+
+  <preGoal name="test:test">
+    <j:set var="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.test.database.url}"/>
+    <j:set var="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.test.database.driver}"/>
+    <j:set var="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.test.database.user}"/>
+    <j:set var="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.test.database.password}"/>
+
+    <path id="jdbc.drivers.path" path="${org.apache.jetspeed.test.jdbc.drivers.path}"/>
+    <maven:addPath id="maven.dependency.classpath" refid="jdbc.drivers.path"/>
+  </preGoal>
 
 </project>
Index: components/rdbms/project.properties
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/components/rdbms/project.properties,v
retrieving revision 1.4
diff -u -r1.4 project.properties
--- components/rdbms/project.properties	29 Mar 2004 04:55:32 -0000	1.4
+++ components/rdbms/project.properties	27 Apr 2004 18:52:34 -0000
@@ -3,9 +3,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -43,9 +43,14 @@
 maven.junit.sysproperties=org.apache.jetspeed.database.url \
 org.apache.jetspeed.database.driver \
 org.apache.jetspeed.database.user \
-org.apache.jetspeed.database.password
+org.apache.jetspeed.database.password \
+p6.home
 
-org.apache.jetspeed.database.url = jdbc:hsqldb:hsql://127.0.0.1:9001
-org.apache.jetspeed.database.driver = org.hsqldb.jdbcDriver
-org.apache.jetspeed.database.user = sa
-org.apache.jetspeed.database.password = 
\ No newline at end of file
+org.apache.jetspeed.test.database.url = jdbc:hsqldb:hsql://127.0.0.1:9001
+org.apache.jetspeed.test.database.driver = org.hsqldb.jdbcDriver
+org.apache.jetspeed.test.database.user = sa
+org.apache.jetspeed.test.database.password =
+
+org.apache.jetspeed.test.jdbc.drivers.path=
+org.apache.jetspeed.test.database.default.name=hsql
+org.apache.jetspeed.test.database.ojb.platform=Hsqldb
Index: components/registry/maven.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/components/registry/maven.xml,v
retrieving revision 1.14
diff -u -r1.14 maven.xml
--- components/registry/maven.xml	24 Apr 2004 19:05:54 -0000	1.14
+++ components/registry/maven.xml	27 Apr 2004 18:52:34 -0000
@@ -14,27 +14,28 @@
 limitations under the License.
 -->
 <project default="java:jar"
-         xmlns:j="jelly:core" 
+         xmlns:j="jelly:core"
          xmlns:define="jelly:define"
+         xmlns:maven="jelly:maven"
          xmlns:reactor="reactor">
 
 <!--
   <preGoal name="test:test">
   	<attainGoal name="db.recreate"/>
   </preGoal>
-<property name='testcase' value='org.apache.jetspeed.components.portletregistry.TestRegistryDirect'/> 
-<property name='testcase' value='org.apache.jetspeed.components.portletentity.TestPortletEntityAccessComponent'/> 
+<property name='testcase' value='org.apache.jetspeed.components.portletregistry.TestRegistryDirect'/>
+<property name='testcase' value='org.apache.jetspeed.components.portletentity.TestPortletEntityAccessComponent'/>
+
+-->
+<property name='testcase' value='org.apache.jetspeed.components.portletregistry.TestRegistryDirect'/>
 
--->  
-<property name='testcase' value='org.apache.jetspeed.components.portletregistry.TestRegistryDirect'/> 
 
-  
    <goal name="deployJar">
   	<attainGoal name="jar:install"/>
 
   	<copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
   </goal>
-  
+
    <!-- ================================================================ -->
   <!-- Merge OJB desriptor with Jetspeed main OJB descriptor                                              -->
   <!-- ================================================================ -->
@@ -43,16 +44,31 @@
 <!--    <copy  file="${basedir}/src/java/repository_registry.xml" tofile="${basedir}/../../portal/src/test/repository_registry.xml"/> -->
    </goal>
 
-    
+
   <goal name="deployJar">
   	<attainGoal name="jar:install"/>
 
   	<copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
   </goal>
-  
-  <goal name="build.registry">  	
+
+  <goal name="build.registry">
   	<attainGoal name="ojb.registry"/>
   	<attainGoal name="jar:install"/>
- </goal> 
+ </goal>
+
+  <preGoal name="test:test">
+    <j:set var="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.test.database.url}"/>
+    <j:set var="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.test.database.driver}"/>
+    <j:set var="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.test.database.user}"/>
+    <j:set var="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.test.database.password}"/>
+    <copy file="src/test/repository_database.xml" todir="${maven.test.dest}" overwrite="true">
+    <filterset begintoken="@" endtoken="@">
+        <filter token="PLATFORM" value="${org.apache.jetspeed.test.database.ojb.platform}"/>
+    </filterset>
+    </copy>
+
+    <path id="jdbc.drivers.path" path="${org.apache.jetspeed.test.jdbc.drivers.path}"/>
+    <maven:addPath id="maven.dependency.classpath" refid="jdbc.drivers.path"/>
+  </preGoal>
 
 </project>
Index: components/registry/project.properties
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/components/registry/project.properties,v
retrieving revision 1.5
diff -u -r1.5 project.properties
--- components/registry/project.properties	29 Mar 2004 04:54:50 -0000	1.5
+++ components/registry/project.properties	27 Apr 2004 18:52:34 -0000
@@ -3,9 +3,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +17,7 @@
 
 # Display the date on the Maven web site
 maven.xdoc.date = left
-	
+
 # Display the maven version the web site is documenting
 maven.xdoc.version = ${pom.currentVersion}
 
@@ -39,15 +39,19 @@
 # Include private method and field in Javadoc.
 maven.multiproject.type=jar
 
-database.default.name=hsql
-
 # Sets up the system properties for the test JDBC datasource
 maven.junit.sysproperties=org.apache.jetspeed.database.url \
 org.apache.jetspeed.database.driver \
 org.apache.jetspeed.database.user \
-org.apache.jetspeed.database.password
+org.apache.jetspeed.database.password \
+p6.home
 
-org.apache.jetspeed.database.url = jdbc:hsqldb:hsql://127.0.0.1:9001
-org.apache.jetspeed.database.driver = org.hsqldb.jdbcDriver
-org.apache.jetspeed.database.user = sa
-org.apache.jetspeed.database.password = 
\ No newline at end of file
+org.apache.jetspeed.test.database.url = jdbc:hsqldb:hsql://127.0.0.1:9001
+org.apache.jetspeed.test.database.driver = org.hsqldb.jdbcDriver
+org.apache.jetspeed.test.database.user = sa
+org.apache.jetspeed.test.database.password =
+
+org.apache.jetspeed.test.jdbc.drivers.path=
+org.apache.jetspeed.test.database.default.name=hsql
+org.apache.jetspeed.test.database.ojb.platform=Hsqldb
+ 
\ No newline at end of file
Index: components/registry/project.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/components/registry/project.xml,v
retrieving revision 1.11
diff -u -r1.11 project.xml
--- components/registry/project.xml	19 Apr 2004 17:44:57 -0000	1.11
+++ components/registry/project.xml	27 Apr 2004 18:52:35 -0000
@@ -26,13 +26,13 @@
 	  Registry Components
   </description>
 
-  <repository>                 
+  <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-jetspeed-2/components/registry</connection>
     <url>http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/registry/</url>
   </repository>
 
   <shortDescription>Registry Components</shortDescription>
-  <dependencies>  
+  <dependencies>
   	<dependency>
       <id>jetspeed-cm</id>
       <groupId>jetspeed2</groupId>
@@ -40,7 +40,7 @@
       <properties>
         <war.bundle.jar>true</war.bundle.jar>
       </properties>
-    </dependency>  
+    </dependency>
     <dependency>
       <id>jetspeed-persistence</id>
       <groupId>jetspeed2</groupId>
@@ -57,7 +57,7 @@
       <properties>
         <war.bundle.jar>false</war.bundle.jar>
       </properties>
-    </dependency>    	
+    </dependency>
   	 <dependency>
       <id>commons-lang</id>
       <version>2.0</version>
@@ -93,8 +93,8 @@
       <properties>
         <war.bundle.jar>true</war.bundle.jar>
       </properties>
-    </dependency>   
-    
+    </dependency>
+
     <dependency>
       <id>commons-configuration</id>
       <version>1.0-dev</version>
@@ -144,8 +144,8 @@
       <properties>
         <war.bundle.jar>true</war.bundle.jar>
       </properties>
-    </dependency>    
-    <dependency>    	
+    </dependency>
+    <dependency>
       <id>jdbc-se</id>
       <jar>jdbc-se2.0.jar</jar>
       <properties>
@@ -201,7 +201,7 @@
       <properties>
         <war.bundle.jar>true</war.bundle.jar>
       </properties>
-    </dependency>    
+    </dependency>
      <dependency>
       <id>groovy</id>
      <version>1.0-beta-4-snapshot</version>
@@ -215,7 +215,7 @@
       <properties>
         <war.bundle.jar>true</war.bundle.jar>
       </properties>
-    </dependency>    
+    </dependency>
     <dependency>
       <id>jetspeed-commons</id>
       <groupId>jetspeed2</groupId>
@@ -278,8 +278,8 @@
   </dependencies>
   <build>
     <sourceDirectory>src/java</sourceDirectory>
- 
-    
+
+
     <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
     <unitTest>
       <resources>
@@ -287,6 +287,7 @@
           <directory>${basedir}/src/test</directory>
           <excludes>
            <exclude>**/*.java</exclude>
+           <exclude>repository_database.xml</exclude>
           </excludes>
         </resource>
         <resource>
@@ -297,7 +298,7 @@
       </resource>
       </resources>
     </unitTest>
-    
+
     <resources>
       <resource>
         <directory>${basedir}/src/java</directory>
@@ -306,6 +307,6 @@
         </excludes>
       </resource>
     </resources>
-    
+
   </build>
 </project>
Index: components/registry/src/test/repository_database.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/components/registry/src/test/repository_database.xml,v
retrieving revision 1.3
diff -u -r1.3 repository_database.xml
--- components/registry/src/test/repository_database.xml	18 Mar 2004 19:31:36 -0000	1.3
+++ components/registry/src/test/repository_database.xml	27 Apr 2004 18:52:37 -0000
@@ -30,12 +30,12 @@
 
     <jdbc-connection-descriptor
         jcd-alias="jetspeed"
-        platform="Hsqldb"
+        platform="@PLATFORM@"
         default-connection="true"
         jdbc-level="2.0"
         jndi-datasource-name="java:comp/env/jdbc/jetspeed"
         batch-mode="false"
-     >     
+     >
 
         <connection-pool
             maxActive="21"
Index: components/security/maven.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/components/security/maven.xml,v
retrieving revision 1.2
diff -u -r1.2 maven.xml
--- components/security/maven.xml	18 Mar 2004 14:38:59 -0000	1.2
+++ components/security/maven.xml	27 Apr 2004 18:52:37 -0000
@@ -14,19 +14,20 @@
 limitations under the License.
 -->
 <project default="java:jar"
-         xmlns:j="jelly:core" 
+         xmlns:j="jelly:core"
          xmlns:define="jelly:define"
+         xmlns:maven="jelly:maven"
          xmlns:reactor="reactor">
 
   <!-- Target of maven test:single test -->
-  <property name='testcase' value='org.apache.jetspeed.security.TestLoginModule'/> 
-    
+  <property name='testcase' value='org.apache.jetspeed.security.TestLoginModule'/>
+
   <goal name="deployJar">
   	<attainGoal name="jar:install"/>
 
   	<copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
   </goal>
-  
+
   <!-- ================================================================ -->
   <!-- Merge OJB desriptor with Jetspeed main OJB descriptor            -->
   <!-- ================================================================ -->
@@ -40,10 +41,25 @@
 
   	<copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
   </goal>
-  
+
   <goal name="build.security">
   	<attainGoal name="ojb.registry"/>
   	<attainGoal name="jar:install"/>
 </goal>
+
+  <preGoal name="test:test">
+    <j:set var="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.test.database.url}"/>
+    <j:set var="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.test.database.driver}"/>
+    <j:set var="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.test.database.user}"/>
+    <j:set var="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.test.database.password}"/>
+    <copy file="src/test/repository_database.xml" todir="${maven.test.dest}" overwrite="true">
+    <filterset begintoken="@" endtoken="@">
+        <filter token="PLATFORM" value="${org.apache.jetspeed.test.database.ojb.platform}"/>
+    </filterset>
+    </copy>
+
+    <path id="jdbc.drivers.path" path="${org.apache.jetspeed.test.jdbc.drivers.path}"/>
+    <maven:addPath id="maven.dependency.classpath" refid="jdbc.drivers.path"/>
+  </preGoal>
 
 </project>
Index: components/security/project.properties
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/components/security/project.properties,v
retrieving revision 1.5
diff -u -r1.5 project.properties
--- components/security/project.properties	29 Mar 2004 04:55:11 -0000	1.5
+++ components/security/project.properties	27 Apr 2004 18:52:37 -0000
@@ -3,9 +3,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -41,15 +41,18 @@
 
 maven.junit.fork=true
 
-database.default.name=hsql
-
 # Sets up the system properties for the test JDBC datasource
 maven.junit.sysproperties=org.apache.jetspeed.database.url \
 org.apache.jetspeed.database.driver \
 org.apache.jetspeed.database.user \
-org.apache.jetspeed.database.password
+org.apache.jetspeed.database.password \
+p6.home
 
-org.apache.jetspeed.database.url = jdbc:hsqldb:hsql://127.0.0.1:9001
-org.apache.jetspeed.database.driver = org.hsqldb.jdbcDriver
-org.apache.jetspeed.database.user = sa
-org.apache.jetspeed.database.password = 
\ No newline at end of file
+org.apache.jetspeed.test.database.url = jdbc:hsqldb:hsql://127.0.0.1:9001
+org.apache.jetspeed.test.database.driver = org.hsqldb.jdbcDriver
+org.apache.jetspeed.test.database.user = sa
+org.apache.jetspeed.test.database.password =
+
+org.apache.jetspeed.test.jdbc.drivers.path=
+org.apache.jetspeed.test.database.default.name=hsql
+org.apache.jetspeed.test.database.ojb.platform=Hsqldb
Index: components/security/project.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/components/security/project.xml,v
retrieving revision 1.5
diff -u -r1.5 project.xml
--- components/security/project.xml	29 Mar 2004 04:55:11 -0000	1.5
+++ components/security/project.xml	27 Apr 2004 18:52:37 -0000
@@ -27,7 +27,7 @@
   </description>
   <shortDescription>Security Components</shortDescription>
 
-  <repository>                 
+  <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-jetspeed-2/components/security</connection>
     <url>http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/</url>
   </repository>
@@ -56,7 +56,7 @@
       </properties>
     </dependency>
 
-	<!-- Components -->  
+	<!-- Components -->
   	<dependency>
       <id>jetspeed-cm</id>
       <groupId>jetspeed2</groupId>
@@ -64,7 +64,7 @@
       <properties>
         <war.bundle.jar>true</war.bundle.jar>
       </properties>
-    </dependency>  
+    </dependency>
     <dependency>
       <id>jetspeed-persistence</id>
       <groupId>jetspeed2</groupId>
@@ -90,7 +90,7 @@
       <properties>
         <war.bundle.jar>false</war.bundle.jar>
       </properties>
-    </dependency>    	
+    </dependency>
   	 <dependency>
       <id>commons-lang</id>
       <version>2.0</version>
@@ -126,8 +126,8 @@
       <properties>
         <war.bundle.jar>true</war.bundle.jar>
       </properties>
-    </dependency>   
-    
+    </dependency>
+
     <dependency>
       <id>commons-configuration</id>
       <version>1.0-dev</version>
@@ -177,8 +177,8 @@
       <properties>
         <war.bundle.jar>true</war.bundle.jar>
       </properties>
-    </dependency>    
-    <dependency>    	
+    </dependency>
+    <dependency>
       <id>jdbc-se</id>
       <jar>jdbc-se2.0.jar</jar>
       <properties>
@@ -235,7 +235,7 @@
       <properties>
         <war.bundle.jar>true</war.bundle.jar>
       </properties>
-    </dependency>    
+    </dependency>
      <dependency>
       <id>groovy</id>
      <version>1.0-beta-4-snapshot</version>
@@ -249,7 +249,7 @@
       <properties>
         <war.bundle.jar>true</war.bundle.jar>
       </properties>
-    </dependency>    
+    </dependency>
     <dependency>
       <id>jta</id>
       <jar>jta1.0.1.jar</jar>
@@ -279,6 +279,7 @@
           <directory>${basedir}/src/test</directory>
           <excludes>
            <exclude>**/*.java</exclude>
+           <exclude>repository_database.xml</exclude>
           </excludes>
         </resource>
         <resource>
@@ -289,7 +290,7 @@
       </resource>
       </resources>
     </unitTest>
-    
+
     <resources>
       <resource>
         <directory>${basedir}/src/java</directory>
@@ -298,6 +299,6 @@
         </excludes>
       </resource>
     </resources>
-    
+
   </build>
 </project>
Index: components/security/src/test/repository_database.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/components/security/src/test/repository_database.xml,v
retrieving revision 1.2
diff -u -r1.2 repository_database.xml
--- components/security/src/test/repository_database.xml	18 Mar 2004 19:33:32 -0000	1.2
+++ components/security/src/test/repository_database.xml	27 Apr 2004 18:52:40 -0000
@@ -30,12 +30,12 @@
 
     <jdbc-connection-descriptor
         jcd-alias="jetspeed"
-        platform="Hsqldb"
+        platform="@PLATFORM@"
         default-connection="true"
         jdbc-level="2.0"
         jndi-datasource-name="java:comp/env/jdbc/jetspeed"
         batch-mode="false"
-     >     
+     >
 
         <connection-pool
             maxActive="21"
Index: portal/maven.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/portal/maven.xml,v
retrieving revision 1.65
diff -u -r1.65 maven.xml
--- portal/maven.xml	20 Apr 2004 02:08:51 -0000	1.65
+++ portal/maven.xml	27 Apr 2004 18:52:46 -0000
@@ -20,11 +20,11 @@
          xmlns:maven="jelly:maven">
 
   <!-- Target of maven test:single test -->
-<property name='testcase' value='org.apache.jetspeed.container.session.TestNavigationalState'/> 
+<property name='testcase' value='org.apache.jetspeed.container.session.TestNavigationalState'/>
 
 <preGoal name="java:prepare-filesystem">
  	<echo message="====================================" />
-  	<echo message="        Copying OJB Metadata        " />  	
+  	<echo message="        Copying OJB Metadata        " />
   	<echo message="====================================" />
  	<maven:reactor
                basedir="${basedir}"
@@ -33,13 +33,13 @@
                banner="Copying OJB Metadata for Registry and Security"
                ignoreFailures="false"/>
  </preGoal>
- 
- <!-- Always rbuild the DB befure we test 
+
+ <!-- Always rbuild the DB befure we test
  <preGoal name="test:test">
  	<attainGoal name="db.recreate" />
  </preGoal>
 -->
- 
+
 <!--
   <goal name="jaxb:portlet"
         description="Generate java classes from protlet API schema">
@@ -71,11 +71,12 @@
           <classpath>
             <path refid="maven.dependency.classpath"/>
             <pathelement path="${maven.build.dest}"/>
+            <pathelement path="${org.apache.jetspeed.production.jdbc.drivers.path}"/>
           </classpath>
-            <sysproperty key="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.database.url}"/>
-            <sysproperty key="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.database.driver}"/>
-            <sysproperty key="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.database.user}"/>
-            <sysproperty key="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.database.password}"/>
+            <sysproperty key="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.production.database.url}"/>
+            <sysproperty key="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.production.database.driver}"/>
+            <sysproperty key="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.production.database.user}"/>
+            <sysproperty key="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.production.database.password}"/>
             <arg value="-action" />
             <arg value="register" />
             <arg value="-PortletAppName" />
@@ -94,11 +95,12 @@
           <classpath>
             <path refid="maven.dependency.classpath"/>
             <pathelement path="${maven.build.dest}"/>
+            <pathelement path="${org.apache.jetspeed.production.jdbc.drivers.path}"/>
           </classpath>
-            <sysproperty key="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.database.url}"/>
-            <sysproperty key="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.database.driver}"/>
-            <sysproperty key="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.database.user}"/>
-            <sysproperty key="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.database.password}"/>
+            <sysproperty key="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.production.database.url}"/>
+            <sysproperty key="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.production.database.driver}"/>
+            <sysproperty key="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.production.database.user}"/>
+            <sysproperty key="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.production.database.password}"/>
             <arg value="-action" />
             <arg value="unregister" />
             <arg value="-PortletAppName" />
@@ -117,11 +119,12 @@
           <classpath>
             <path refid="maven.dependency.classpath"/>
             <pathelement path="${maven.build.dest}"/>
+            <pathelement path="${org.apache.jetspeed.production.jdbc.drivers.path}"/>
           </classpath>
-            <sysproperty key="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.database.url}"/>
-            <sysproperty key="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.database.driver}"/>
-            <sysproperty key="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.database.user}"/>
-            <sysproperty key="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.database.password}"/>
+            <sysproperty key="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.production.database.url}"/>
+            <sysproperty key="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.production.database.driver}"/>
+            <sysproperty key="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.production.database.user}"/>
+            <sysproperty key="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.production.database.password}"/>
             <arg value="-action" />
             <arg value="deploy" />
             <arg value="-PortletAppName" />
@@ -140,11 +143,12 @@
           <classpath>
             <path refid="maven.dependency.classpath"/>
             <pathelement path="${maven.build.dest}"/>
+            <pathelement path="${org.apache.jetspeed.production.jdbc.drivers.path}"/>
           </classpath>
-            <sysproperty key="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.database.url}"/>
-            <sysproperty key="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.database.driver}"/>
-            <sysproperty key="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.database.user}"/>
-            <sysproperty key="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.database.password}"/>
+            <sysproperty key="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.production.database.url}"/>
+            <sysproperty key="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.production.database.driver}"/>
+            <sysproperty key="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.production.database.user}"/>
+            <sysproperty key="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.production.database.password}"/>
             <arg value="-action" />
             <arg value="deploy" />
             <arg value="-PortletAppName" />
@@ -163,11 +167,12 @@
           <classpath>
             <path refid="maven.dependency.classpath"/>
             <pathelement path="${maven.build.dest}"/>
+            <pathelement path="${org.apache.jetspeed.production.jdbc.drivers.path}"/>
           </classpath>
-            <sysproperty key="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.database.url}"/>
-            <sysproperty key="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.database.driver}"/>
-            <sysproperty key="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.database.user}"/>
-            <sysproperty key="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.database.password}"/>
+            <sysproperty key="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.production.database.url}"/>
+            <sysproperty key="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.production.database.driver}"/>
+            <sysproperty key="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.production.database.user}"/>
+            <sysproperty key="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.production.database.password}"/>
             <arg value="-action" />
             <arg value="deploy" />
             <arg value="-PortletAppName" />
@@ -186,11 +191,12 @@
           <classpath>
             <path refid="maven.dependency.classpath"/>
             <pathelement path="${maven.build.dest}"/>
+            <pathelement path="${org.apache.jetspeed.production.jdbc.drivers.path}"/>
           </classpath>
-            <sysproperty key="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.database.url}"/>
-            <sysproperty key="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.database.driver}"/>
-            <sysproperty key="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.database.user}"/>
-            <sysproperty key="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.database.password}"/>
+            <sysproperty key="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.production.database.url}"/>
+            <sysproperty key="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.production.database.driver}"/>
+            <sysproperty key="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.production.database.user}"/>
+            <sysproperty key="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.production.database.password}"/>
             <arg value="-action" />
             <arg value="undeploy" />
             <arg value="-PortletAppName" />
@@ -210,11 +216,12 @@
           <classpath>
             <path refid="maven.dependency.classpath"/>
             <pathelement path="${maven.build.dest}"/>
+            <pathelement path="${org.apache.jetspeed.production.jdbc.drivers.path}"/>
           </classpath>
-            <sysproperty key="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.database.url}"/>
-            <sysproperty key="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.database.driver}"/>
-            <sysproperty key="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.database.user}"/>
-            <sysproperty key="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.database.password}"/>
+            <sysproperty key="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.production.database.url}"/>
+            <sysproperty key="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.production.database.driver}"/>
+            <sysproperty key="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.production.database.user}"/>
+            <sysproperty key="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.production.database.password}"/>
             <arg value="-action" />
             <arg value="undeploy" />
             <arg value="-PortletAppName" />
@@ -233,11 +240,12 @@
           <classpath>
             <path refid="maven.dependency.classpath"/>
             <pathelement path="${maven.build.dest}"/>
+            <pathelement path="${org.apache.jetspeed.production.jdbc.drivers.path}"/>
           </classpath>
-            <sysproperty key="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.database.url}"/>
-            <sysproperty key="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.database.driver}"/>
-            <sysproperty key="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.database.user}"/>
-            <sysproperty key="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.database.password}"/>
+            <sysproperty key="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.production.database.url}"/>
+            <sysproperty key="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.production.database.driver}"/>
+            <sysproperty key="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.production.database.user}"/>
+            <sysproperty key="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.production.database.password}"/>
             <arg value="-action" />
             <arg value="undeploy" />
             <arg value="-PortletAppName" />
@@ -260,7 +268,15 @@
       <!-- <copy  file="./target/jetspeed-2.0-a1-dev.war" tofile="${deploy.war.dir}/${webapp.name}.war"/>-->
       <copy  file="./target/jetspeed.war" tofile="${deploy.war.dir}/${webapp.name}.war"/>
       <unwar src="${deploy.war.dir}/${webapp.name}.war" dest="${deploy.war.dir}/${webapp.name}"/>
-      <copy  file="./src/resources/jetspeed.xml" tofile="${deploy.war.dir}/jetspeed.xml"/>
+
+      <copy file="./src/resources/jetspeed.xml" tofile="${deploy.war.dir}/jetspeed.xml" overwrite="true">
+        <filterset begintoken="@" endtoken="@">
+          <filter token="USERNAME" value="${org.apache.jetspeed.production.database.user}"/>
+          <filter token="PASSWORD" value="${org.apache.jetspeed.production.database.password}"/>
+          <filter token="DRIVER" value="${org.apache.jetspeed.production.database.driver}"/>
+          <filter token="URL" value="${org.apache.jetspeed.production.database.url}"/>
+        </filterset>
+      </copy>
       <attainGoal name="catalina:base-shared" />
       <attainGoal name="catalina:shared" />
   </goal>
@@ -279,11 +295,11 @@
          <exclude name="WEB-INF/db/**"/>
       </fileset>
     </copy>
-  </goal> 
-  
-  
+  </goal>
+
+
+
 
-  
   <!-- ================================================================ -->
   <!-- Does all three deployment steps at once                                                                        -->
   <!-- ================================================================ -->
@@ -291,7 +307,7 @@
   	 <attainGoal name="deploy" />
   	 <attainGoal name="pam.register" />
   	 <attainGoal name="pam.deploy" />
-     <attainGoal name="pam.strutsdeploy" />  	 
+     <attainGoal name="pam.strutsdeploy" />
      <attainGoal name="db.entities" />
   </goal>
 
@@ -320,11 +336,12 @@
 
          <path refid="maven.dependency.classpath"/>
          <pathelement path="${maven.build.dest}"/>
+         <pathelement path="${org.apache.jetspeed.production.jdbc.drivers.path}"/>
         </classpath>
-        <sysproperty key="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.database.url}"/>
-        <sysproperty key="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.database.driver}"/>
-        <sysproperty key="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.database.user}"/>
-        <sysproperty key="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.database.password}"/>
+            <sysproperty key="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.production.database.url}"/>
+            <sysproperty key="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.production.database.driver}"/>
+            <sysproperty key="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.production.database.user}"/>
+            <sysproperty key="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.production.database.password}"/>
          <arg value="-action" />
          <arg value="deploy" />
          <arg value="-PortletAppName" />
@@ -351,7 +368,7 @@
     <copy file="${maven.repo.local}/commons-logging/jars/commons-logging-1.0.3.jar" todir="${catalina.shared.lib}"/>
     <copy file="${maven.repo.local}/commons-configuration/jars/commons-configuration-1.0-dev.jar" todir="${catalina.shared.lib}"/>
     <copy file="${maven.repo.local}/log4j/jars/log4j-1.2.6.jar" todir="${catalina.shared.lib}"/>
-    <copy file="${maven.repo.local}/struts-portlet/jars/struts-portlet-spi-0.1.jar" todir="${catalina.shared.lib}"/>    
+    <copy file="${maven.repo.local}/struts-portlet/jars/struts-portlet-spi-0.1.jar" todir="${catalina.shared.lib}"/>
   </goal>
 
   <goal name="catalina:shared"
@@ -359,7 +376,7 @@
     <copy file="../commons/target/jetspeed-commons-2.0-a1-dev.jar" todir="${catalina.shared.lib}"/>
     <copy file="../portlet-api/target/portlet-api-1.0.jar" todir="${catalina.shared.lib}"/>
   </goal>
-  
+
   <!-- ================================================================ -->
   <!-- Copy OJB mapping for registry into the portal directory-->
   <!-- ================================================================ -->
@@ -367,18 +384,19 @@
     <!-- <copy  file="./../services/registry/src/webapp/WEB-INF/conf/ojb/repository_registry.xml" tofile="./src/webapp/WEB-INF/conf/ojb/repository_registry.xml"/> -->
     <!--<copy  file="./../services/security/src/webapp/WEB-INF/conf/ojb/repository_security.xml" tofile="./src/webapp/WEB-INF/conf/ojb/repository_security.xml"/>-->
   </goal>
-  
+
 
  <goal name="pam.rssdeploy">
          <java classname="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" fork="yes">
           <classpath>
             <path refid="maven.dependency.classpath"/>
             <pathelement path="${maven.build.dest}"/>
+            <pathelement path="${org.apache.jetspeed.production.jdbc.drivers.path}"/>
           </classpath>
-            <sysproperty key="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.database.url}"/>
-            <sysproperty key="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.database.driver}"/>
-            <sysproperty key="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.database.user}"/>
-            <sysproperty key="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.database.password}"/>
+            <sysproperty key="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.production.database.url}"/>
+            <sysproperty key="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.production.database.driver}"/>
+            <sysproperty key="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.production.database.user}"/>
+            <sysproperty key="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.production.database.password}"/>
             <arg value="-action" />
             <arg value="deploy" />
             <arg value="-PortletAppName" />
@@ -394,6 +412,22 @@
         </java>
   </goal>
 
+  <goal name="db.test.properties">
+    <j:set var="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.test.database.url}"/>
+    <j:set var="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.test.database.driver}"/>
+    <j:set var="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.test.database.user}"/>
+    <j:set var="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.test.database.password}"/>
+    <j:set var="org.apache.jetspeed.jdbc.drivers.path" value="${org.apache.jetspeed.test.jdbc.drivers.path}"/>
+  </goal>
+
+  <goal name="db.production.properties">
+    <j:set var="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.production.database.url}"/>
+    <j:set var="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.production.database.driver}"/>
+    <j:set var="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.production.database.user}"/>
+    <j:set var="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.production.database.password}"/>
+    <j:set var="org.apache.jetspeed.jdbc.drivers.path" value="${org.apache.jetspeed.production.jdbc.drivers.path}"/>
+  </goal>
+
   <!-- ================================================================ -->
   <!-- EXECUTE a DB SCRIPT                                              -->
   <!-- ================================================================ -->
@@ -404,16 +438,51 @@
          userid="${org.apache.jetspeed.database.user}"
          password="${org.apache.jetspeed.database.password}"
          src="${database.arg.script}">
+      <classpath>
+        <path refid="maven.dependency.classpath"/>
+        <pathelement path="${org.apache.jetspeed.jdbc.drivers.path}"/>
+      </classpath>
     </sql>
   </goal>
 
   <goal name="db.entities">
       <j:set var="database.arg.script" value="../src/sql/populate-entities-for-default-psml.sql" />
+      <attainGoal name="db.production.properties"/>
       <attainGoal name="db.execute" />
   </goal>
 
+  <goal name="ojb.set.production.database.platform">
+    <copy file="./src/java/repository_database.xml" todir="${maven.build.dest}" overwrite="true">
+    <filterset begintoken="@" endtoken="@">
+        <filter token="PLATFORM" value="${org.apache.jetspeed.production.database.ojb.platform}"/>
+    </filterset>
+    </copy>
+  </goal>
+
+  <preGoal name="jar:jar">
+    <attainGoal name="ojb.set.production.database.platform"/>
+  </preGoal>
+
+<!--
   <preGoal name="war">
    <attainGoal name= "jar:install"/>
+  </preGoal>
+-->
+
+  <preGoal name="war:webapp">
+    <attainGoal name="ojb.set.production.database.platform"/>
+  </preGoal>
+
+  <preGoal name="test:test">
+    <attainGoal name="db.test.properties"/>
+    <copy file="src/java/repository_database.xml" todir="${maven.test.dest}" overwrite="true">
+    <filterset begintoken="@" endtoken="@">
+        <filter token="PLATFORM" value="${org.apache.jetspeed.test.database.ojb.platform}"/>
+    </filterset>
+    </copy>
+
+    <path id="jdbc.drivers.path" path="${org.apache.jetspeed.test.jdbc.drivers.path}"/>
+    <maven:addPath id="maven.dependency.classpath" refid="jdbc.drivers.path"/>
   </preGoal>
 
 </project>
Index: portal/project.properties
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/portal/project.properties,v
retrieving revision 1.10
diff -u -r1.10 project.properties
--- portal/project.properties	3 Apr 2004 03:49:46 -0000	1.10
+++ portal/project.properties	27 Apr 2004 18:52:46 -0000
@@ -3,9 +3,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -47,18 +47,29 @@
 org.apache.jetspeed.database.user \
 org.apache.jetspeed.database.password \
 java.security.auth.login.config \
-applicationRoot
+applicationRoot \
+p6.home
+
+org.apache.jetspeed.test.database.url = jdbc:hsqldb:hsql://127.0.0.1:9001
+org.apache.jetspeed.test.database.driver = org.hsqldb.jdbcDriver
+org.apache.jetspeed.test.database.user = sa
+org.apache.jetspeed.test.database.password =
+
+org.apache.jetspeed.test.jdbc.drivers.path=
+org.apache.jetspeed.test.database.default.name=hsql
+org.apache.jetspeed.test.database.ojb.platform=Hsqldb
+
+org.apache.jetspeed.production.database.url = jdbc:hsqldb:hsql://127.0.0.1:9001
+org.apache.jetspeed.production.database.driver = org.hsqldb.jdbcDriver
+org.apache.jetspeed.production.database.user = sa
+org.apache.jetspeed.production.database.password =
+
+org.apache.jetspeed.production.jdbc.drivers.path=
+org.apache.jetspeed.production.database.default.name=hsql
+org.apache.jetspeed.production.database.ojb.platform=Hsqldb
 
-org.apache.jetspeed.database.url = jdbc:hsqldb:hsql://127.0.0.1:9001
-org.apache.jetspeed.database.driver = org.hsqldb.jdbcDriver
-org.apache.jetspeed.database.user = sa
-org.apache.jetspeed.database.password = 
 java.security.auth.login.config = ../services/security/src/webapp/WEB-INF/conf/jaas/login.conf
 applicationRoot = src/webapp
-
-
-
-database.default.name=hsql
 
 deploy.war.dir=/apache/tomcat5/webapps
 webapp.name=jetspeed
Index: portal/project.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/portal/project.xml,v
retrieving revision 1.58
diff -u -r1.58 project.xml
--- portal/project.xml	25 Apr 2004 16:37:47 -0000	1.58
+++ portal/project.xml	27 Apr 2004 18:52:47 -0000
@@ -24,7 +24,7 @@
   </description>
   <shortDescription>Portal Aggregation Engine</shortDescription>
 
-  <repository>                 
+  <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-jetspeed-2/portal</connection>
     <url>http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/portal/</url>
   </repository>
@@ -69,7 +69,7 @@
       <properties>
         <war.bundle.jar>true</war.bundle.jar>
       </properties>
-    </dependency> 
+    </dependency>
     <dependency>
       <id>jetspeed-persistence</id>
       <groupId>jetspeed2</groupId>
@@ -101,8 +101,8 @@
       <properties>
         <war.bundle.jar>true</war.bundle.jar>
       </properties>
-    </dependency> 
-    
+    </dependency>
+
     <dependency>
       <id>picocontainer</id>
       <version>1.0-beta-5-SNAPSHOT</version>
@@ -130,7 +130,7 @@
       <properties>
         <war.bundle.jar>true</war.bundle.jar>
       </properties>
-    </dependency>    
+    </dependency>
     <dependency>
       <id>pluto</id>
       <groupId>pluto</groupId>
@@ -378,7 +378,7 @@
         <war.bundle.jar>true</war.bundle.jar>
       </properties>
     </dependency>
-    
+
      <dependency>
       <id>regexp</id>
       <version>1.2</version>
@@ -451,6 +451,7 @@
         <directory>${basedir}/src/java</directory>
         <excludes>
           <exclude>**/*.java</exclude>
+          <exclude>repository_database.xml</exclude>
         </excludes>
       </resource>
         <resource>
@@ -467,6 +468,8 @@
         <directory>${basedir}/src/java</directory>
         <excludes>
           <exclude>**/*.java</exclude>
+          <exclude>repository_database.xml</exclude>
+          <include>${maven.build.dest}/repository_database.xml</include>
         </excludes>
       </resource>
     </resources>
@@ -489,6 +492,6 @@
     <report>maven-linkcheck-plugin</report>
 -->
     <report>maven-tasklist-plugin</report>
-  </reports>  
+  </reports>
 </project>
 
Index: portal/src/java/repository_database.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/portal/src/java/repository_database.xml,v
retrieving revision 1.2
diff -u -r1.2 repository_database.xml
--- portal/src/java/repository_database.xml	18 Mar 2004 19:59:12 -0000	1.2
+++ portal/src/java/repository_database.xml	27 Apr 2004 18:52:47 -0000
@@ -30,12 +30,12 @@
 
     <jdbc-connection-descriptor
         jcd-alias="jetspeed"
-        platform="Hsqldb"
+        platform="@PLATFORM@"
         default-connection="true"
         jdbc-level="2.0"
          jndi-datasource-name="java:comp/env/jdbc/jetspeed"
         batch-mode="false"
-     >     
+     >
 
         <connection-pool
             maxActive="21"
Index: portal/src/resources/jetspeed.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/portal/src/resources/jetspeed.xml,v
retrieving revision 1.3
diff -u -r1.3 jetspeed.xml
--- portal/src/resources/jetspeed.xml	18 Mar 2004 14:41:49 -0000	1.3
+++ portal/src/resources/jetspeed.xml	27 Apr 2004 18:52:52 -0000
@@ -49,24 +49,24 @@
     <!-- HSQL dB username and password for dB connections  -->
     <parameter>
      <name>username</name>
-     <value>sa</value>
+     <value>@USERNAME@</value>
     </parameter>
     <parameter>
      <name>password</name>
-     <value></value>
+     <value>@PASSWORD@</value>
     </parameter>
 
     <!-- Class name for HSQL JDBC driver -->
     <parameter>
        <name>driverClassName</name>
-       <value>org.hsqldb.jdbcDriver</value>
+       <value>@DRIVER@</value>
     </parameter>
 
     <!-- The JDBC connection url for connecting to your HSQL dB.  -->
     <parameter>
       <name>url</name>
-      <value>jdbc:hsqldb:hsql://127.0.0.1</value>
+      <value>@URL@</value>
     </parameter>
   </ResourceParams>
-	
+
 </Context>
Index: struts-portlet/maven.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/struts-portlet/maven.xml,v
retrieving revision 1.1
diff -u -r1.1 maven.xml
--- struts-portlet/maven.xml	19 Apr 2004 22:16:11 -0000	1.1
+++ struts-portlet/maven.xml	27 Apr 2004 18:52:56 -0000
@@ -13,17 +13,13 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<project default="install"
+<project default="java:jar"
          xmlns:j="jelly:core"
+         xmlns:define="jelly:define"
          xmlns:maven="jelly:maven"
          xmlns:reactor="reactor">
 
   <goal name="allClean"
-        description="Clean the master project and all subprojects">
-    <attainGoal name="subClean"/>
-  </goal>
-
-  <goal name="subClean"
         description="Clean all subprojects"
         >
     <maven:reactor
Index: struts-portlet/project.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/struts-portlet/project.xml,v
retrieving revision 1.1
diff -u -r1.1 project.xml
--- struts-portlet/project.xml	19 Apr 2004 22:16:11 -0000	1.1
+++ struts-portlet/project.xml	27 Apr 2004 18:52:56 -0000
@@ -34,7 +34,4 @@
       </roles>
     </developer>
   </developers>
-  <build>
-    <sourceDirectory>src</sourceDirectory>
-  </build>
 </project>
Index: struts-portlet/demo/maven.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/struts-portlet/demo/maven.xml,v
retrieving revision 1.1
diff -u -r1.1 maven.xml
--- struts-portlet/demo/maven.xml	20 Apr 2004 02:06:02 -0000	1.1
+++ struts-portlet/demo/maven.xml	27 Apr 2004 18:52:56 -0000
@@ -16,6 +16,7 @@
 <project default="war:war"
          xmlns:j="jelly:core"
          xmlns:define="jelly:define"
+         xmlns:maven="jelly:maven"
          xmlns:reactor="reactor">
 
   <postGoal name="war:webapp">
@@ -23,95 +24,5 @@
             <fileset dir="${basedir}/src/java" excludes="**/*.java"/>
           </copy>
   </postGoal>
-
- <goal name="deploy">
-         <java classname="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" fork="yes">
-          <classpath>
-            <path refid="maven.dependency.classpath"/>
-            <pathelement path="${maven.build.dest}"/>
-            <pathelement location="${jetspeed.webapp}/WEB-INF/classes"/>
-            <fileset dir="${jetspeed.webapp}/WEB-INF/lib"/>
-            <fileset dir="${catalina.shared.lib}"/>
-          </classpath>
-            <sysproperty key="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.database.url}"/>
-            <sysproperty key="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.database.driver}"/>
-            <sysproperty key="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.database.user}"/>
-            <sysproperty key="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.database.password}"/>
-            <arg value="-action" />
-            <arg value="deploy" />
-            <arg value="-PortletAppName" />
-            <arg value="${portlet.app.name}" />
-            <arg value="-warfilename" />
-            <arg value="target/${portlet.war.name}.war" />
-            <arg value="-webappDir" />
-            <arg value="${deploy.war.dir}/" />
-            <arg value="-PortalName" />
-            <arg value="jetspeed" />
-            <arg value="-ApplicationType" />
-            <arg value="webapp" />
-        </java>
-  </goal>
-
-  <goal name="undeploy">
-         <java classname="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" fork="yes">
-          <classpath>
-            <path refid="maven.dependency.classpath"/>
-            <pathelement path="${maven.build.dest}"/>
-            <pathelement location="${jetspeed.webapp}/WEB-INF/classes"/>
-            <fileset dir="${jetspeed.webapp}/WEB-INF/lib"/>
-            <fileset dir="${catalina.shared.lib}"/>
-          </classpath>
-            <sysproperty key="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.database.url}"/>
-            <sysproperty key="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.database.driver}"/>
-            <sysproperty key="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.database.user}"/>
-            <sysproperty key="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.database.password}"/>
-            <arg value="-action" />
-            <arg value="undeploy" />
-            <arg value="-PortletAppName" />
-            <arg value="${portlet.app.name}" />
-            <arg value="-webappDir" />
-            <arg value="${deploy.war.dir}" />
-            <arg value="-PortalName" />
-            <arg value="jetspeed" />
-            <arg value="-ApplicationType" />
-            <arg value="webapp" />
-        </java>
-  </goal>
-
-  <preGoal name="deploy">
-   <attainGoal name= "java:compile"/>
-   <attainGoal name= "war:war"/>
-  </preGoal>
-
-  <postGoal name="undeploy">
-    <attainGoal name="db.remove"/>
-  </postGoal>
-
-  <postGoal name="deploy">
-    <attainGoal name="db.create"/>
-  </postGoal>
-
-  <!-- ================================================================ -->
-  <!-- EXECUTE a DB SCRIPT                                              -->
-  <!-- ================================================================ -->
-  <goal name="db.execute">
-    <sql driver="${org.apache.jetspeed.database.driver}"
-         classpathref="maven.dependency.classpath"
-         url="${org.apache.jetspeed.database.url}"
-         userid="${org.apache.jetspeed.database.user}"
-         password="${org.apache.jetspeed.database.password}"
-         src="${database.arg.script}">
-    </sql>
-  </goal>
-
-  <goal name="db.create">
-      <j:set var="database.arg.script" value="sql/create-entities.sql" />
-      <attainGoal name="db.execute" />
-  </goal>
-  <goal name="db.remove">
-      <j:set var="database.arg.script" value="sql/remove-entities.sql" />
-      <attainGoal name="db.execute" />
-  </goal>
-
 
 </project>
Index: struts-portlet/demo/project.properties
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/struts-portlet/demo/project.properties,v
retrieving revision 1.1
diff -u -r1.1 project.properties
--- struts-portlet/demo/project.properties	20 Apr 2004 02:06:02 -0000	1.1
+++ struts-portlet/demo/project.properties	27 Apr 2004 18:52:56 -0000
@@ -33,13 +33,6 @@
 portlet.war.name = struts-demo
 webapp.dir=${basedir}/src/webapp
 
-org.apache.jetspeed.database.url = jdbc:hsqldb:hsql://127.0.0.1:9001
-org.apache.jetspeed.database.driver = org.hsqldb.jdbcDriver
-org.apache.jetspeed.database.user = sa
-org.apache.jetspeed.database.password =
-
-database.default.name=hsql
-
 maven.war.src=${basedir}/src/webapp
 maven.war.src.excludes=META-INF/**,WEB-INF/classes/**
 # war plugin doesn't set this variable ???
Index: struts-portlet/demo/project.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/struts-portlet/demo/project.xml,v
retrieving revision 1.1
diff -u -r1.1 project.xml
--- struts-portlet/demo/project.xml	20 Apr 2004 02:06:02 -0000	1.1
+++ struts-portlet/demo/project.xml	27 Apr 2004 18:52:56 -0000
@@ -49,22 +49,6 @@
         <war.bundle>false</war.bundle>
       </properties>
     </dependency>
-    <dependency>
-      <id>jetspeed-commons</id>
-      <groupId>jetspeed2</groupId>
-      <version>2.0-a1-dev</version>
-      <properties>
-        <war.bundle>false</war.bundle>
-      </properties>
-    </dependency>
-    <!-- for default deployment in Jetspeed 2 -->
-    <dependency>
-      <id>hsqldb</id>
-      <version>1.7.1</version>
-      <properties>
-        <war.bundle>false</war.bundle>
-      </properties>
-    </dependency>
     <!-- for unit tests -->
     <dependency>
       <groupId>junit</groupId>
@@ -163,7 +147,7 @@
       <properties>
         <war.bundle>true</war.bundle>
       </properties>
-    </dependency>            
+    </dependency>
    </dependencies>
 
   <build>
Index: struts-portlet/framework/maven.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/struts-portlet/framework/maven.xml,v
retrieving revision 1.1
diff -u -r1.1 maven.xml
--- struts-portlet/framework/maven.xml	19 Apr 2004 22:17:43 -0000	1.1
+++ struts-portlet/framework/maven.xml	27 Apr 2004 18:52:57 -0000
@@ -13,9 +13,10 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<project default="jar:jar"
+<project default="java:jar"
          xmlns:j="jelly:core"
          xmlns:define="jelly:define"
+         xmlns:maven="jelly:maven"
          xmlns:reactor="reactor">
 
 </project>
Index: struts-portlet/framework/project.properties
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/struts-portlet/framework/project.properties,v
retrieving revision 1.1
diff -u -r1.1 project.properties
--- struts-portlet/framework/project.properties	19 Apr 2004 22:17:43 -0000	1.1
+++ struts-portlet/framework/project.properties	27 Apr 2004 18:52:57 -0000
@@ -18,7 +18,7 @@
 # Display the maven version the web site is documenting
 maven.xdoc.version = ${pom.currentVersion}
 maven.checkstyle.header.file=${basedir}/../checkstyle.license
-#maven.checkstyle.properties=${basedir}/../checkstyle.xml
+maven.checkstyle.properties=${basedir}/../checkstyle.xml
 maven.license.licenseFile=${basedir}/../LICENSE.TXT
 
 maven.compile.deprecation=on
Index: struts-portlet/framework/project.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/struts-portlet/framework/project.xml,v
retrieving revision 1.1
diff -u -r1.1 project.xml
--- struts-portlet/framework/project.xml	19 Apr 2004 22:17:43 -0000	1.1
+++ struts-portlet/framework/project.xml	27 Apr 2004 18:52:57 -0000
@@ -15,6 +15,7 @@
 limitations under the License.
 -->
 <project>
+  <extend>${basedir}/../project.xml</extend>
   <pomVersion>3</pomVersion>
   <id>struts-portlet</id>
   <name>Apache Struts Portlet Framework</name>
Index: struts-portlet/spi/maven.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed-2/struts-portlet/spi/maven.xml,v
retrieving revision 1.1
diff -u -r1.1 maven.xml
--- struts-portlet/spi/maven.xml	19 Apr 2004 22:17:43 -0000	1.1
+++ struts-portlet/spi/maven.xml	27 Apr 2004 18:52:58 -0000
@@ -13,9 +13,10 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<project default="jar:jar"
+<project default="java:jar"
          xmlns:j="jelly:core"
          xmlns:define="jelly:define"
+         xmlns:maven="jelly:maven"
          xmlns:reactor="reactor">
 
 </project>