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 ta...@apache.org on 2007/01/24 07:59:56 UTC
svn commit: r499284 - in
/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc:
build.xml dbpsml/build.xml
Author: taylor
Date: Tue Jan 23 22:59:55 2007
New Revision: 499284
URL: http://svn.apache.org/viewvc?view=rev&rev=499284
Log:
Two patch fixes:
1. DBPSML in custom build fixed.
Previous fix mix-up resulted in wrong directory references
2. Build problem with serializer reported by P.M.D. (and fixed in Jetspeed Portal Build) now fixed in Custom Build
Same fix as reported in JS2-643 fixed for custom build
contribution from Hajo Birthelmer
Modified:
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/dbpsml/build.xml
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=499284&r1=499283&r2=499284
==============================================================================
--- 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 Tue Jan 23 22:59:55 2007
@@ -462,7 +462,8 @@
-->
<!-- 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/"/>
+ <property name="assembly.dir" value="serializer/assembly/"/>
+ <property name="temp.assembly.dir" value="\${basedir}/${assembly.dir}"/>
<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">
@@ -544,7 +545,7 @@
<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 ${assembly.dir}/boot/ -c ${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/dbpsml/build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/build.xml?view=diff&rev=499284&r1=499283&r2=499284
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/build.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/build.xml Tue Jan 23 22:59:55 2007
@@ -84,12 +84,12 @@
<mkdir dir="\${basedir}/target/classes"/>
<copy todir="\${basedir}/target/classes" flatten="on">
<fileset dir="\${basedir}/../.." >
- <include name="etc/log4j/log4j.properties"/>
- <include name="etc/db-ojb/*"/>
- <include name="etc/import/assembly/import-page-manager.xml"/>
- <include name="etc/import/assembly/repository-datasource-spring.xml"/>
- <include name="src/webapp/WEB-INF/assembly/transaction.xml"/>
- <include name="src/webapp/WEB-INF/assembly/alternate/interceptors.xml"/>
+ <include name="etc/serilaizer/log4j/log4j.properties"/>
+ <include name="etc/serializer/db-ojb/*"/>
+ <include name="etc/dbpsml/assembly/import-page-manager.xml"/>
+ <include name="etc/dbpsml/assembly/repository-datasource-spring.xml"/>
+ <include name="etc/serializer/assembly/transaction.xml"/>
+ <include name="etc/dbpsml/assembly/alternate/interceptors.xml"/>
</fileset>
</copy>
@@ -133,14 +133,14 @@
<target name="aggregate-pages-min" if="org.apache.jetspeed.deploy.min">
<copy todir="\${basedir}/target/data/pages">
- <fileset dir="\${basedir}/../../src/webapp/WEB-INF/pages">
+ <fileset dir="\${basedir}/../../portal/target/webapp/WEB-INF/pages">
<include name="Administrative/**"/>
<include name="my-account.psml"/>
<include name="page.security"/>
<include name="system/**"/>
</fileset>
</copy>
- <copy file="\${basedir}/../../src/webapp/WEB-INF/pages/minimal-default-page.psml"
+ <copy file="\${basedir}/../../portal/target/webapp/WEB-INF/pages/minimal-default-page.psml"
tofile="\${basedir}/target/data/pages/default-page.psml"/>
<replace file="\${basedir}/target/data/pages/default-page.psml"
token=" hidden="true""/>
@@ -148,7 +148,7 @@
<target name="aggregate-pages-full" if="org.apache.jetspeed.deploy.full">
<copy todir="\${basedir}/target/data/pages">
- <fileset dir="\${basedir}/../../src/webapp/WEB-INF/pages"/>
+ <fileset dir="\${basedir}/../../portal/target/webapp/WEB-INF/pages"/>
</copy>
</target>
@@ -263,4 +263,4 @@
</condition>
</target>
-</project>
\ No newline at end of file
+</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org