Author: mikedd
Date: Tue Apr 10 14:30:41 2007
New Revision: 527308

URL: http://svn.apache.org/viewvc?view=rev&rev=527308
Log:
merging rev 526512 to the branch to resolve build issues

Modified:
    
incubator/openjpa/branches/0.9.7-incubating/openjpa-integration/examples/pom.xml

Modified: 
incubator/openjpa/branches/0.9.7-incubating/openjpa-integration/examples/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/openjpa/branches/0.9.7-incubating/openjpa-integration/examples/pom.xml?view=diff&rev=527308&r1=527307&r2=527308
==============================================================================
--- 
incubator/openjpa/branches/0.9.7-incubating/openjpa-integration/examples/pom.xml
 (original)
+++ 
incubator/openjpa/branches/0.9.7-incubating/openjpa-integration/examples/pom.xml
 Tue Apr 10 14:30:41 2007
@@ -18,6 +18,9 @@
 <!--
     This integration build tests the examples that are bundled with
     the OpenJPA distribution.
+
+    The examples will only be run if you have the 'examples-profile' enabled:
+    mvn integration-test -Pexamples-profile
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0";
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
@@ -33,40 +36,45 @@
         <version>0.9.7-incubating-SNAPSHOT</version>
     </parent>
 
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>run-examples</id>
-                        <phase>integration-test</phase>
-                        <configuration>
-                        <tasks>
-                        <echo>Running OpenJPA Examples</echo>
-
-                        <property name="binary.zip" 
value="../../openjpa-project/target/assembly/openjpa-${version}-binary.zip"/>
-
-                        <property name="examples.base"
-                            value="${basedir}/target/examples"/>
-                        <unzip overwrite="false"
-                            src="${binary.zip}" dest="${examples.base}"/>
-
-                        <subant inheritAll="false">
-                            <fileset dir="${examples.base}"
-                                includes="*/examples/*/build.xml"/>
-                        </subant>
-
-                        </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+    <profiles>
+        <profile>
+            <id>examples-profile</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>run-examples</id>
+                                <phase>integration-test</phase>
+                                <configuration>
+                                <tasks>
+                                <echo>Running OpenJPA Examples</echo>
+
+                                <property name="binary.zip" 
value="../../openjpa-project/target/assembly/openjpa-${version}-binary.zip"/>
+
+                                <property name="examples.base"
+                                    value="${basedir}/target/examples"/>
+                                <unzip overwrite="false"
+                                    src="${binary.zip}" 
dest="${examples.base}"/>
+
+                                <subant inheritAll="false">
+                                    <fileset dir="${examples.base}"
+                                        includes="*/examples/*/build.xml"/>
+                                </subant>
+
+                                </tasks>
+                                </configuration>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
     <dependencies>
         <dependency>
             <groupId>org.apache.openjpa</groupId>


Reply via email to