Author: taylor
Date: Mon Jan 15 11:07:17 2007
New Revision: 496445
URL: http://svn.apache.org/viewvc?view=rev&rev=496445
Log:
Maven-2 custom build was broken. this patch fixes the maven-2 plugin for custom
projects
Modified:
portals/jetspeed-2/trunk/maven-archetypes/portal/build.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/pom.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/build.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/pom.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/build.xml
Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/build.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/build.xml?view=diff&rev=496445&r1=496444&r2=496445
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/build.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/build.xml Mon Jan 15
11:07:17 2007
@@ -22,6 +22,8 @@
<property name="org.apache.jetspeed.archetype.artifactid" value=""/>
<property name="org.apache.jetspeed.archetype.version" value=""/>
+ <property name="org.apache.jetspeed.archetype.groupid" value=""/>
+
<!-- Usage -->
@@ -33,6 +35,7 @@
<echo message="Configuration:"/>
<echo message="
org.apache.jetspeed.archetype.artifactid=${org.apache.jetspeed.archetype.artifactid}"/>
<echo message="
org.apache.jetspeed.archetype.version=${org.apache.jetspeed.archetype.version}"/>
+ <echo message="
org.apache.jetspeed.archetype.groupid=${org.apache.jetspeed.archetype.groupid}"/>
</target>
<!-- Additional Task Definitions -->
@@ -100,9 +103,52 @@
<fileset dir="${basedir}/../../etc/conf"/>
</copy>
- <!-- Set POM default jetspeed-2 version -->
- <replace file="${basedir}/target/classes/archetype-resources/pom.xml"
+ <!-- Assemble required resources for serializer >import resources
-->
+
+ <delete
dir="${basedir}/target/classes/archetype-resources/etc/serializer"/>
+ <mkdir
dir="${basedir}/target/classes/archetype-resources/etc/serializer"/>
+ <mkdir
dir="${basedir}/target/classes/archetype-resources/etc/serializer/assembly"/>
+ <copy
todir="${basedir}/target/classes/archetype-resources/etc/serializer/assembly">
+ <fileset dir="${basedir}/../../src/webapp/WEB-INF/assembly">
+ <include name="security*.xml"/>
+ <include name="capabilities.xml"/>
+ <include name="prefs.xml"/>
+ <include name="profiler.xml"/>
+ <include name="transaction.xml"/>
+ </fileset>
+ </copy>
+ <mkdir
dir="${basedir}/target/classes/archetype-resources/etc/serializer/log4j"/>
+ <copy
todir="${basedir}/target/classes/archetype-resources/etc/serializer/log4j">
+ <fileset dir="${basedir}/../../etc/log4j" >
+ <include name="log4j.properties"/>
+ </fileset>
+ </copy>
+ <mkdir
dir="${basedir}/target/classes/archetype-resources/etc/serializer/db-ojb"/>
+ <copy
todir="${basedir}/target/classes/archetype-resources/etc/serializer/db-ojb">
+ <fileset dir="${basedir}/../../etc/db-ojb" >
+ </fileset>
+ </copy>
+
+ <mkdir
dir="${basedir}/target/classes/archetype-resources/etc/serializer/assembly/boot/"/>
+ <copy
todir="${basedir}/target/classes/archetype-resources/etc/serializer/assembly/boot/"
overwrite="true" failonerror="true">
+ <fileset
dir="${basedir}/../../src/webapp/WEB-INF/assembly/boot">
+ <include name="*.xml"/>
+ </fileset>
+ </copy>
+
+
+ <echo message="Replacing JETSPEED_2_VERSION with
${org.apache.jetspeed.archetype.version}"/>
+ <echo message="Replacing JETSPEED_2_GROUPID with
${org.apache.jetspeed.archetype.groupid}"/>
+
+ <!-- Set POM default jetspeed-2 version -->
+
+<!-- <replace
file="${basedir}/target/classes/archetype-resources/pom.xml"
+ token="@JETSPEED_2_GROUPID@"
value="${org.apache.jetspeed.archetype.groupid}"/>
+
+ <replace file="${basedir}/target/classes/archetype-resources/pom.xml"
token="@JETSPEED_2_VERSION@"
value="${org.apache.jetspeed.archetype.version}"/>
+-->
+
<!-- Dynamically build archetype descriptor metadata -->
<fileset id="archetype.resources.id"
dir="${basedir}/target/classes/archetype-resources/">
Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/pom.xml?view=diff&rev=496445&r1=496444&r2=496445
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/pom.xml Mon Jan 15
11:07:17 2007
@@ -13,7 +13,7 @@
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.
-
+
$Id:$
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
@@ -58,7 +58,9 @@
value="${pom.artifactId}"/>
<property
name="org.apache.jetspeed.archetype.version"
value="${pom.version}"/>
- </ant>
+ <property
name="org.apache.jetspeed.archetype.groupid"
+
value="org.apache.portals.jetspeed-2"/>
+ </ant>
</tasks>
</configuration>
<goals>
Modified:
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/build.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/build.xml?view=diff&rev=496445&r1=496444&r2=496445
==============================================================================
---
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/build.xml
(original)
+++
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/build.xml
Mon Jan 15 11:07:17 2007
@@ -33,16 +33,16 @@
<property name="hsqldb.version" value=""/>
<property name="portlet-api.version" value=""/>
- <property name="org.apache.jetspeed.source.sql" value="${basedir}/sql"/>
+ <property name="org.apache.jetspeed.source.sql" value="\${basedir}/sql"/>
<property name="org.apache.jetspeed.database.source.sql"
value="${org.apache.jetspeed.source.sql}/${org.apache.jetspeed.database.default.name}"/>
- <property name="org.apache.jetspeed.database.target.sql.root"
value="${basedir}/target/sql"/>
+ <property name="org.apache.jetspeed.database.target.sql.root"
value="\${basedir}/target/sql"/>
<property name="org.apache.jetspeed.database.target.sql"
value="${org.apache.jetspeed.database.target.sql.root}/${org.apache.jetspeed.database.default.name}"/>
<property name="torque.contextProperties" value=""/>
<property name="torque.runOnlyOnSchemaChange" value="true"/>
<property name="torque.idTableXMLFile" value=""/>
<property name="torque.project" value="phase1"/>
- <property name="torque.schema.dir" value="${basedir}/schema"/>
+ <property name="torque.schema.dir" value="\${basedir}/schema"/>
<property name="torque.schema.sql.excludes" value=""/>
<property name="torque.schema.sql.includes" value="*-schema.xml"/>
<property name="torque.template.sql" value="sql/base/Control.vm"/>
@@ -355,7 +355,7 @@
the subsequent test database access in forked JVMs.
-->
<!-- write out temporary ant build file for forked execution -->
- <echo file="${basedir}/derby-sql-build.xml">
+ <echo file="\${basedir}/derby-sql-build.xml">
<project name="etc-derby-sql-build">
<target name="forked-sql-execute-derby">
<sql
url="${org.apache.jetspeed.database.url};create=true"
driver="${org.apache.jetspeed.database.driver}"
@@ -383,15 +383,15 @@
version="${ant.version}"/>
</dependencies>
<!-- fork and execute temporary ant build file -->
- <java classname="org.apache.tools.ant.Main" fork="on" append="on"
failonerror="on" dir="${basedir}">
+ <java classname="org.apache.tools.ant.Main" fork="on" append="on"
failonerror="on" dir="\${basedir}">
<classpath>
<fileset refid="ant.dependencies.id"/>
<fileset refid="derby.embedded.db.dependencies.id"/>
</classpath>
- <arg line="-f ${basedir}/derby-sql-build.xml
forked-sql-execute-derby"/>
+ <arg line="-f \${basedir}/derby-sql-build.xml
forked-sql-execute-derby"/>
</java>
<!-- cleanup temporary ant build file -->
- <delete file="${basedir}/derby-sql-build.xml"/>
+ <delete file="\${basedir}/derby-sql-build.xml"/>
</target>
<target name="sql-execute-hsql"
if="org.apache.jetspeed.database.is.hsql.embedded">
@@ -438,32 +438,35 @@
</target>
<target name="populate-seed-data">
- <echo message = "called seed data with directory ${basedir} " />
+ <echo message = "called seed data with directory \${basedir} " />
<!-- prepare a classes directory with resources and libraries to
execute import -->
- <delete dir="${basedir}/target/seed"/>
- <mkdir dir="${basedir}/target/seed"/>
- <mkdir dir="${basedir}/target/seed/data"/>
+ <delete dir="\${basedir}/target/seed"/>
+ <mkdir dir="\${basedir}/target/seed"/>
+ <mkdir dir="\${basedir}/target/seed/data"/>
<!-- copy seed -->
- <copy todir="${basedir}/target/seed/data" overwrite="on" verbose="on"
failonerror="off">
+ <copy todir="\${basedir}/target/seed/data" overwrite="on" verbose="on"
failonerror="off">
<fileset dir="${org.apache.jetspeed.source.sql}">
<include name="*seed.xml"/>
</fileset>
</copy>
-
- <mkdir dir="${basedir}/target/seed/classes"/>
- <copy todir="${basedir}/target/seed/classes" flatten="on">
- <fileset dir="${basedir}" >
+<!--
+ <mkdir dir="\${basedir}/target/seed/classes"/>
+ <copy todir="\${basedir}/target/seed/classes" flatten="on">
+ <fileset dir="\${basedir}" >
<include name="log4j/log4j.properties"/>
<include name="db-ojb/*"/>
</fileset>
</copy>
- <!-- prepare spring assemblies (TODO: why not use a Spring classpath
loader?) -->
- <property name="temp.assembly.dir"
value="${basedir}/target/seed/assembly/"/>
+
+-->
+ <!-- prepare spring assemblies (TODO: why not use a Spring classpath
loader?) -->
+<!-- <property name="temp.assembly.dir"
value="\${basedir}/target/seed/assembly/"/> -->
+ <property name="temp.assembly.dir"
value="\${basedir}/serializer/assembly/"/>
<mkdir dir="${temp.assembly.dir}"/>
<echo message="Running Jetspeed Seed Importer with -b
${temp.assembly.dir}/boot/ -c ${temp.assembly.dir}/ "/>
- <copy todir="${temp.assembly.dir}" overwrite="true" failonerror="true">
- <fileset dir="${basedir}/../src/webapp/WEB-INF/assembly">
+<!-- <copy todir="${temp.assembly.dir}" overwrite="true"
failonerror="true">
+ <fileset dir="\${basedir}/../src/webapp/WEB-INF/assembly">
<include name="security*.xml"/>
<include name="capabilities.xml"/>
<include name="prefs.xml"/>
@@ -473,11 +476,14 @@
</copy>
<mkdir dir="${temp.assembly.dir}/boot/"/>
<copy todir="${temp.assembly.dir}/boot/" overwrite="true"
failonerror="true">
- <fileset dir="${basedir}/../src/webapp/WEB-INF/assembly/boot">
+ <fileset dir="\${basedir}/../src/webapp/WEB-INF/assembly/boot">
<include name="*.xml"/>
</fileset>
</copy>
-
+-->
+ <echo message=" portlet-api.version=${portlet-api.version}"/>
+ <echo message="
org.apache.jetspeed.deploy.version=${org.apache.jetspeed.deploy.version}"/>
+ <echo message="
org.apache.jetspeed.deploy.groupid=${org.apache.jetspeed.deploy.groupid}"/>
<!-- construct serializer component classpath -->
<dependencies filesetId="serializer-id" useScope="test">
@@ -524,18 +530,21 @@
<propertyref name="org.apache.jetspeed.database.user"/>
<propertyref name="org.apache.jetspeed.database.password"/>
</propertyset>
- <echo message="calling serializer with data in
${basedir}/target/seed/data , assembly and b oot:${temp.assembly.dir}/
database:-dc ${org.apache.jetspeed.database.driver} -ds
${org.apache.jetspeed.database.url} -du ${org.apache.jetspeed.database.user}
-dp ${org.apache.jetspeed.database.password}" />
+ <echo message="calling serializer with data in
\${basedir}/target/seed/data , assembly and b oot:${temp.assembly.dir}/
database:-dc ${org.apache.jetspeed.database.driver} -ds
${org.apache.jetspeed.database.url} -du ${org.apache.jetspeed.database.user}
-dp ${org.apache.jetspeed.database.password}" />
<!-- execute import utility within the page manager component -->
- <java
classname="org.apache.jetspeed.serializer.JetspeedSerializerApplication"
fork="on" append="on" dir="${basedir}">
+ <java
classname="org.apache.jetspeed.serializer.JetspeedSerializerApplication"
fork="on" append="on" dir="\${basedir}">
<classpath>
<!-- <fileset refid="maven.dependency.classpath"/>
-->
<fileset refid="serializer-id"/>
<pathelement
path="${org.apache.jetspeed.database.jdbc.drivers.path}"/>
- <pathelement path="${basedir}/target/seed/classes"/>
+<!-- <pathelement path="\${basedir}/target/seed/classes"/> -->
+ <pathelement path="\${basedir}/serializer"/>
+ <pathelement path="\${basedir}/serializer/db-ojb"/>
+ <pathelement path="\${basedir}/serializer/log4j"/>
</classpath>
- <arg line="-I ${basedir}/target/seed/data/ -b
${temp.assembly.dir}/boot/ -c ${temp.assembly.dir}/ -dc
${org.apache.jetspeed.database.driver} -ds ${org.apache.jetspeed.database.url}
-du ${org.apache.jetspeed.database.user} -dp
${org.apache.jetspeed.database.password}"/>
+ <arg line="-I \${basedir}/target/seed/data/ -b
${temp.assembly.dir}/boot/ -c ${temp.assembly.dir}/ -dc
${org.apache.jetspeed.database.driver} -ds ${org.apache.jetspeed.database.url}
-du ${org.apache.jetspeed.database.user} -dp
${org.apache.jetspeed.database.password}"/>
</java>
</target>
Modified:
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/pom.xml?view=diff&rev=496445&r1=496444&r2=496445
==============================================================================
---
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/pom.xml
(original)
+++
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/pom.xml
Mon Jan 15 11:07:17 2007
@@ -100,7 +100,7 @@
<phase>install</phase>
<configuration>
<tasks>
- <ant target="create-populate-db"
antfile="build.xml" dir="${basedir}" inheritRefs="on">
+ <ant target="create-populate-db"
antfile="build.xml" dir="\${basedir}" inheritRefs="on">
<property
name="org.apache.jetspeed.database.enable"
value="${org.apache.jetspeed.env.deploy.db}"/>
<property
name="org.apache.jetspeed.database.skip"
@@ -124,11 +124,11 @@
<property name="hsqldb.version"
value="${hsqldb.version}"/>
<property
name="org.apache.jetspeed.deploy.groupid"
- value="${pom.groupId}"/>
+
value="${org.apache.portals.jetspeed-2.groupid}"/>
<property
name="org.apache.jetspeed.deploy.artifactid"
value="${pom.artifactId}"/>
<property
name="org.apache.jetspeed.deploy.version"
- value="${pom.version}"/>
+
value="${org.apache.portals.jetspeed-2.version}"/>
<property name="portlet-api.version"
value="${portlet-api.version}"/>
</ant>
Modified:
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml?view=diff&rev=496445&r1=496444&r2=496445
==============================================================================
---
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml
(original)
+++
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml
Mon Jan 15 11:07:17 2007
@@ -33,6 +33,7 @@
<packaging>pom</packaging>
<name>${artifactId} Portal</name>
+
<!-- Profiles -->
<profiles>
@@ -76,6 +77,13 @@
<org.apache.jetspeed.env.hotdeploy>true</org.apache.jetspeed.env.hotdeploy>
</properties>
</profile>
+ <!-- DBPSML Deployment Profile -->
+ <profile>
+ <id>dbpsml</id>
+ <properties>
+
<org.apache.jetspeed.env.deploy.db.psml>true</org.apache.jetspeed.env.deploy.db.psml>
+ </properties>
+ </profile>
</profiles>
@@ -114,12 +122,16 @@
<org.apache.pluto.version>1.0.1</org.apache.pluto.version>
<org.apache.portals.bridges.common.version>1.0.1-dev</org.apache.portals.bridges.common.version>
<org.apache.portals.bridges.velocity.version>1.0</org.apache.portals.bridges.velocity.version>
-
<org.apache.portals.jetspeed-2.version>@JETSPEED_2_VERSION@</org.apache.portals.jetspeed-2.version>
+
<org.apache.portals.jetspeed-2.version>2.1-dev</org.apache.portals.jetspeed-2.version>
+
<org.apache.portals.jetspeed-2.groupid>org.apache.portals.jetspeed-2</org.apache.portals.jetspeed-2.groupid>
<portlet-api.version>1.0</portlet-api.version>
<taglibs-request.version>1.0.1</taglibs-request.version>
<taglibs-standard.version>1.0.6</taglibs-standard.version>
<velocity-tools.version>1.2</velocity-tools.version>
<velocity.version>1.4</velocity.version>
+
+
<org.apache.portals.portal.version>${version}</org.apache.portals.portal.version>
+
<org.apache.portals.portal.name>${artifactId}</org.apache.portals.portal.name>
</properties>
@@ -138,6 +150,9 @@
<!-- Portal Application -->
<module>portal</module>
+
+ <!-- DBpsml support -->
+ <module>etc/dbpsml</module>
<!-- Portal Application Server Deployment -->
<module>app-servers</module>
Modified:
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/build.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/build.xml?view=diff&rev=496445&r1=496444&r2=496445
==============================================================================
---
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/build.xml
(original)
+++
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/build.xml
Mon Jan 15 11:07:17 2007
@@ -121,6 +121,8 @@
</fileset>
</copy>
+ <!-- Add support for dbpsml -->
+
<!-- Configure runtime portal properties resource -->
<replace
file="\${basedir}/target/webapp/WEB-INF/conf/jetspeed.properties">
<replacefilter token="@AUTODEPLOYMENT_SERVER@"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
