You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by dl...@apache.org on 2004/04/29 04:53:37 UTC
cvs commit: jakarta-jetspeed-2/portal project.xml maven.xml
dlestrat 2004/04/28 19:53:37
Modified: portal project.xml maven.xml
Log:
Applying patch from Ate Douma regarding JS2-18: Cannot run J2 using
Oracle due to problems with OBJ, Torque and dependencies on HSQLDB.
Revision Changes Path
1.59 +10 -7 jakarta-jetspeed-2/portal/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/project.xml,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- project.xml 25 Apr 2004 16:37:47 -0000 1.58
+++ project.xml 29 Apr 2004 02:53:37 -0000 1.59
@@ -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>
1.66 +123 -54 jakarta-jetspeed-2/portal/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/maven.xml,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- maven.xml 20 Apr 2004 02:08:51 -0000 1.65
+++ maven.xml 29 Apr 2004 02:53:37 -0000 1.66
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org