Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OPENJPA-1751 Update assembly inclusion of simple examples and update simple build with new root path 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@980798 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Donald Woods 2010-07-30 14:07:27 +00:00
parent 2798644558
commit 899b56b418
3 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openjpa-examples/simple/src/main/java/build.xml
View File

@ -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"/>

5
openjpa-integration/examples/pom.xml
View File

@ -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>

24
openjpa-project/assembly.xml
View File

@ -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>