You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by dw...@apache.org on 2010/07/30 16:07:28 UTC
svn commit: r980798 - in /openjpa/trunk:
openjpa-examples/simple/src/main/java/build.xml
openjpa-integration/examples/pom.xml openjpa-project/assembly.xml
Author: dwoods
Date: Fri Jul 30 14:07:27 2010
New Revision: 980798
URL: http://svn.apache.org/viewvc?rev=980798&view=rev
Log:
OPENJPA-1751 Update assembly inclusion of simple examples and update simple build with new root path
Modified:
openjpa/trunk/openjpa-examples/simple/src/main/java/build.xml
openjpa/trunk/openjpa-integration/examples/pom.xml
openjpa/trunk/openjpa-project/assembly.xml
Modified: openjpa/trunk/openjpa-examples/simple/src/main/java/build.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/simple/src/main/java/build.xml?rev=980798&r1=980797&r2=980798&view=diff
==============================================================================
--- openjpa/trunk/openjpa-examples/simple/src/main/java/build.xml (original)
+++ openjpa/trunk/openjpa-examples/simple/src/main/java/build.xml Fri Jul 30 14:07:27 2010
@@ -20,7 +20,7 @@
<project default="usagewarning">
<property name="parent" value="${basedir}/.."/>
- <property name="root" value="${parent}/.."/>
+ <property name="root" value="${parent}/../.."/>
<!-- database connection properties -->
<property name="dbdriver" value="org.apache.derby.jdbc.EmbeddedDriver"/>
Modified: openjpa/trunk/openjpa-integration/examples/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/examples/pom.xml?rev=980798&r1=980797&r2=980798&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/examples/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/examples/pom.xml Fri Jul 30 14:07:27 2010
@@ -65,7 +65,7 @@
<delete dir="${examples.base}" quiet="true" />
<mkdir dir="${examples.base}" />
- <unzip overwrite="false" dest="${examples.base}" src="../../openjpa-project/target/site/downloads/apache-openjpa-${pom.version}-binary.zip" />
+ <unzip overwrite="false" dest="${examples.base}" src="${settings.localRepository}/org/apache/openjpa/apache-openjpa/${project.version}/apache-openjpa-${project.version}-binary.zip" />
<path id="assembly.classpath">
<fileset dir="${examples.base}">
@@ -77,8 +77,9 @@
Could not extract assembly.
</fail>
+ <!-- FIXME: Only tests simple examples for now -->
<subant inheritAll="false" failonerror="true">
- <fileset dir="${examples.base}" includes="*/examples/*/build.xml" />
+ <fileset dir="${examples.base}" includes="*/examples/simple/*/build.xml" />
</subant>
</tasks>
Modified: openjpa/trunk/openjpa-project/assembly.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/assembly.xml?rev=980798&r1=980797&r2=980798&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/assembly.xml (original)
+++ openjpa/trunk/openjpa-project/assembly.xml Fri Jul 30 14:07:27 2010
@@ -69,8 +69,28 @@
<outputDirectory>docs/javadoc</outputDirectory>
</fileSet>
<fileSet>
- <directory>../openjpa-examples</directory>
- <outputDirectory>examples</outputDirectory>
+ <directory>../openjpa-examples/image-gallery</directory>
+ <outputDirectory>examples/image-gallery</outputDirectory>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ <exclude>**/*.log</exclude>
+ <exclude>**/.*</exclude>
+ <exclude>**/.*/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../openjpa-examples/openbooks</directory>
+ <outputDirectory>examples/openbooks</outputDirectory>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ <exclude>**/*.log</exclude>
+ <exclude>**/.*</exclude>
+ <exclude>**/.*/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../openjpa-examples/simple/src/main/java</directory>
+ <outputDirectory>examples/simple</outputDirectory>
<excludes>
<exclude>**/target/**</exclude>
<exclude>**/*.log</exclude>