portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dlest...@apache.org
Subject svn commit: r209405 [2/3] - in /portals/jetspeed-2/trunk: ./ layout-portlets/ maven-plugin/ portal-webapp/
Date Wed, 06 Jul 2005 03:30:41 GMT
Modified: portals/jetspeed-2/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven.xml?rev=209405&r1=209404&r2=209405&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven.xml (original)
+++ portals/jetspeed-2/trunk/maven.xml Tue Jul  5 20:30:40 2005
@@ -1,209 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 2004 The Apache Software Foundation
+    Copyright 2004 The Apache Software Foundation
+    
+    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.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<project default="java:jar" xmlns:j="jelly:core" xmlns:maven="jelly:maven" xmlns:ant="jelly:ant">
+
+    <goal name="_findProjectFile">
+        <j:set var="_projectFileFound" value="false" />
+        <j:set var="_projectFile" value="" />
+        <j:set var="myPom" value="${pom}" />
+        <j:while test="${myPom!=null}">
+            <j:set var="pomDir" value="${myPom.file.parent}" />
+            <j:new var="file" className="java.io.File">
+                <j:arg value="${pomDir}/${_findProjectFile}" />
+            </j:new>
+            <j:if test="${file.exists()}">
+                <j:set var="_projectFile" value="${file}" />
+                <j:set var="_projectFileFound" value="true" />
+                <j:break />
+            </j:if>
+            <j:set var="myPom" value="${myPom.parent}" />
+        </j:while>
+    </goal>
 
-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
+    <goal name="set.checkstyle.properties">
 
-    http://www.apache.org/licenses/LICENSE-2.0
+        <j:set var="_findProjectFile" value="${org.apache.jetspeed.checkstyle.header.file}" />
+        <attainGoal name="_findProjectFile" />
+        <j:if test="${!_projectFileFound}">
+            <fail
+                message="org.apache.jetspeed.checkstyle.header.file ${org.apache.jetspeed.checkstyle.header.file} not found in the project tree" />
+        </j:if>
+        <j:set var="maven.checkstyle.header.file" value="${_projectFile.absolutePath}" />
+        <echo message="using maven.checkstyle.header.file ${maven.checkstyle.header.file}" />
+
+        <j:set var="_findProjectFile" value="${org.apache.jetspeed.checkstyle.properties}" />
+        <attainGoal name="_findProjectFile" />
+        <j:if test="${!_projectFileFound}">
+            <fail
+                message="org.apache.jetspeed.checkstyle.properties ${org.apache.jetspeed.checkstyle.properties} not found in the project tree" />
+        </j:if>
+        <j:set var="maven.checkstyle.properties" value="${_projectFile.absolutePath}" />
+        <echo message="using maven.checkstyle.properties ${maven.checkstyle.properties}" />
+    </goal>
 
-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.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<project default="java:jar"
-         xmlns:j="jelly:core"
-         xmlns:maven="jelly:maven"
-         xmlns:ant="jelly:ant">
-
-  <goal name="_findProjectFile">
-    <j:set var="_projectFileFound" value="false"/>
-    <j:set var="_projectFile" value=""/>
-    <j:set var="myPom" value="${pom}"/>
-    <j:while test="${myPom!=null}">
-      <j:set var="pomDir" value="${myPom.file.parent}"/>
-      <j:new var="file" className="java.io.File">
-        <j:arg value="${pomDir}/${_findProjectFile}"/>
-      </j:new>
-      <j:if test="${file.exists()}">
-        <j:set var="_projectFile" value="${file}"/>
-        <j:set var="_projectFileFound" value="true"/>
-        <j:break/>
-      </j:if>
-      <j:set var="myPom" value="${myPom.parent}"/>
-    </j:while>
-  </goal>
-
-  <goal name="set.checkstyle.properties">
-
-    <j:set var="_findProjectFile" value="${org.apache.jetspeed.checkstyle.header.file}"/>
-    <attainGoal name="_findProjectFile"/>
-    <j:if test="${!_projectFileFound}">
-      <fail message="org.apache.jetspeed.checkstyle.header.file ${org.apache.jetspeed.checkstyle.header.file} not found in the project tree"/>
-    </j:if>
-    <j:set var="maven.checkstyle.header.file" value="${_projectFile.absolutePath}"/>
-    <echo message="using maven.checkstyle.header.file ${maven.checkstyle.header.file}"/>
-
-    <j:set var="_findProjectFile" value="${org.apache.jetspeed.checkstyle.properties}"/>
-    <attainGoal name="_findProjectFile"/>
-    <j:if test="${!_projectFileFound}">
-      <fail message="org.apache.jetspeed.checkstyle.properties ${org.apache.jetspeed.checkstyle.properties} not found in the project tree"/>
-    </j:if>
-    <j:set var="maven.checkstyle.properties" value="${_projectFile.absolutePath}"/>
-    <echo message="using maven.checkstyle.properties ${maven.checkstyle.properties}"/>
-  </goal>
-
-  <goal name="set.license.properties">
-
-    <j:set var="_findProjectFile" value="${org.apache.jetspeed.license.licenseFile}"/>
-    <attainGoal name="_findProjectFile"/>
-    <j:if test="${!_projectFileFound}">
-      <fail message="org.apache.jetspeed.license.licenseFile ${org.apache.jetspeed.license.licenseFile} not found in the project tree"/>
-    </j:if>
-    <j:set var="maven.license.licenseFile" value="${_projectFile.absolutePath}"/>
-    <echo message="using maven.license.licenseFile ${maven.license.licenseFile}"/>
-
-  </goal>
-
-  <preGoal name="checkstyle:init">
-    <attainGoal name="set.checkstyle.properties"/>
-    <attainGoal name="set.license.properties"/>
-  </preGoal>
-
-  <goal name="allClean"
-        description="Clean the master project and all subprojects">
-    <attainGoal name="subClean"/>
-    <attainGoal name="clean"/>
-  </goal>
-  
-  <goal name="allTest"
-        description="Test all components" >
-        <j:set var="maven.test.skip" value="false" scope="parent"/>
-         <maven:reactor
-               basedir="${basedir}"
-               includes="portal/project.xml,components/*/project.xml"
-               excludes="applications/project.xml"
-               goals="test"
-               banner="Testing..."
-               ignoreFailures="false"/>
-  </goal>
-
-  <goal name="subClean"
-        description="Clean all subprojects"
-        >
-        
-    <maven:reactor
-       basedir="${basedir}"
-       includes="*/project.xml,applications/*/project.xml,services/*/project.xml,components/*/project.xml"
-       excludes="applications/project.xml,taglibs/project.xml,portals-bridges/project.xml"
-       goals="clean"
-       banner="Cleaning"
-       ignoreFailures="true"/>
-    <maven:reactor
-       basedir="${basedir}"
-       includes="layout-portlets/project.xml,maven-plugin/project.xml,taglibs/project.xml"
-       goals="clean"
-       banner="Cleaning"
-       ignoreFailures="true"/>
-  </goal>
-
-  <goal name="allSite"
-        description="Build the site for the master project and all subprojects"
-        >
-    <maven:reactor
-               basedir="${basedir}"
-               includes="site/project.xml"
-               excludes="portlet-api/project.xml"
-               goals="allSite"
-               banner="Building Site"
-               postProcessing="false"
-               ignoreFailures="false"/>
-  </goal>
-  
-  <goal name ="jetspeed2:jar:install">
-    <maven:reactor
-               basedir="${basedir}"
-               includes="${jar.includes}"
-               excludes="${jar.excludes}"
-               goals="jar:install"
-               banner="Build and Install all Jetspeed 2 jars"
-               postProcessing="false"
-               ignoreFailures="false"/>
-  </goal>
-  
-  <goal name ="jetspeed2:war:install">
-    <maven:reactor
-               basedir="${basedir}"
-               includes="portal/project.xml,applications/**/project.xml,layout-portlets/project.xml"
-               excludes="applications/project.xml"
-               goals="war:install"
-               banner="Build and Install all Jetspeed 2 wars"
-               postProcessing="false"
-               ignoreFailures="false"/>
-  </goal>
-  
-      
-   <goal name="allBuild"
-        description="Build all jars and war">
-        
-    <attainGoal name="check.required.properties"/>
-  	<attainGoal name="db.scripts.gen"/>
-    <j:if test="${context.getVariable('maven.test.skip') != 'true'}">
-    	<attainGoal name="db.create.test"/>
-    </j:if>
-  	
-    <!-- Build jars files-->
-    <attainGoal name="jetspeed2:jar:install"/>  
-
-    <!-- Build war files -->
-    <attainGoal name="jetspeed2:war:install"/>  
-     
-    <!-- build jetspeed 2 plugin -->
-    <maven:reactor
-               basedir="${basedir}/maven-plugin"
-               includes="project.xml"
-               goals="deploy-plugin"
-               banner="Build and deploy the Jetspeed 2 Maven plugin"
-               postProcessing="false"
-               ignoreFailures="false"/>
-               
-  </goal>
-
-  <goal name="copy.shared.deps">
-      <maven:reactor
-               basedir="${basedir}"
-               includes="portal/project.xml"
-               goals="catalina:base-shared"
-               banner="Deploys misc. jars shared/lib  to Tomcat"
-               postProcessing="false"
-               ignoreFailures="false"/>
-
-     <maven:reactor
-               basedir="${basedir}"
-               includes="portal/project.xml"
-               goals="catalina:shared"
-               banner="Deploys container jars to shared/lib to Tomcat"
-               postProcessing="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}" />
-  </goal>
-
-  <goal name="start.production.server">
-  	<echo message="====================================" />
-  	<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>
+    <goal name="set.license.properties">
+
+        <j:set var="_findProjectFile" value="${org.apache.jetspeed.license.licenseFile}" />
+        <attainGoal name="_findProjectFile" />
+        <j:if test="${!_projectFileFound}">
+            <fail
+                message="org.apache.jetspeed.license.licenseFile ${org.apache.jetspeed.license.licenseFile} not found in the project tree" />
+        </j:if>
+        <j:set var="maven.license.licenseFile" value="${_projectFile.absolutePath}" />
+        <echo message="using maven.license.licenseFile ${maven.license.licenseFile}" />
+
+    </goal>
+
+    <preGoal name="checkstyle:init">
+        <attainGoal name="set.checkstyle.properties" />
+        <attainGoal name="set.license.properties" />
+    </preGoal>
+
+    <goal name="allClean" description="Clean the master project and all subprojects">
+        <attainGoal name="subClean" />
+        <attainGoal name="clean" />
+    </goal>
+
+    <goal name="allTest" description="Test all components">
+        <j:set var="maven.test.skip" value="false" scope="parent" />
+        <maven:reactor basedir="${basedir}" includes="portal-webapp/project.xml,components/*/project.xml"
+            excludes="applications/project.xml" goals="test" banner="Testing..." ignoreFailures="false" />
+    </goal>
+
+    <goal name="subClean" description="Clean all subprojects">
+
+        <maven:reactor basedir="${basedir}"
+            includes="*/project.xml,applications/*/project.xml,services/*/project.xml,components/*/project.xml"
+            excludes="applications/project.xml,taglibs/project.xml,portals-bridges/project.xml" goals="clean"
+            banner="Cleaning" ignoreFailures="true" />
+        <maven:reactor basedir="${basedir}"
+            includes="layout-portlets/project.xml,maven-plugin/project.xml,taglibs/project.xml" goals="clean"
+            banner="Cleaning" ignoreFailures="true" />
+    </goal>
+
+    <goal name="allSite" description="Build the site for the master project and all subprojects">
+        <maven:reactor basedir="${basedir}" includes="site/project.xml" excludes="portlet-api/project.xml"
+            goals="allSite" banner="Building Site" postProcessing="false" ignoreFailures="false" />
+    </goal>
+
+    <goal name="jetspeed2:jar:install">
+        <maven:reactor basedir="${basedir}" includes="${jar.includes}" excludes="${jar.excludes}" goals="jar:install"
+            banner="Build and Install all Jetspeed 2 jars" postProcessing="false" ignoreFailures="false" />
+    </goal>
+
+    <goal name="jetspeed2:war:install">
+        <maven:reactor basedir="${basedir}"
+            includes="portal-webapp/project.xml,applications/**/project.xml,layout-portlets/project.xml"
+            excludes="applications/project.xml" goals="war:install" banner="Build and Install all Jetspeed 2 wars"
+            postProcessing="false" ignoreFailures="false" />
+    </goal>
+
+
+    <goal name="allBuild" description="Build all jars and war">
+
+        <attainGoal name="check.required.properties" />
+        <attainGoal name="db.scripts.gen" />
+        <j:if test="${context.getVariable('maven.test.skip') != 'true'}">
+            <attainGoal name="db.create.test" />
+        </j:if>
+
+        <!-- Build jars files-->
+        <attainGoal name="jetspeed2:jar:install" />
+
+        <!-- Build war files -->
+        <attainGoal name="jetspeed2:war:install" />
+
+        <!-- build jetspeed 2 plugin -->
+        <maven:reactor basedir="${basedir}/maven-plugin" includes="project.xml" goals="deploy-plugin"
+            banner="Build and deploy the Jetspeed 2 Maven plugin" postProcessing="false" ignoreFailures="false" />
+
+    </goal>
+
+    <goal name="copy.shared.deps">
+        <maven:reactor basedir="${basedir}" includes="portal-webapp/project.xml" goals="catalina:base-shared"
+            banner="Deploys misc. jars shared/lib  to Tomcat" postProcessing="false" ignoreFailures="false" />
+
+        <maven:reactor basedir="${basedir}" includes="portal-webapp/project.xml" goals="catalina:shared"
+            banner="Deploys container jars to shared/lib to Tomcat" postProcessing="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}" />
+    </goal>
+
+    <goal name="start.production.server">
+        <echo message="====================================" />
+        <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="./src/database/hsql/Production" />
             <arg value="-port" />
@@ -213,17 +165,17 @@
             <arg value="-trace" />
             <arg value="false" />
         </java>
-  </goal>
+    </goal>
 
-  <goal name="start.test.server">
-  	<echo message="====================================" />
-  	<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>
+    <goal name="start.test.server">
+        <echo message="====================================" />
+        <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="./src/database/hsql/Test" />
             <arg value="-port" />
@@ -233,384 +185,351 @@
             <arg value="-trace" />
             <arg value="false" />
         </java>
-  </goal>
+    </goal>
 
-  <goal name="db.scripts.gen" prereqs="torque:init"
-        description="Build SQL scripts using Torque generator">
+    <goal name="db.scripts.gen" prereqs="torque:init" description="Build SQL scripts using Torque generator">
+
+        <echo message="Generating SQL schema creation scripts for HSQLDB" />
+        <torque-sql basePathToDbProps="sql/base/" contextProperties="${torque.contextProperties}"
+            controlTemplate="${torque.template.sql}" idTableXMLFile="${torque.idTableXMLFile}"
+            outputDirectory="${maven.build.src}/sql/hsql" outputFile="report.${torque.project}.sql.generation"
+            sqldbmap="${maven.build.src}/sql/hsql/sqldb.map" targetDatabase="hypersonic" useClasspath="true">
+            <fileset dir="${torque.schema.dir}" includes="${torque.schema.sql.includes}"
+                excludes="${torque.schema.sql.excludes}" />
+        </torque-sql>
+
+        <echo message="Generating SQL schema creation scripts for MySQL" />
+        <torque-sql basePathToDbProps="sql/base/" contextProperties="${torque.contextProperties}"
+            controlTemplate="${torque.template.sql}" idTableXMLFile="${torque.idTableXMLFile}"
+            outputDirectory="${maven.build.src}/sql/mysql" outputFile="report.${torque.project}.sql.generation"
+            sqldbmap="${maven.build.src}/sql/mysql/sqldb.map" targetDatabase="mysql" useClasspath="true">
+            <fileset dir="${torque.schema.dir}" includes="${torque.schema.sql.includes}"
+                excludes="${torque.schema.sql.excludes}" />
+        </torque-sql>
+
+        <echo message="Generating SQL schema creation scripts for Oracle" />
+        <torque-sql basePathToDbProps="sql/base/" contextProperties="${torque.contextProperties}"
+            controlTemplate="${torque.template.sql}" idTableXMLFile="${torque.idTableXMLFile}"
+            outputDirectory="${maven.build.src}/sql/oracle" outputFile="report.${torque.project}.sql.generation"
+            sqldbmap="${maven.build.src}/sql/oracle/sqldb.map" targetDatabase="oracle" useClasspath="true">
+            <fileset dir="${torque.schema.dir}" includes="${torque.schema.sql.includes}"
+                excludes="${torque.schema.sql.excludes}" />
+        </torque-sql>
+
+        <echo message="Generating SQL schema creation scripts for MS SQL" />
+        <torque-sql basePathToDbProps="sql/base/" contextProperties="${torque.contextProperties}"
+            controlTemplate="${torque.template.sql}" idTableXMLFile="${torque.idTableXMLFile}"
+            outputDirectory="${maven.build.src}/sql/mssql" outputFile="report.${torque.project}.sql.generation"
+            sqldbmap="${maven.build.src}/sql/mssql/sqldb.map" targetDatabase="mssql" useClasspath="true">
+            <fileset dir="${torque.schema.dir}" includes="${torque.schema.sql.includes}"
+                excludes="${torque.schema.sql.excludes}" />
+        </torque-sql>
+
+        <echo message="Generating SQL schema creation scripts for Postgres" />
+        <torque-sql basePathToDbProps="sql/base/" contextProperties="${torque.contextProperties}"
+            controlTemplate="${torque.template.sql}" idTableXMLFile="${torque.idTableXMLFile}"
+            outputDirectory="${maven.build.src}/sql/postgres" outputFile="report.${torque.project}.sql.generation"
+            sqldbmap="${maven.build.src}/sql/postgres/sqldb.map" targetDatabase="postgresql" useClasspath="true">
+            <fileset dir="${torque.schema.dir}" includes="${torque.schema.sql.includes}"
+                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                                              -->
+    <!-- TODO: I'd like to implement this as a plugin or use commons SQL  -->
+    <!-- ================================================================ -->
+    <goal name="db.execute">
+        <sql driver="${org.apache.jetspeed.database.driver}" url="${org.apache.jetspeed.database.url}"
+            userid="${org.apache.jetspeed.database.user}" password="${org.apache.jetspeed.database.password}"
+            src="${database.arg.script}">
+            <classpath>
+                <pathelement path="${org.apache.jetspeed.jdbc.drivers.path}" />
+                <path refid="maven.dependency.classpath" />
+            </classpath>
+        </sql>
+    </goal>
+
+    <!-- ================================================================ -->
+    <!-- EXECUTE CREATE DB SQL SCRIPTS                                    -->
+    <!-- TODO: I'd like to implement this as a plugin or use commons SQL  -->
+    <!-- ================================================================ -->
+    <goal name="db.create.test">
+        <attainGoal name="db.test.properties" />
+        <attainGoal name="db.drop2" />
+        <attainGoal name="db.create" />
+    </goal>
+
+    <goal name="db.create.production">
+        <attainGoal name="db.production.properties" />
+        <attainGoal name="db.drop2" />
+        <attainGoal name="db.create" />
+    </goal>
+
+    <goal name="db.create">
+        <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/${org.apache.jetspeed.database.default.name}/phase1-schema.sql" />
+        <attainGoal name="db.execute" />
+        <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/${org.apache.jetspeed.database.default.name}/registry-schema.sql" />
+        <attainGoal name="db.execute" />
+        <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/${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/${org.apache.jetspeed.database.default.name}/test-persistence-schema.sql" />
+        <attainGoal name="db.execute" />
+    </goal>
+
+    <!-- ================================================================ -->
+    <!-- EXECUTE DROP DB SQL SCRIPTS                                      -->
+    <!-- TODO: I'd like to implement this as a plugin or use commons SQL  -->
+    <!-- ================================================================ -->
+    <goal name="db.drop.test">
+        <attainGoal name="db.test.properties" />
+        <attainGoal name="db.drop" />
+    </goal>
+
+    <goal name="db.drop.production">
+        <attainGoal name="db.production.properties" />
+        <attainGoal name="db.drop" />
+    </goal>
+
+    <goal name="db.drop">
+        <j:set var="database.arg.script" value="./src/sql/${org.apache.jetspeed.database.default.name}/drop-db.sql" />
+        <attainGoal name="db.execute" />
+        <j:set var="database.arg.script"
+            value="./src/sql/${org.apache.jetspeed.database.default.name}/registry-drop-db.sql" />
+        <attainGoal name="db.execute" />
+    </goal>
+
+    <goal name="db.drop2">
+        <j:set var='nodots' value="${org.apache.jetspeed.database.default.name}" />
+        <j:choose>
+            <j:when test="${nodots == 'mysql'}">
+                <j:set var="database.arg.script" value="./src/sql/mysql/drop.sql" />
+                <attainGoal name="db.execute" />
+            </j:when>
+        </j:choose>
+        <j:choose>
+            <j:when test="${nodots == 'hsql'}">
+                <j:set var="database.arg.script" value="./src/sql/hsql/drop.sql" />
+                <attainGoal name="db.execute" />
+            </j:when>
+        </j:choose>
+        <j:choose>
+            <j:when test="${nodots == 'oracle'}">
+                <!--          <attainGoal name="dropdrops" />		  -->
+            </j:when>
+        </j:choose>
+    </goal>
+
+    <goal name="db.drop.oracle">
+        <attainGoal name="db.production.properties" />
+        <j:set var="database.arg.script" value="./src/sql/oracle/drop.sql" />
+        <attainGoal name="db.execute" />
+    </goal>
+    <!-- ================================================================ -->
+    <!-- EXECUTE RECREATE DB SQL SCRIPTS                                  -->
+    <!-- TODO: I'd like to implement this as a plugin or use commons SQL  -->
+    <!-- ================================================================ -->
+    <goal name="db.recreate">
+        <attainGoal name="db.create.production" />
+    </goal>
 
-    <echo message="Generating SQL schema creation scripts for HSQLDB"/>
-    <torque-sql
-      basePathToDbProps="sql/base/"
-      contextProperties="${torque.contextProperties}"
-      controlTemplate="${torque.template.sql}"
-      idTableXMLFile="${torque.idTableXMLFile}"
-      outputDirectory="${maven.build.src}/sql/hsql"
-      outputFile="report.${torque.project}.sql.generation"
-      sqldbmap="${maven.build.src}/sql/hsql/sqldb.map"
-      targetDatabase="hypersonic"
-      useClasspath="true">
-      <fileset dir="${torque.schema.dir}"
-        includes="${torque.schema.sql.includes}"
-        excludes="${torque.schema.sql.excludes}"
-      />
-    </torque-sql>
-
-    <echo message="Generating SQL schema creation scripts for MySQL"/>
-    <torque-sql
-      basePathToDbProps="sql/base/"
-      contextProperties="${torque.contextProperties}"
-      controlTemplate="${torque.template.sql}"
-      idTableXMLFile="${torque.idTableXMLFile}"
-      outputDirectory="${maven.build.src}/sql/mysql"
-      outputFile="report.${torque.project}.sql.generation"
-      sqldbmap="${maven.build.src}/sql/mysql/sqldb.map"
-      targetDatabase="mysql"
-      useClasspath="true">
-      <fileset dir="${torque.schema.dir}"
-        includes="${torque.schema.sql.includes}"
-        excludes="${torque.schema.sql.excludes}"
-      />
-    </torque-sql>
-
-    <echo message="Generating SQL schema creation scripts for Oracle"/>
-    <torque-sql
-      basePathToDbProps="sql/base/"
-      contextProperties="${torque.contextProperties}"
-      controlTemplate="${torque.template.sql}"
-      idTableXMLFile="${torque.idTableXMLFile}"
-      outputDirectory="${maven.build.src}/sql/oracle"
-      outputFile="report.${torque.project}.sql.generation"
-      sqldbmap="${maven.build.src}/sql/oracle/sqldb.map"
-      targetDatabase="oracle"
-      useClasspath="true">
-      <fileset dir="${torque.schema.dir}"
-        includes="${torque.schema.sql.includes}"
-        excludes="${torque.schema.sql.excludes}"
-      />
-    </torque-sql>
-    
-    <echo message="Generating SQL schema creation scripts for MS SQL"/>
-    <torque-sql
-      basePathToDbProps="sql/base/"
-      contextProperties="${torque.contextProperties}"
-      controlTemplate="${torque.template.sql}"
-      idTableXMLFile="${torque.idTableXMLFile}"
-      outputDirectory="${maven.build.src}/sql/mssql"
-      outputFile="report.${torque.project}.sql.generation"
-      sqldbmap="${maven.build.src}/sql/mssql/sqldb.map"
-      targetDatabase="mssql"
-      useClasspath="true">
-      <fileset dir="${torque.schema.dir}"
-        includes="${torque.schema.sql.includes}"
-        excludes="${torque.schema.sql.excludes}"
-      />
-    </torque-sql>
-    
-    <echo message="Generating SQL schema creation scripts for Postgres"/>
-    <torque-sql
-      basePathToDbProps="sql/base/"
-      contextProperties="${torque.contextProperties}"
-      controlTemplate="${torque.template.sql}"
-      idTableXMLFile="${torque.idTableXMLFile}"
-      outputDirectory="${maven.build.src}/sql/postgres"
-      outputFile="report.${torque.project}.sql.generation"
-      sqldbmap="${maven.build.src}/sql/postgres/sqldb.map"
-      targetDatabase="postgresql"
-      useClasspath="true">
-      <fileset dir="${torque.schema.dir}"
-        includes="${torque.schema.sql.includes}"
-        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                                              -->
-  <!-- TODO: I'd like to implement this as a plugin or use commons SQL  -->
-  <!-- ================================================================ -->
-  <goal name="db.execute">
-    <sql driver="${org.apache.jetspeed.database.driver}"
-         url="${org.apache.jetspeed.database.url}"
-         userid="${org.apache.jetspeed.database.user}"
-         password="${org.apache.jetspeed.database.password}"
-         src="${database.arg.script}">
-      <classpath>
-        <pathelement path="${org.apache.jetspeed.jdbc.drivers.path}"/>
-        <path refid="maven.dependency.classpath"/>
-      </classpath>
-    </sql>
-  </goal>
-
-  <!-- ================================================================ -->
-  <!-- EXECUTE CREATE DB SQL SCRIPTS                                    -->
-  <!-- TODO: I'd like to implement this as a plugin or use commons SQL  -->
-  <!-- ================================================================ -->
-  <goal name="db.create.test">
-    <attainGoal name="db.test.properties"/>
-    <attainGoal name="db.drop2"/>	
-    <attainGoal name="db.create"/>
-  </goal>
-
-  <goal name="db.create.production">
-    <attainGoal name="db.production.properties"/>
-    <attainGoal name="db.drop2"/>		
-    <attainGoal name="db.create"/>
-  </goal>
-
-  <goal name="db.create">
-    <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/${org.apache.jetspeed.database.default.name}/phase1-schema.sql" />
-    <attainGoal name="db.execute" />
-    <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/${org.apache.jetspeed.database.default.name}/registry-schema.sql" />
-    <attainGoal name="db.execute" />
-    <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/${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/${org.apache.jetspeed.database.default.name}/test-persistence-schema.sql" />
-    <attainGoal name="db.execute" />
-  </goal>
-
-  <!-- ================================================================ -->
-  <!-- EXECUTE DROP DB SQL SCRIPTS                                      -->
-  <!-- TODO: I'd like to implement this as a plugin or use commons SQL  -->
-  <!-- ================================================================ -->
-  <goal name="db.drop.test">
-    <attainGoal name="db.test.properties"/>
-    <attainGoal name="db.drop"/>
-  </goal>
-
-  <goal name="db.drop.production">
-    <attainGoal name="db.production.properties"/>
-    <attainGoal name="db.drop"/>
-  </goal>
-
-  <goal name="db.drop">
-    <j:set var="database.arg.script" value="./src/sql/${org.apache.jetspeed.database.default.name}/drop-db.sql" />
-    <attainGoal name="db.execute" />
-    <j:set var="database.arg.script" value="./src/sql/${org.apache.jetspeed.database.default.name}/registry-drop-db.sql" />
-    <attainGoal name="db.execute" />
-  </goal>
-  
-  <goal name="db.drop2">
-	<j:set var='nodots' value="${org.apache.jetspeed.database.default.name}" /> 	
-    <j:choose>
-      <j:when test="${nodots == 'mysql'}" >		
-          <j:set var="database.arg.script" value="./src/sql/mysql/drop.sql" />
-          <attainGoal name="db.execute" />		  
-      </j:when>   	
-     </j:choose>
-    <j:choose>
-      <j:when test="${nodots == 'hsql'}" >		
-          <j:set var="database.arg.script" value="./src/sql/hsql/drop.sql" />
-          <attainGoal name="db.execute" />		  
-      </j:when>   	
-     </j:choose>	 
-    <j:choose>
-      <j:when test="${nodots == 'oracle'}" >		
-<!--          <attainGoal name="dropdrops" />		  -->
-      </j:when>   	
-     </j:choose>	 	 
-  </goal>
-
-  <goal name="db.drop.oracle">
-    <attainGoal name="db.production.properties"/>
-      <j:set var="database.arg.script" value="./src/sql/oracle/drop.sql" />
-      <attainGoal name="db.execute" />		      	
-  </goal>
-  <!-- ================================================================ -->
-  <!-- EXECUTE RECREATE DB SQL SCRIPTS                                  -->
-  <!-- TODO: I'd like to implement this as a plugin or use commons SQL  -->
-  <!-- ================================================================ -->
-  <goal name="db.recreate">
-    <attainGoal name="db.create.production" />
-  </goal>
-  
     <goal name="doStart">
-      <maven:property name="deployType" defaultValue="fullDeploy"/>
-      <maven:property name="recreateDB" defaultValue="true"/>
+        <maven:property name="deployType" defaultValue="fullDeploy" />
+        <maven:property name="recreateDB" defaultValue="true" />
 
-      <j:if test="${recreateDB}">
-        <attainGoal name="db.recreate" />
-      </j:if>
-      
-        <maven:reactor
-               basedir="${basedir}"
-               includes="portal/project.xml"
-               goals="remove.wars"
-               banner="Remove war files, make sure to shutdown server first"
-               postProcessing="false"
-               ignoreFailures="false"/>
+        <j:if test="${recreateDB}">
+            <attainGoal name="db.recreate" />
+        </j:if>
 
-        <!-- Dependency copying -->
+        <maven:reactor basedir="${basedir}" includes="portal-webapp/project.xml" goals="remove.wars"
+            banner="Remove war files, make sure to shutdown server first" postProcessing="false" ignoreFailures="false" />
 
+        <!-- Dependency copying -->
         <attainGoal name="copy.shared.deps" />
 
-        <maven:reactor
-               basedir="${basedir}"
-               includes="portal/project.xml"
-               goals="${deployType}"
-               banner="Deploying basic Jetspeed portal suite"
-               postProcessing="false"
-               ignoreFailures="false"/>
+        <maven:reactor basedir="${basedir}" includes="portal-webapp/project.xml" goals="${deployType}"
+            banner="Deploying basic Jetspeed portal suite" postProcessing="false" ignoreFailures="false" />
+    </goal>
 
+    <goal name="quickStart" description="Creates the production DB and calls portal/maven fullDeploy">
+        <j:set var="deployType" value="fullDeploy" />
+        <attainGoal name="doStart" />
     </goal>
 
-    <goal name="quickStart"
-        description="Creates the production DB and calls portal/maven fullDeploy">
-        <j:set var="deployType" value="fullDeploy"/>
-        <attainGoal name="doStart"/>
+    <goal name="nodbQuickStart" description="Don't create a new production DB but call portal/maven fullDeploy">
+        <j:set var="deployType" value="nodbfullDeploy" />
+        <j:set var="recreateDB" value="false" />
+        <attainGoal name="doStart" />
     </goal>
-    
-    <goal name="nodbQuickStart"
-        description="Don't create a new production DB but call portal/maven fullDeploy">
-        <j:set var="deployType" value="nodbfullDeploy"/>
-        <j:set var="recreateDB" value="false"/>
-        <attainGoal name="doStart"/>
+
+    <goal name="minStart" description="Creates the production DB and calls portal/maven minDeploy">
+        <j:set var="deployType" value="minDeploy" />
+        <attainGoal name="doStart" />
     </goal>
 
-    <goal name="minStart"
-        description="Creates the production DB and calls portal/maven minDeploy">
-        <j:set var="deployType" value="minDeploy"/>
-        <attainGoal name="doStart"/>
+    <goal name="nodbMinStart" description="Don't create a new production DB but call portal/maven minDeploy">
+        <j:set var="deployType" value="nodbMinDeploy" />
+        <j:set var="recreateDB" value="false" />
+        <attainGoal name="doStart" />
     </goal>
-    
-    <goal name="nodbMinStart"
-        description="Don't create a new production DB but call portal/maven minDeploy">
-        <j:set var="deployType" value="nodbMinDeploy"/>
-        <j:set var="recreateDB" value="false"/>
-        <attainGoal name="doStart"/>
+
+    <goal name="basicStart" description="Creates the production DB and calls portal/maven basicDeploy">
+        <j:set var="deployType" value="minDeploy" />
+        <attainGoal name="doStart" />
     </goal>
-    
-    <goal name="basicStart"
-        description="Creates the production DB and calls portal/maven basicDeploy">
-        <j:set var="deployType" value="minDeploy"/>
-        <attainGoal name="doStart"/>
+
+    <goal name="nodbBasicStart" description="Don't create a new production DB but call portal/maven nodbBasicDeploy">
+        <j:set var="deployType" value="nodbBasicDeploy" />
+        <j:set var="recreateDB" value="false" />
+        <attainGoal name="doStart" />
+    </goal>
+
+    <goal name="dropdrops">
+        <attainGoal name="db.production.properties" />
+        <attainGoal name="all.dropdrops" />
+    </goal>
+
+    <goal name="test.dropdrops">
+        <attainGoal name="db.test.properties" />
+        <attainGoal name="all.dropdrops" />
+    </goal>
+
+    <goal name="all.dropdrops">
+        <attainGoal name="java:compile" />
+
+        <attainGoal name="run.dropdrops" />
+        <j:set var="dropstable" value="./target/src/sql/${org.apache.jetspeed.database.default.name}/phase1-schema.sql" />
+        <attainGoal name="run.dropdrops" />
+        <j:set var="dropstable" value="./target/src/sql/${org.apache.jetspeed.database.default.name}/phase2-schema.sql" />
+        <attainGoal name="run.dropdrops" />
+        <j:set var="dropstable"
+            value="./target/src/sql/${org.apache.jetspeed.database.default.name}/phase3ojb-schema.sql" />
+        <attainGoal name="run.dropdrops" />
+        <j:set var="dropstable" value="./target/src/sql/${org.apache.jetspeed.database.default.name}/prefs-schema.sql" />
+        <attainGoal name="run.dropdrops" />
+        <j:set var="dropstable"
+            value="./target/src/sql/${org.apache.jetspeed.database.default.name}/registry-schema.sql" />
+        <attainGoal name="run.dropdrops" />
+        <j:set var="dropstable"
+            value="./target/src/sql/${org.apache.jetspeed.database.default.name}/security-schema.sql" />
+        <attainGoal name="run.dropdrops" />
+        <j:set var="dropstable"
+            value="./target/src/sql/${org.apache.jetspeed.database.default.name}/test-persistence-schema.sql" />
+        <attainGoal name="run.dropdrops" />
     </goal>
-    
-    <goal name="nodbBasicStart"
-        description="Don't create a new production DB but call portal/maven nodbBasicDeploy">
-        <j:set var="deployType" value="nodbBasicDeploy"/>
-        <j:set var="recreateDB" value="false"/>
-        <attainGoal name="doStart"/>
-    </goal>
-
-   <goal name="dropdrops">
-    <attainGoal name="db.production.properties"/>
-    <attainGoal name="all.dropdrops"/>
-   </goal>
-
-   <goal name="test.dropdrops">
-    <attainGoal name="db.test.properties"/>
-    <attainGoal name="all.dropdrops"/>
-   </goal>
-      
-   <goal name="all.dropdrops">
-    <attainGoal name="java:compile"/>
-   
-    <attainGoal name="run.dropdrops" />               
-    <j:set var="dropstable" value="./target/src/sql/${org.apache.jetspeed.database.default.name}/phase1-schema.sql" />
-    <attainGoal name="run.dropdrops" />
-    <j:set var="dropstable" value="./target/src/sql/${org.apache.jetspeed.database.default.name}/phase2-schema.sql" />
-    <attainGoal name="run.dropdrops" />
-    <j:set var="dropstable" value="./target/src/sql/${org.apache.jetspeed.database.default.name}/phase3ojb-schema.sql" />
-    <attainGoal name="run.dropdrops" />
-    <j:set var="dropstable" value="./target/src/sql/${org.apache.jetspeed.database.default.name}/prefs-schema.sql" />
-    <attainGoal name="run.dropdrops" />
-    <j:set var="dropstable" value="./target/src/sql/${org.apache.jetspeed.database.default.name}/registry-schema.sql" />
-    <attainGoal name="run.dropdrops" />
-    <j:set var="dropstable" value="./target/src/sql/${org.apache.jetspeed.database.default.name}/security-schema.sql" />
-    <attainGoal name="run.dropdrops" />
-    <j:set var="dropstable" value="./target/src/sql/${org.apache.jetspeed.database.default.name}/test-persistence-schema.sql" />
-    <attainGoal name="run.dropdrops" />
-   </goal>
 
     <goal name="run.dropdrops">
-         <java classname="org.apache.jetspeed.dbutil.ScriptUtil" fork="yes">
-          <classpath>
-            <path refid="maven.dependency.classpath"/>
-            <pathelement path="${maven.build.dest}"/>
-          </classpath>
+        <java classname="org.apache.jetspeed.dbutil.ScriptUtil" fork="yes">
+            <classpath>
+                <path refid="maven.dependency.classpath" />
+                <pathelement path="${maven.build.dest}" />
+            </classpath>
             <arg value="-drops" />
             <arg value="${dropstable}" />
         </java>
     </goal>
-   
-   <!-- this will be inherited into all sub-projects to assists in
-   	    setting jdbc test connecitons--> 
-   <preGoal name="test:test">
-   	 <attainGoal name="dbSetup" />
-  </preGoal>
-  
-  <preGoal name="test:single">
-   	 <attainGoal name="dbSetup" />
-  </preGoal>
-  
-  <goal name="dbSetup">
-  	 <j:set var="maven.junit.sysproperties" value="${maven.junit.sysproperties} org.apache.jetspeed.database.url org.apache.jetspeed.database.driver org.apache.jetspeed.database.user org.apache.jetspeed.database.password p6.home" />
-    <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:if test="${!pom.id.equals('jetspeed2:jetspeed')}">
-      <available property="_found" file="src/test/repository_database.xml"/>
-      <j:if test="${_found}">
-        <copy file="src/test/repository_database.xml" todir="${maven.test.dest}" overwrite="true" failonerror="false">
-          <filterset begintoken="@" endtoken="@">
-            <filter token="PLATFORM" value="${org.apache.jetspeed.test.database.ojb.platform}"/>
-          </filterset>    
-        </copy>
-      </j:if>
-    </j:if>
-    
-    <j:if test="${pom.id.equals('jetspeed2:jetspeed')}">
-      <available property="_found" file="src/java/repository_database.xml"/>
-      <j:if test="${_found}">
-        <copy file="src/java/repository_database.xml" todir="${maven.test.dest}" overwrite="true" failonerror="false">
-         <filterset begintoken="@" endtoken="@">
-          <filter token="PLATFORM" value="${org.apache.jetspeed.test.database.ojb.platform}"/>
-         </filterset>    
-        </copy>
-      </j:if>
-    </j:if>
-
-    <path id="jdbc.drivers.path" path="${org.apache.jetspeed.test.jdbc.drivers.path}"/>
-    <maven:addPath id="maven.dependency.classpath" refid="jdbc.drivers.path"/>
-  </goal>
-  
-    <goal name="check.required.properties"
-        description="Check if the required properties are defined">
-    <fail message="Required property org.apache.jetspeed.server.home undefined. See http://portals.apache.org/jetspeed-2/getting-started.html." unless="org.apache.jetspeed.server.home"/>
-    <fail message="Required property org.apache.jetspeed.catalina.version.major undefined. See http://portals.apache.org/jetspeed-2/getting-started.html." unless="org.apache.jetspeed.catalina.version.major"/>
-    <fail message="Required property org.apache.jetspeed.server.shared undefined. See http://portals.apache.org/jetspeed-2/getting-started.html." unless="org.apache.jetspeed.server.shared"/>
-    <fail message="Required property org.apache.jetspeed.deploy.war.dir undefined. See http://portals.apache.org/jetspeed-2/getting-started.html." unless="org.apache.jetspeed.deploy.war.dir"/>
-    <fail message="Required property org.apache.jetspeed.services.autodeployment.user undefined. See http://portals.apache.org/jetspeed-2/getting-started.html." unless="org.apache.jetspeed.services.autodeployment.user"/>
-    <fail message="Required property org.apache.jetspeed.services.autodeployment.password undefined. See http://portals.apache.org/jetspeed-2/getting-started.html." unless="org.apache.jetspeed.services.autodeployment.password"/>
-  </goal>  
-  
+
+    <!-- this will be inherited into all sub-projects to assists in
+        setting jdbc test connecitons-->
+    <preGoal name="test:test">
+        <attainGoal name="dbSetup" />
+    </preGoal>
+
+    <preGoal name="test:single">
+        <attainGoal name="dbSetup" />
+    </preGoal>
+
+    <goal name="dbSetup">
+        <j:set var="maven.junit.sysproperties"
+            value="${maven.junit.sysproperties} org.apache.jetspeed.database.url org.apache.jetspeed.database.driver org.apache.jetspeed.database.user org.apache.jetspeed.database.password p6.home" />
+        <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:if test="${!pom.id.equals('jetspeed2:jetspeed')}">
+            <available property="_found" file="src/test/repository_database.xml" />
+            <j:if test="${_found}">
+                <copy file="src/test/repository_database.xml" todir="${maven.test.dest}" overwrite="true"
+                    failonerror="false">
+                    <filterset begintoken="@" endtoken="@">
+                        <filter token="PLATFORM" value="${org.apache.jetspeed.test.database.ojb.platform}" />
+                    </filterset>
+                </copy>
+            </j:if>
+        </j:if>
+
+        <j:if test="${pom.id.equals('jetspeed2:jetspeed')}">
+            <available property="_found" file="src/java/repository_database.xml" />
+            <j:if test="${_found}">
+                <copy file="src/java/repository_database.xml" todir="${maven.test.dest}" overwrite="true"
+                    failonerror="false">
+                    <filterset begintoken="@" endtoken="@">
+                        <filter token="PLATFORM" value="${org.apache.jetspeed.test.database.ojb.platform}" />
+                    </filterset>
+                </copy>
+            </j:if>
+        </j:if>
+
+        <path id="jdbc.drivers.path" path="${org.apache.jetspeed.test.jdbc.drivers.path}" />
+        <maven:addPath id="maven.dependency.classpath" refid="jdbc.drivers.path" />
+    </goal>
+
+    <goal name="check.required.properties" description="Check if the required properties are defined">
+        <fail
+            message="Required property org.apache.jetspeed.server.home undefined. See http://portals.apache.org/jetspeed-2/getting-started.html."
+            unless="org.apache.jetspeed.server.home" />
+        <fail
+            message="Required property org.apache.jetspeed.catalina.version.major undefined. See http://portals.apache.org/jetspeed-2/getting-started.html."
+            unless="org.apache.jetspeed.catalina.version.major" />
+        <fail
+            message="Required property org.apache.jetspeed.server.shared undefined. See http://portals.apache.org/jetspeed-2/getting-started.html."
+            unless="org.apache.jetspeed.server.shared" />
+        <fail
+            message="Required property org.apache.jetspeed.deploy.war.dir undefined. See http://portals.apache.org/jetspeed-2/getting-started.html."
+            unless="org.apache.jetspeed.deploy.war.dir" />
+        <fail
+            message="Required property org.apache.jetspeed.services.autodeployment.user undefined. See http://portals.apache.org/jetspeed-2/getting-started.html."
+            unless="org.apache.jetspeed.services.autodeployment.user" />
+        <fail
+            message="Required property org.apache.jetspeed.services.autodeployment.password undefined. See http://portals.apache.org/jetspeed-2/getting-started.html."
+            unless="org.apache.jetspeed.services.autodeployment.password" />
+    </goal>
+
 </project>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message