Author: taylor
Date: Fri Jan 26 11:37:10 2007
New Revision: 500314
URL: http://svn.apache.org/viewvc?view=rev&rev=500314
Log:
fix for Maven-2 build + Derby database error
tested with Derby and non-Derby databases, both normal and custom builds
patch from Hajo Birthelmer
Modified:
portals/jetspeed-2/trunk/etc/build.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/build.xml
Modified: portals/jetspeed-2/trunk/etc/build.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/etc/build.xml?view=diff&rev=500314&r1=500313&r2=500314
==============================================================================
--- portals/jetspeed-2/trunk/etc/build.xml (original)
+++ portals/jetspeed-2/trunk/etc/build.xml Fri Jan 26 11:37:10 2007
@@ -19,9 +19,7 @@
<project name="etc" default="help">
<!-- Properties -->
- <property name="org.apache.jetspeed.database.is.derby" value="" />
- <property name="org.apache.jetspeed.database.is.derby.embedded" value=""
/>
-
+
<property name="org.apache.jetspeed.database.enable" value="true"/>
<property name="org.apache.jetspeed.database.skip" value="false"/>
<property name="org.apache.jetspeed.database.default.name" value=""/>
@@ -147,6 +145,7 @@
<condition property="org.apache.jetspeed.database.is.derby">
<equals arg1="${org.apache.jetspeed.database.default.name}"
arg2="derby"/>
</condition>
+ <echo message="test-database-default-name =
${org.apache.jetspeed.database.default.name}" />
</target>
<target name="test-database-filter-drops">
@@ -314,6 +313,7 @@
<target name="sql-execute" depends="sql-test-database-classpath,
sql-execute-drivers-path, sql-execute-derby, sql-execute-hsql"/>
<target name="sql-test-database-classpath">
+
<condition property="org.apache.jetspeed.database.use.drivers.path">
<and>
<not><equals
arg1="${org.apache.jetspeed.database.jdbc.drivers.path}" arg2=""/></not>
@@ -324,13 +324,15 @@
<condition property="org.apache.jetspeed.database.is.derby.embedded">
<and>
<equals arg1="${org.apache.jetspeed.database.default.name}"
arg2="derby"/>
- <equals
arg1="${org.apache.jetspeed.database.jdbc.drivers.path}" arg2=""/>
+ <equals arg1="${org.apache.jetspeed.database.driver}"
arg2="org.apache.derby.jdbc.EmbeddedDriver"/>
</and>
</condition>
<condition property="org.apache.jetspeed.database.is.hsql.embedded">
<and>
<equals arg1="${org.apache.jetspeed.database.default.name}"
arg2="hsql"/>
- <equals
arg1="${org.apache.jetspeed.database.jdbc.drivers.path}" arg2=""/>
+ <!--
+ <equals
arg1="${org.apache.jetspeed.database.jdbc.drivers.path}" arg2=""/>
+ -->
</and>
</condition>
</target>
@@ -461,10 +463,10 @@
</fileset>
</copy>
<!-- prepare spring assemblies (TODO: why not use a Spring classpath
loader?) -->
- <property name="temp.assembly.dir"
value="${basedir}/target/seed/assembly"/>
- <property name="jndi.assembly.dir" value="/target/seed/assembly"/>
+ <property name="temp.assembly.dir"
value="${basedir}/target/seed/assembly/"/>
+ <property name="assembly.dir" value="/target/seed/assembly/"/>
<mkdir dir="${temp.assembly.dir}"/>
- <echo message="Running Jetspeed Seed Importer with -b
${jndi.assembly.dir}/boot/ -c ${jndi.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">
<include name="security*.xml"/>
@@ -527,7 +529,7 @@
<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 boot parameters:
${jndi.assembly.dir}/ ${jndi.assembly.dir}/boot/ , 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 boot:${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}">
@@ -538,7 +540,7 @@
<pathelement
path="${org.apache.jetspeed.database.jdbc.drivers.path}"/>
<pathelement path="${basedir}/target/seed/classes"/>
</classpath>
- <arg line="-l DEBUG -I ${basedir}/target/seed/data/ -b
${jndi.assembly.dir}/boot/ -c ${jndi.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="-l DEBUG -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/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=500314&r1=500313&r2=500314
==============================================================================
---
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
Fri Jan 26 11:37:10 2007
@@ -322,13 +322,15 @@
<condition property="org.apache.jetspeed.database.is.derby.embedded">
<and>
<equals arg1="${org.apache.jetspeed.database.default.name}"
arg2="derby"/>
- <equals
arg1="${org.apache.jetspeed.database.jdbc.drivers.path}" arg2=""/>
+ <equals arg1="${org.apache.jetspeed.database.driver}"
arg2="org.apache.derby.jdbc.EmbeddedDriver"/>
</and>
</condition>
<condition property="org.apache.jetspeed.database.is.hsql.embedded">
<and>
<equals arg1="${org.apache.jetspeed.database.default.name}"
arg2="hsql"/>
- <equals
arg1="${org.apache.jetspeed.database.jdbc.drivers.path}" arg2=""/>
+ <!--
+ <equals
arg1="${org.apache.jetspeed.database.jdbc.drivers.path}" arg2=""/>
+ -->
</and>
</condition>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
