openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mik...@apache.org
Subject svn commit: r527342 - in /incubator/openjpa/branches/0.9.7-incubating: openjpa-all/ openjpa-examples/ openjpa-integration/ openjpa-integration/examples/ openjpa-integration/tck/ openjpa-jdbc-5/ openjpa-jdbc/ openjpa-kernel-5/ openjpa-kernel/ openjpa-li...
Date Wed, 11 Apr 2007 00:07:23 GMT
Author: mikedd
Date: Tue Apr 10 17:07:22 2007
New Revision: 527342

URL: http://svn.apache.org/viewvc?view=rev&rev=527342
Log:
undo formatting changes and restore copyrights to pom files

Modified:
    incubator/openjpa/branches/0.9.7-incubating/openjpa-all/pom.xml
    incubator/openjpa/branches/0.9.7-incubating/openjpa-examples/pom.xml
    incubator/openjpa/branches/0.9.7-incubating/openjpa-integration/examples/pom.xml
    incubator/openjpa/branches/0.9.7-incubating/openjpa-integration/pom.xml
    incubator/openjpa/branches/0.9.7-incubating/openjpa-integration/tck/pom.xml
    incubator/openjpa/branches/0.9.7-incubating/openjpa-jdbc-5/pom.xml
    incubator/openjpa/branches/0.9.7-incubating/openjpa-jdbc/pom.xml
    incubator/openjpa/branches/0.9.7-incubating/openjpa-kernel-5/pom.xml
    incubator/openjpa/branches/0.9.7-incubating/openjpa-kernel/pom.xml
    incubator/openjpa/branches/0.9.7-incubating/openjpa-lib/pom.xml
    incubator/openjpa/branches/0.9.7-incubating/openjpa-persistence-jdbc/pom.xml
    incubator/openjpa/branches/0.9.7-incubating/openjpa-persistence/pom.xml
    incubator/openjpa/branches/0.9.7-incubating/openjpa-project/pom.xml
    incubator/openjpa/branches/0.9.7-incubating/openjpa-xmlstore/pom.xml

Modified: incubator/openjpa/branches/0.9.7-incubating/openjpa-all/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/branches/0.9.7-incubating/openjpa-all/pom.xml?view=diff&rev=527342&r1=527341&r2=527342
==============================================================================
--- incubator/openjpa/branches/0.9.7-incubating/openjpa-all/pom.xml (original)
+++ incubator/openjpa/branches/0.9.7-incubating/openjpa-all/pom.xml Tue Apr 10 17:07:22 2007
@@ -1,4 +1,23 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation.
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+        http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>openjpa-all</artifactId>
     <packaging>jar</packaging>
@@ -6,7 +25,7 @@
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa</artifactId>
-        <version>0.9.8-incubating-SNAPSHOT</version>
+        <version>0.9.7-incubating-SNAPSHOT</version>
     </parent>
     <build>
         <plugins>
@@ -25,10 +44,11 @@
                         <phase>process-classes</phase>
                         <configuration>
                             <tasks>
-                                <unjar overwrite="false" dest="${basedir}/target/classes">
+                                <unjar overwrite="false"
+                                    dest="${basedir}/target/classes">
                                     <fileset dir="${basedir}/..">
-                                        <include name="*/target/openjpa-*.jar" />
-                                        <exclude name="*/target/openjpa-examples-*.jar" />
+                                        <include name="*/target/openjpa-*.jar"/>
+                                        <exclude name="*/target/openjpa-examples-*.jar"/>
                                     </fileset>
                                 </unjar>
 
@@ -37,18 +57,18 @@
                                     resources so they are aggregated
                                 -->
                                 <macrodef name="aggregate-file">
-                                   <attribute name="servicename" />
+                                   <attribute name="servicename"/>
                                     <sequential>
                                         <echo>Building service: @{servicename}</echo>
                                         <concat destfile="${basedir}/target/classes/META-INF/services/@{servicename}">
-                                            <fileset dir="${basedir}/.." includes="*/src/main/resources/META-INF/services/@{servicename}" />
+                                            <fileset dir="${basedir}/.." includes="*/src/main/resources/META-INF/services/@{servicename}"/>
                                         </concat>
                                     </sequential>
                                 </macrodef>
 
-                                <aggregate-file servicename="org.apache.openjpa.lib.conf.ProductDerivation" />
-                                <aggregate-file servicename="javax.persistence.spi.PersistenceProvider" />
-                                <aggregate-file servicename="org.apache.openjpa.kernel.exps.ExpressionParser" />
+                                <aggregate-file servicename="org.apache.openjpa.lib.conf.ProductDerivation"/>
+                                <aggregate-file servicename="javax.persistence.spi.PersistenceProvider"/>
+                                <aggregate-file servicename="org.apache.openjpa.kernel.exps.ExpressionParser"/>
                             </tasks>
                         </configuration>
                         <goals>
@@ -118,4 +138,4 @@
             <version>${pom.version}</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: incubator/openjpa/branches/0.9.7-incubating/openjpa-examples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/branches/0.9.7-incubating/openjpa-examples/pom.xml?view=diff&rev=527342&r1=527341&r2=527342
==============================================================================
--- incubator/openjpa/branches/0.9.7-incubating/openjpa-examples/pom.xml (original)
+++ incubator/openjpa/branches/0.9.7-incubating/openjpa-examples/pom.xml Tue Apr 10 17:07:22 2007
@@ -1,4 +1,22 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation.
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.openjpa</groupId>
     <artifactId>openjpa-examples</artifactId>
@@ -9,7 +27,7 @@
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa</artifactId>
-        <version>0.9.8-incubating-SNAPSHOT</version>
+        <version>0.9.7-incubating-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>
@@ -56,19 +74,21 @@
                         <configuration>
                             <tasks>
                                 <path id="cp">
-                                    <path refid="maven.test.classpath" />
-                                    <path refid="maven.compile.classpath" />
-                                    <path refid="maven.dependency.classpath" />
+                                    <path refid="maven.test.classpath"/>
+                                    <path refid="maven.compile.classpath"/>
+                                    <path refid="maven.dependency.classpath"/>
                                 </path>
-								<taskdef name="openjpac" classname= "org.apache.openjpa.ant.PCEnhancerTask">
-									<classpath refid="cp" />
+								<taskdef name="openjpac" classname=
+                                    "org.apache.openjpa.ant.PCEnhancerTask">
+									<classpath refid="cp"/>
 								</taskdef>
-                                <fileset id="enhance.path.ref" dir="${project.build.testOutputDirectory}">
-                                    <include name="**/*.class" />
+                                <fileset id="enhance.path.ref"
+                                    dir="${project.build.testOutputDirectory}">
+                                    <include name="**/*.class"/>
                                 </fileset>
 								<openjpac>
-									<classpath refid="cp" />
-									<fileset refid="enhance.path.ref" />
+									<classpath refid="cp"/>
+									<fileset refid="enhance.path.ref"/>
 								</openjpac>
                             </tasks>
                         </configuration>
@@ -81,4 +101,4 @@
             -->
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>

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=527342&r1=527341&r2=527342
==============================================================================
--- 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 17:07:22 2007
@@ -1,4 +1,31 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation.
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--
+    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"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+        http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>examples</artifactId>
     <packaging>pom</packaging>
@@ -6,7 +33,7 @@
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-integration</artifactId>
-        <version>0.9.8-incubating-SNAPSHOT</version>
+        <version>0.9.7-incubating-SNAPSHOT</version>
     </parent>
 
     <profiles>
@@ -24,13 +51,16 @@
                                 <tasks>
                                 <echo>Running OpenJPA Examples</echo>
 
-                                <property name="binary.zip" value="../../openjpa-project/target/assembly/openjpa-${version}-binary.zip" />
+                                <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}" />
+                                <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" />
+                                    <fileset dir="${examples.base}"
+                                        includes="*/examples/*/build.xml"/>
                                 </subant>
 
                                 </tasks>
@@ -52,4 +82,5 @@
             <version>${pom.version}</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
+

Modified: incubator/openjpa/branches/0.9.7-incubating/openjpa-integration/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/branches/0.9.7-incubating/openjpa-integration/pom.xml?view=diff&rev=527342&r1=527341&r2=527342
==============================================================================
--- incubator/openjpa/branches/0.9.7-incubating/openjpa-integration/pom.xml (original)
+++ incubator/openjpa/branches/0.9.7-incubating/openjpa-integration/pom.xml Tue Apr 10 17:07:22 2007
@@ -1,4 +1,23 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation.
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+        http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>openjpa-integration</artifactId>
     <packaging>pom</packaging>
@@ -6,10 +25,10 @@
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa</artifactId>
-        <version>0.9.8-incubating-SNAPSHOT</version>
+        <version>0.9.7-incubating-SNAPSHOT</version>
     </parent>
     <modules>
         <module>examples</module>
         <module>tck</module>
     </modules>
-</project>
\ No newline at end of file
+</project>

Modified: incubator/openjpa/branches/0.9.7-incubating/openjpa-integration/tck/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/branches/0.9.7-incubating/openjpa-integration/tck/pom.xml?view=diff&rev=527342&r1=527341&r2=527342
==============================================================================
--- incubator/openjpa/branches/0.9.7-incubating/openjpa-integration/tck/pom.xml (original)
+++ incubator/openjpa/branches/0.9.7-incubating/openjpa-integration/tck/pom.xml Tue Apr 10 17:07:22 2007
@@ -1,4 +1,50 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation.
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--
+    This build file is used to run the JPA TCK. It assumes that you have
+    the TCK zip file located at:
+
+        ${user.home}/.m2/privaterepos/jpa-1_0b-tck.zip
+
+    If you have that file in a different location, it can be specified with
+    the "tck.zip" system property.
+
+    The TCK will only be run if you have the "tck-profile" enabled.
+
+    To run a specific package of tests, use the "jpatck.pkg.dir" system
+    property to specify the parent directory of the tests you want to run.
+    E.g.:
+
+        mvn integration-test -Ptck-profile -Djpatck.pkg.dir=com/sun/ts/tests/ejb30/persistence/inheritance/mappedsc/descriptors
+
+    The TCK running process will do the following:
+
+    1. Fine the TCK zip file and extract it
+    2. Create an openjpa-provier.properties file with the OpenJPA config
+    3. Modify the TCK's main configuration file (ts.jte) to use OpenJPA
+    4. Run the database initialization script
+    5. Run the TCK script
+    6. Parse the TCK result log to determine whether to fail the build or not
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+        http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>tck</artifactId>
     <packaging>pom</packaging>
@@ -6,7 +52,7 @@
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-integration</artifactId>
-        <version>0.9.8-incubating-SNAPSHOT</version>
+        <version>0.9.7-incubating-SNAPSHOT</version>
     </parent>
 
     <profiles>
@@ -24,42 +70,50 @@
                         <tasks>
                         <echo>Running Sun JPA TCK</echo>
 
-                        <property name="tck.zip" value="${settings.localRepository}/../privaterepos/jpa-1_0b-tck.zip" />
-                         <available property="tck.available" file="${tck.zip}" />
+                        <property name="tck.zip" value=
+                            "${settings.localRepository}/../privaterepos/jpa-1_0b-tck.zip"/>
+                         <available property="tck.available" file="${tck.zip}"/>
                         <fail unless="tck.available">The TCK file ${tck.zip} does not exist. This file must be downloaded separately in order to be able to run the JPA TCK</fail>
 
 
-                        <available property="tck.available" file="${tck.zip}" />
+                        <available property="tck.available" file="${tck.zip}"/>
                         <fail unless="tck.available">The TCK file specific in the "tck.zip" system property (${tck.zip}) does not exist. This file must be downloaded separately in order to be able to run the JPA TCK</fail>
 
-                        <property name="tck.base" value="${basedir}/target/tck" />
-                        <property name="tck.dir" value="${tck.base}/jpatck" />
+                        <property name="tck.base"
+                            value="${basedir}/target/tck"/>
+                        <property name="tck.dir" value="${tck.base}/jpatck"/>
 
-                        <unzip overwrite="false" src="${tck.zip}" dest="${tck.base}" />
+                        <unzip overwrite="false"
+                            src="${tck.zip}" dest="${tck.base}"/>
 
                         <path id="cp">
-                            <path refid="maven.compile.classpath" />
+                            <path refid="maven.compile.classpath"/>
 
                             <!-- use official JPA API instead of GM's -->
                             <fileset dir="${tck.dir}/lib">
-                                <include name="**/*.jar" />
-                                <exclude name="**/geronimo-jpa*" />
+                                <include name="**/*.jar"/>
+                                <exclude name="**/geronimo-jpa*"/>
                             </fileset>
-                            <pathelement path="${java.class.path}" />
+                            <pathelement path="${java.class.path}"/>
                         </path>
-                        <pathconvert property="cp.property" refid="cp" />
+                        <pathconvert property="cp.property" refid="cp"/>
 
-                        <property name="db.driver" value="org.apache.derby.jdbc.EmbeddedDriver" />
-                        <property name="db.url" value="jdbc:derby:derby-database;create=true" />
-                        <property name="db.username" value="nousername" />
-                        <property name="db.password" value="nopassword" />
+                        <property name="db.driver"
+                            value="org.apache.derby.jdbc.EmbeddedDriver"/>
+                        <property name="db.url"
+                            value="jdbc:derby:derby-database;create=true"/>
+                        <property name="db.username" value="nousername"/>
+                        <property name="db.password" value="nopassword"/>
+
+                        <property name="jpatck.pkg.dir" value="com"/>
+
+                        <property name="jpatck.work.dir"
+                            value="${tck.dir}/../work"/>
+                        <property name="tck.log"
+                            value="${tck.base}/openjpa-tck.log"/>
 
-                        <property name="jpatck.pkg.dir" value="com" />
-
-                        <property name="jpatck.work.dir" value="${tck.dir}/../work" />
-                        <property name="tck.log" value="${tck.base}/openjpa-tck.log" />
-
-                        <property name="openjpa.properties" value="${tck.dir}/openjpa-provier.properties" />
+                        <property name="openjpa.properties"
+                            value="${tck.dir}/openjpa-provier.properties"/>
 
                         <!-- create the OpenJPA properties for the TCK run -->
                         <echo append="false" file="${openjpa.properties}">
@@ -77,7 +131,8 @@
                         </echo>
 
                         <!-- Append OpenJPA-specific configuration -->
-                        <property name="jpatck.config" value="${tck.dir}/bin/ts.jte" />
+                        <property name="jpatck.config"
+                            value="${tck.dir}/bin/ts.jte"/>
 
                         <echo append="true" file="${jpatck.config}">
 
@@ -103,10 +158,10 @@
 
                         <path id="agent.path">
                             <fileset dir="../../openjpa-all/target">
-                                <include name="**/*.jar" />
+                                <include name="**/*.jar"/>
                             </fileset>
                         </path>
-                        <pathconvert property="agent" refid="agent.path" />
+                        <pathconvert property="agent" refid="agent.path"/>
                         <echo>AGENT: ${agent}</echo>
 
                         <!--
@@ -117,36 +172,45 @@
                             persistent classes to work (like the SignatureTest)
                         -->
                         <replace file="${jpatck.config}">
-                            <replacefilter token="-javaagent:${jpa.home}/lib/toplink-essentials-agent.jar" value="-javaagent:${agent} -Dopenjpa.MetaDataFactory=jpa(DefaultAccessType=PROPERTY)" />
+                            <replacefilter token="-javaagent:${jpa.home}/lib/toplink-essentials-agent.jar" value="-javaagent:${agent} -Dopenjpa.MetaDataFactory=jpa(DefaultAccessType=PROPERTY)"/>
                         </replace>
 
                         <!-- make a macro for the TCK harness launcher -->
                         <macrodef name="tsant">
-                            <attribute name="buildfile" />
-                            <attribute name="target" />
+                            <attribute name="buildfile"/>
+                            <attribute name="target"/>
                             <sequential>
-                                <java classname="org.apache.tools.ant.launch.Launcher" fork="true" failonerror="true" dir="${tck.dir}/src" append="true" output="${tck.log}" timeout="7200000">
-                                    <arg value="-emacs" />
-                                    <arg value="-buildfile" />
-                                    <arg value="@{buildfile}" />
-                                    <arg value="-listener" />
-                                    <arg value="com.sun.ant.TSBuildListener" />
-                                    <arg value="-logger" />
-                                    <arg value="com.sun.ant.TSLogger" />
-                                    <arg value="@{target}" />
-
-                                    <env key="TS_HOME" value=".." />
-                                    <sysproperty key="ts.home" value=".." />
+                                <java classname=
+                                    "org.apache.tools.ant.launch.Launcher"
+                                    fork="true" failonerror="true"
+                                    dir="${tck.dir}/src"
+                                    append="true"
+                                    output="${tck.log}"
+                                    timeout="7200000">
+                                    <arg value="-emacs"/>
+                                    <arg value="-buildfile"/>
+                                    <arg value="@{buildfile}"/>
+                                    <arg value="-listener"/>
+                                    <arg value="com.sun.ant.TSBuildListener"/>
+                                    <arg value="-logger"/>
+                                    <arg value="com.sun.ant.TSLogger"/>
+                                    <arg value="@{target}"/>
+
+                                    <env key="TS_HOME" value=".."/>
+                                    <sysproperty key="ts.home" value=".."/>
+
+                                    <env key="ANT_HOME"
+                                        value="${tck.dir}/tools/ant"/>
+                                    <sysproperty key="ant.home"
+                                        value="${tck.dir}/tools/ant"/>
 
-                                    <env key="ANT_HOME" value="${tck.dir}/tools/ant" />
-                                    <sysproperty key="ant.home" value="${tck.dir}/tools/ant" />
-
-                                    <sysproperty key="pkg.dir" value="${jpatck.pkg.dir}" />
+                                    <sysproperty key="pkg.dir"
+                                        value="${jpatck.pkg.dir}"/>
 
                                     <classpath>
-                                        <path refid="cp" />
+                                        <path refid="cp"/>
                                         <fileset dir="${tck.dir}/tools/ant/lib">
-                                            <include name="**/*.jar" />
+                                            <include name="**/*.jar"/>
                                         </fileset>
                                     </classpath>
                                 </java>
@@ -156,26 +220,32 @@
                         <echo>Logging JPA TCK output to ${tck.log}</echo>
 
                         <!-- first initialize the database -->
-                        <tsant buildfile="${tck.dir}/bin/initdb.xml" target="init.database" />
+                        <tsant buildfile="${tck.dir}/bin/initdb.xml"
+                            target="init.database"/>
 
                         <!-- now run the TCK -->
-                        <tsant buildfile="${tck.dir}/bin/build.xml" target="runclient" />
+                        <tsant buildfile="${tck.dir}/bin/build.xml"
+                            target="runclient"/>
 
                         <!--
                             The TCK's Java process doesn't actually fail when
                             tests fail, so we need to parse the results file
                             for a string indicating whether or not it passed.
                         -->
-                        <loadfile property="jpatck.results" srcfile="${jpatck.work.dir}/jtData/log.txt" />
+                        <loadfile property="jpatck.results"
+                            srcfile="${jpatck.work.dir}/jtData/log.txt"/>
                         <condition property="jpatck.failed">
-                            <contains string="${jpatck.results}" substring="Completed test run: not ok" />
+                            <contains string="${jpatck.results}"
+                                substring="Completed test run: not ok"/>
                         </condition>
                         <fail if="jpatck.failed">Some tests failed</fail>
 
                         <echo>JPA TCK Passed 100%!</echo>
 
-                        <property name="tck.results.archive" value="${tck.base}/openjpa-tck-results.zip" />
-                        <zip destfile="${tck.results.archive}" basedir="${jpatck.work.dir}" />
+                        <property name="tck.results.archive"
+                            value="${tck.base}/openjpa-tck-results.zip"/>
+                        <zip destfile="${tck.results.archive}"
+                            basedir="${jpatck.work.dir}"/>
                         <echo>Results archive at: ${tck.results.archive}</echo>
 
                         </tasks>
@@ -219,4 +289,5 @@
             <scope>compile</scope>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
+

Modified: incubator/openjpa/branches/0.9.7-incubating/openjpa-jdbc-5/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/branches/0.9.7-incubating/openjpa-jdbc-5/pom.xml?view=diff&rev=527342&r1=527341&r2=527342
==============================================================================
--- incubator/openjpa/branches/0.9.7-incubating/openjpa-jdbc-5/pom.xml (original)
+++ incubator/openjpa/branches/0.9.7-incubating/openjpa-jdbc-5/pom.xml Tue Apr 10 17:07:22 2007
@@ -1,4 +1,22 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation.
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.openjpa</groupId>
     <artifactId>openjpa-jdbc-5</artifactId>
@@ -9,7 +27,7 @@
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa</artifactId>
-        <version>0.9.8-incubating-SNAPSHOT</version>
+        <version>0.9.7-incubating-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>
@@ -31,4 +49,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>

Modified: incubator/openjpa/branches/0.9.7-incubating/openjpa-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/branches/0.9.7-incubating/openjpa-jdbc/pom.xml?view=diff&rev=527342&r1=527341&r2=527342
==============================================================================
--- incubator/openjpa/branches/0.9.7-incubating/openjpa-jdbc/pom.xml (original)
+++ incubator/openjpa/branches/0.9.7-incubating/openjpa-jdbc/pom.xml Tue Apr 10 17:07:22 2007
@@ -1,4 +1,22 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation.
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.openjpa</groupId>
     <artifactId>openjpa-jdbc</artifactId>
@@ -9,7 +27,7 @@
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa</artifactId>
-        <version>0.9.8-incubating-SNAPSHOT</version>
+        <version>0.9.7-incubating-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>
@@ -37,4 +55,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>

Modified: incubator/openjpa/branches/0.9.7-incubating/openjpa-kernel-5/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/branches/0.9.7-incubating/openjpa-kernel-5/pom.xml?view=diff&rev=527342&r1=527341&r2=527342
==============================================================================
--- incubator/openjpa/branches/0.9.7-incubating/openjpa-kernel-5/pom.xml (original)
+++ incubator/openjpa/branches/0.9.7-incubating/openjpa-kernel-5/pom.xml Tue Apr 10 17:07:22 2007
@@ -1,4 +1,22 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation.
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.openjpa</groupId>
     <artifactId>openjpa-kernel-5</artifactId>
@@ -9,7 +27,7 @@
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa</artifactId>
-        <version>0.9.8-incubating-SNAPSHOT</version>
+        <version>0.9.7-incubating-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>
@@ -44,4 +62,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>

Modified: incubator/openjpa/branches/0.9.7-incubating/openjpa-kernel/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/branches/0.9.7-incubating/openjpa-kernel/pom.xml?view=diff&rev=527342&r1=527341&r2=527342
==============================================================================
--- incubator/openjpa/branches/0.9.7-incubating/openjpa-kernel/pom.xml (original)
+++ incubator/openjpa/branches/0.9.7-incubating/openjpa-kernel/pom.xml Tue Apr 10 17:07:22 2007
@@ -1,4 +1,22 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation.
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.openjpa</groupId>
     <artifactId>openjpa-kernel</artifactId>
@@ -9,7 +27,7 @@
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa</artifactId>
-        <version>0.9.8-incubating-SNAPSHOT</version>
+        <version>0.9.7-incubating-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>
@@ -93,7 +111,8 @@
                         <phase>process-sources</phase>
                         <configuration>
                             <tasks>
-                                <delete file="${project.build.directory}/generated-sources/javacc/org/apache/openjpa/kernel/jpql/ParseException.java" />
+                                <delete
+                                    file="${project.build.directory}/generated-sources/javacc/org/apache/openjpa/kernel/jpql/ParseException.java"/>
                             </tasks>
                         </configuration>
                         <goals>
@@ -105,7 +124,8 @@
 						<phase>process-classes</phase>
 						<configuration>
 							<tasks>
-								<java classname="org.apache.openjpa.ee.WASManagedRuntime" classpathref="maven.runtime.classpath" />
+								<java
+									classname="org.apache.openjpa.ee.WASManagedRuntime" classpathref="maven.runtime.classpath" />
 							</tasks>
 						</configuration>
 						<goals>
@@ -117,8 +137,9 @@
 						<phase>process-classes</phase>
 						<configuration>
 							<tasks>
-								<java classname="org.apache.openjpa.util.ProxyManagerImpl" classpathref="maven.runtime.classpath">
-                                    <arg line="-utils 5" />
+								<java
+									classname="org.apache.openjpa.util.ProxyManagerImpl" classpathref="maven.runtime.classpath">
+                                    <arg line="-utils 5"/>
                                 </java>
 							</tasks>
 						</configuration>
@@ -130,4 +151,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>

Modified: incubator/openjpa/branches/0.9.7-incubating/openjpa-lib/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/branches/0.9.7-incubating/openjpa-lib/pom.xml?view=diff&rev=527342&r1=527341&r2=527342
==============================================================================
--- incubator/openjpa/branches/0.9.7-incubating/openjpa-lib/pom.xml (original)
+++ incubator/openjpa/branches/0.9.7-incubating/openjpa-lib/pom.xml Tue Apr 10 17:07:22 2007
@@ -1,4 +1,22 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation.
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.openjpa</groupId>
     <artifactId>openjpa-lib</artifactId>
@@ -9,7 +27,7 @@
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa</artifactId>
-        <version>0.9.8-incubating-SNAPSHOT</version>
+        <version>0.9.7-incubating-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>
@@ -83,7 +101,8 @@
                         <phase>process-classes</phase>
                         <configuration>
                             <tasks>
-                                <delete failonerror="true" dir="${project.build.outputDirectory}/sun/" />
+                                <delete failonerror="true"
+                                dir="${project.build.outputDirectory}/sun/"/>
                             </tasks>
                         </configuration>
                         <goals>
@@ -95,23 +114,31 @@
                         <phase>compile</phase>
                         <configuration>
                             <tasks>
-                                <property name="tmpdir" value="${java.io.tmpdir}/openjpamvntmp" />
-                                <condition property="outdir" value="${project.build.outputDirectory}">
-                                    <available type="dir" file="${project.build.outputDirectory}" />
+                                <property name="tmpdir"
+                                    value="${java.io.tmpdir}/openjpamvntmp"/>
+                                <condition property="outdir"
+                                    value="${project.build.outputDirectory}">
+                                    <available type="dir"
+                                    file="${project.build.outputDirectory}"/>
                                 </condition>
 
-                                <property name="outdir" value="${tmpdir}" />
+                                <property name="outdir" value="${tmpdir}"/>
 
-                                <property name="svnversion.executable" value="svnversion" />
-                                <exec outputproperty="subversion.revision" failonerror="false" failifexecutionfails="false" executable="${svnversion.executable}">
-                                    <arg line="-c ${basedir}/.." />
+                                <property name="svnversion.executable"
+                                    value="svnversion"/>
+                                <exec outputproperty="subversion.revision"
+                                    failonerror="false"
+                                    failifexecutionfails="false"
+                                    executable="${svnversion.executable}">
+                                    <arg line="-c ${basedir}/.."/>
                                 </exec>
-                                <property name="subversion.revision" value="unknown" />
+                                <property name="subversion.revision"
+                                    value="unknown"/>
                                 <echo>Revision: ${subversion.revision}</echo>
                                     
-                                <mkdir dir="${outdir}/META-INF" />
+                                <mkdir dir="${outdir}/META-INF"/>
                                 <echo file="${outdir}/META-INF/org.apache.openjpa.revision.properties">revision.number=${subversion.revision}</echo>
-                                <delete dir="${tmpdir}" />
+                                <delete dir="${tmpdir}"/>
                             </tasks>
                         </configuration>
                         <goals>
@@ -122,4 +149,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>

Modified: incubator/openjpa/branches/0.9.7-incubating/openjpa-persistence-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/branches/0.9.7-incubating/openjpa-persistence-jdbc/pom.xml?view=diff&rev=527342&r1=527341&r2=527342
==============================================================================
--- incubator/openjpa/branches/0.9.7-incubating/openjpa-persistence-jdbc/pom.xml (original)
+++ incubator/openjpa/branches/0.9.7-incubating/openjpa-persistence-jdbc/pom.xml Tue Apr 10 17:07:22 2007
@@ -1,4 +1,22 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation.
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.openjpa</groupId>
     <artifactId>openjpa-persistence-jdbc</artifactId>
@@ -9,7 +27,7 @@
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa</artifactId>
-        <version>0.9.8-incubating-SNAPSHOT</version>
+        <version>0.9.7-incubating-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -364,19 +382,21 @@
                         <configuration>
                             <tasks>
                                 <path id="cp">
-                                    <path refid="maven.test.classpath" />
-                                    <path refid="maven.compile.classpath" />
-                                    <path refid="maven.dependency.classpath" />
+                                    <path refid="maven.test.classpath"/>
+                                    <path refid="maven.compile.classpath"/>
+                                    <path refid="maven.dependency.classpath"/>
                                 </path>
-								<taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask">
-									<classpath refid="cp" />
+								<taskdef name="openjpac" classname=
+                                    "org.apache.openjpa.ant.PCEnhancerTask">
+									<classpath refid="cp"/>
 								</taskdef>
-                                <fileset id="enhance.path.ref" dir="${project.build.testOutputDirectory}">
-                                    <include name="**/*.class" />
+                                <fileset id="enhance.path.ref"
+                                    dir="${project.build.testOutputDirectory}">
+                                    <include name="**/*.class"/>
                                 </fileset>
 								<openjpac>
-									<classpath refid="cp" />
-									<fileset refid="enhance.path.ref" />
+									<classpath refid="cp"/>
+									<fileset refid="enhance.path.ref"/>
 								</openjpac>
                             </tasks>
                         </configuration>
@@ -388,4 +408,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>

Modified: incubator/openjpa/branches/0.9.7-incubating/openjpa-persistence/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/branches/0.9.7-incubating/openjpa-persistence/pom.xml?view=diff&rev=527342&r1=527341&r2=527342
==============================================================================
--- incubator/openjpa/branches/0.9.7-incubating/openjpa-persistence/pom.xml (original)
+++ incubator/openjpa/branches/0.9.7-incubating/openjpa-persistence/pom.xml Tue Apr 10 17:07:22 2007
@@ -1,4 +1,22 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation.
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.openjpa</groupId>
     <artifactId>openjpa-persistence</artifactId>
@@ -9,7 +27,7 @@
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa</artifactId>
-        <version>0.9.8-incubating-SNAPSHOT</version>
+        <version>0.9.7-incubating-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>
@@ -37,4 +55,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>

Modified: incubator/openjpa/branches/0.9.7-incubating/openjpa-project/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/branches/0.9.7-incubating/openjpa-project/pom.xml?view=diff&rev=527342&r1=527341&r2=527342
==============================================================================
--- incubator/openjpa/branches/0.9.7-incubating/openjpa-project/pom.xml (original)
+++ incubator/openjpa/branches/0.9.7-incubating/openjpa-project/pom.xml Tue Apr 10 17:07:22 2007
@@ -1,4 +1,23 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation.
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+        http://maven.apache.org/maven-v4_0_0.xsd">
     <!--
         To build the distribution files from project root:
 
@@ -18,7 +37,7 @@
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa</artifactId>
-        <version>0.9.8-incubating-SNAPSHOT</version>
+        <version>0.9.7-incubating-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -134,26 +153,33 @@
                                     <tasks>
                                     <echo>Building docbook manual</echo>
 
-                                    <mkdir dir="${project.basedir}/target/stylesheets" />
-                                    <available file="${local.repository}/docbook/docbook-xsl/${docbook.version}/docbook-xsl-${docbook.version}.zip" property="docbook.available" />
+                                    <mkdir dir="${project.basedir}/target/stylesheets"/>
+                                    <available file="${local.repository}/docbook/docbook-xsl/${docbook.version}/docbook-xsl-${docbook.version}.zip" property="docbook.available"/>
                                     <fail unless="docbook.available">Could not find docbook file: ${local.repository}/docbook/docbook-xsl/${docbook.version}/docbook-xsl-${docbook.version}.zip</fail>
 
-                                    <unzip src="${local.repository}/docbook/docbook-xsl/${docbook.version}/docbook-xsl-${docbook.version}.zip" dest="${project.basedir}/target/stylesheets/" overwrite="false" />
+                                    <unzip src="${local.repository}/docbook/docbook-xsl/${docbook.version}/docbook-xsl-${docbook.version}.zip" dest="${project.basedir}/target/stylesheets/" overwrite="false"/>
 
 
-                                    <style includes="**/manual.xml" force="true" basedir="${project.basedir}/src/doc/manual" destdir="${project.basedir}/target/manual" style="manual-xhtml.xsl" classpathref="maven.runtime.classpath">
+                                    <style includes="**/manual.xml"
+                                        force="true"
+                                        basedir="${project.basedir}/src/doc/manual"
+                                        destdir="${project.basedir}/target/manual"
+                                        style="manual-xhtml.xsl"
+                                        classpathref="maven.runtime.classpath">
                                         <factory name="org.apache.xalan.processor.TransformerFactoryImpl">
-                                            <attribute name="http://xml.apache.org/xalan/features/optimize" value="true" />
+                                            <attribute name="http://xml.apache.org/xalan/features/optimize" value="true"/>
                                         </factory>
                                     </style>
 
                                     <!--
-                                    <style includes="**/manual.xml" force="true" basedir="${project.basedir}/src/doc/manual"
+                                    <style includes="**/manual.xml"
+                                        force="true"
+                                        basedir="${project.basedir}/src/doc/manual"
                                         destdir="${project.basedir}/target/manual"
                                         style="manual-xhtml-chunk.xsl"
                                         classpathref="maven.runtime.classpath">
                                         <factory name="org.apache.xalan.processor.TransformerFactoryImpl">
-                                            <attribute name="http://xml.apache.org/xalan/features/optimize" value="true" />
+                                            <attribute name="http://xml.apache.org/xalan/features/optimize" value="true"/>
                                         </factory>
                                     </style>
                                     -->
@@ -191,20 +217,22 @@
                                     <macrodef name="sign-file">
                                         <attribute name="file" />
                                         <sequential>
-                                        <delete failonerror="false" file="@{file}.asc" />
-                                        <exec executable="gpg" failonerror="true">
-                                            <arg value="--batch" />
-                                            <arg value="--verbose" />
-                                            <arg value="--default-key" />
-                                            <arg value="${openjpa.release.keyAlias}" />
-                                            <arg value="--armor" />
-                                            <arg value="--detach-sig" />
-                                            <arg value="@{file}" />
+                                        <delete failonerror="false"
+                                            file="@{file}.asc"/>
+                                        <exec executable="gpg"
+                                            failonerror="true">
+                                            <arg value="--batch"/>
+                                            <arg value="--verbose"/>
+                                            <arg value="--default-key"/>
+                                            <arg value="${openjpa.release.keyAlias}"/>
+                                            <arg value="--armor"/>
+                                            <arg value="--detach-sig"/>
+                                            <arg value="@{file}"/>
                                         </exec>
                                         </sequential>
                                     </macrodef>
-                                    <sign-file file="${openjpa.assembly.binaryFile}" />
-                                    <sign-file file="${openjpa.assembly.sourceFile}" />
+                                    <sign-file file="${openjpa.assembly.binaryFile}"/>
+                                    <sign-file file="${openjpa.assembly.sourceFile}"/>
                                     </tasks>
                                 </configuration>
                                 <goals>
@@ -345,4 +373,4 @@
             <type>zip</type>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: incubator/openjpa/branches/0.9.7-incubating/openjpa-xmlstore/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/branches/0.9.7-incubating/openjpa-xmlstore/pom.xml?view=diff&rev=527342&r1=527341&r2=527342
==============================================================================
--- incubator/openjpa/branches/0.9.7-incubating/openjpa-xmlstore/pom.xml (original)
+++ incubator/openjpa/branches/0.9.7-incubating/openjpa-xmlstore/pom.xml Tue Apr 10 17:07:22 2007
@@ -1,4 +1,22 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation.
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.openjpa</groupId>
     <artifactId>openjpa-xmlstore</artifactId>
@@ -9,7 +27,7 @@
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa</artifactId>
-        <version>0.9.8-incubating-SNAPSHOT</version>
+        <version>0.9.7-incubating-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>
@@ -31,4 +49,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>



Mime
View raw message