OPENJPA-1088 Build updates for openjpa-examples and openjpa-integration/examples

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@775150 13f79535-47bb-0310-9956-ffa450edef68

openjpa-examples/pom.xml

@@ -37,7 +37,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa-persistence-jdbc</artifactId>
+            <artifactId>openjpa-all</artifactId>
             <version>${pom.version}</version>
         </dependency>
         <dependency>
@@ -50,11 +50,6 @@
             <artifactId>commons-dbcp</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     <build>
         <plugins>

openjpa-examples/src/main/java/README.txt

@@ -0,0 +1,24 @@
+Apache OpenJPA Examples
+Copyright © 2005-2009, The Apache Software Foundation.
+Licensed under ASL 2.0 - http://www.apache.org/licenses/LICENSE-2.0
+--------------------------------------------------------------------------------
+
+Prerequisites:
+  The following must be on the user's path:
+         - Java SE 5 or 6
+         - Apache ANT v1.6.5 or later
+
+Building and Running Individual Examples:
+  1) Open a command prompt to the directory where this README is located
+  2) Change to the subdirectory of the example to build and run, like:
+         cd hellojpa
+  3) Run ANT
+         ant
+     For the hellojpa exmaple, at the end of the build you should see the text:
+         "Hello Persistence!"
+
+Building and Running All Examples:
+  1) Open a command prompt to the directory where this README is located
+  2) Run ANT with the "all" project
+         ant all
+

openjpa-examples/src/main/java/build.xml

@@ -32,21 +32,36 @@
 
     <target name="usagewarning">
         <fail>
-Please traverse to a sub-directory and run "ant" from there.
+Please traverse to a sub-directory, like hellojpa, and run "ant" from there.
         </fail>
     </target>
 
+    <target name="all">
+        <exec dir="${basedir}/hellojpa" executable="ant" />
+        <exec dir="${basedir}/relations" executable="ant" />
+        <exec dir="${basedir}/reversemapping" executable="ant" />
+    </target>
+
     <path id="classpath"
         description="The classpath to use for compiling and running">
         <pathelement path="${parent}"/>
+        <!-- we could include the individual jars as below, but lets use the
+             openjpa-all.jar with Derby instead
         <fileset dir="${root}">
             <include name="**/*.jar"/>
+            <exclude name="openjpa-all-*.jar"/>
+        </fileset>
+        -->
+        <fileset dir="${root}">
+            <include name="openjpa-all-*.jar"/>
+            <include name="lib/derby*.jar"/>
         </fileset>
     </path>
 
     <path id="javaagent">
         <fileset dir="${root}">
             <include name="openjpa-*.jar"/>
+            <exclude name="openjpa-all-*.jar"/>
         </fileset>
     </path>
     <pathconvert property="javaagent" refid="javaagent"/>

openjpa-integration/examples/pom.xml

@@ -58,13 +58,14 @@
                         <echo>Running OpenJPA Examples</echo>
 
                         <property name="examples.base" value="${basedir}/target/examples" />
+                        <delete dir="${examples.base}" quiet="true"/>
                         <mkdir dir="${examples.base}" />
 
-                        <unzip overwrite="false" dest="${examples.base}" src="../../target/site/downloads/apache-openjpa-${pom.version}-binary.zip" />
+                        <unzip overwrite="false" dest="${examples.base}" src="../../openjpa-project/target/site/downloads/apache-openjpa-${pom.version}-binary.zip" />
 
                         <path id="assembly.classpath"> 
                             <fileset dir="${examples.base}">
-                                <include name="**/*.jar" />
+                                <include name="**/openjpa-all-${pom.version}.jar" />
                             </fileset>
                         </path>
                         <available classname="org.apache.openjpa.conf.OpenJPAVersion" classpathref="assembly.classpath" property="unzip.success" />
@@ -92,7 +93,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa</artifactId>
+            <artifactId>openjpa-all</artifactId>
             <version>${pom.version}</version>
         </dependency>
     </dependencies>