You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by mi...@apache.org on 2007/04/10 23:59:03 UTC
svn commit: r527320 [1/2] - 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/ o...
Author: mikedd
Date: Tue Apr 10 14:59:02 2007
New Revision: 527320
URL: http://svn.apache.org/viewvc?view=rev&rev=527320
Log:
[maven-release-plugin] prepare release openjpa-0.9.7-incubating-RC1
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
incubator/openjpa/branches/0.9.7-incubating/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=527320&r1=527319&r2=527320
==============================================================================
--- 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 14:59:02 2007
@@ -1,23 +1,4 @@
-<?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">
+<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>
@@ -25,7 +6,7 @@
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>0.9.7-incubating-SNAPSHOT</version>
+ <version>0.9.7-incubating</version>
</parent>
<build>
<plugins>
@@ -44,11 +25,10 @@
<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>
@@ -57,18 +37,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>
@@ -138,4 +118,4 @@
<version>${pom.version}</version>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
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=527320&r1=527319&r2=527320
==============================================================================
--- 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 14:59:02 2007
@@ -1,22 +1,4 @@
-<?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">
+<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>
@@ -27,7 +9,7 @@
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>0.9.7-incubating-SNAPSHOT</version>
+ <version>0.9.7-incubating</version>
</parent>
<dependencies>
<dependency>
@@ -74,21 +56,19 @@
<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>
@@ -101,4 +81,4 @@
-->
</plugins>
</build>
-</project>
+</project>
\ No newline at end of file
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=527320&r1=527319&r2=527320
==============================================================================
--- 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:59:02 2007
@@ -1,31 +1,4 @@
-<?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">
+<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>
@@ -33,7 +6,7 @@
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-integration</artifactId>
- <version>0.9.7-incubating-SNAPSHOT</version>
+ <version>0.9.7-incubating</version>
</parent>
<profiles>
@@ -51,16 +24,13 @@
<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>
@@ -82,5 +52,4 @@
<version>${pom.version}</version>
</dependency>
</dependencies>
-</project>
-
+</project>
\ No newline at end of file
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=527320&r1=527319&r2=527320
==============================================================================
--- 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 14:59:02 2007
@@ -1,23 +1,4 @@
-<?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">
+<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>
@@ -25,10 +6,10 @@
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>0.9.7-incubating-SNAPSHOT</version>
+ <version>0.9.7-incubating</version>
</parent>
<modules>
<module>examples</module>
<module>tck</module>
</modules>
-</project>
+</project>
\ No newline at end of file
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=527320&r1=527319&r2=527320
==============================================================================
--- 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 14:59:02 2007
@@ -1,50 +1,4 @@
-<?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">
+<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>
@@ -52,7 +6,7 @@
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-integration</artifactId>
- <version>0.9.7-incubating-SNAPSHOT</version>
+ <version>0.9.7-incubating</version>
</parent>
<profiles>
@@ -70,50 +24,42 @@
<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="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="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="openjpa.properties"
- value="${tck.dir}/openjpa-provier.properties"/>
+ <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" />
<!-- create the OpenJPA properties for the TCK run -->
<echo append="false" file="${openjpa.properties}">
@@ -131,8 +77,7 @@
</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}">
@@ -158,10 +103,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>
<!--
@@ -172,45 +117,36 @@
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=".."/>
-
- <env key="ANT_HOME"
- value="${tck.dir}/tools/ant"/>
- <sysproperty key="ant.home"
- value="${tck.dir}/tools/ant"/>
+ <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=".." />
- <sysproperty key="pkg.dir"
- value="${jpatck.pkg.dir}"/>
+ <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}" />
<classpath>
- <path refid="cp"/>
+ <path refid="cp" />
<fileset dir="${tck.dir}/tools/ant/lib">
- <include name="**/*.jar"/>
+ <include name="**/*.jar" />
</fileset>
</classpath>
</java>
@@ -220,32 +156,26 @@
<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>
@@ -289,5 +219,4 @@
<scope>compile</scope>
</dependency>
</dependencies>
-</project>
-
+</project>
\ No newline at end of file
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=527320&r1=527319&r2=527320
==============================================================================
--- 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 14:59:02 2007
@@ -1,22 +1,4 @@
-<?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">
+<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>
@@ -27,7 +9,7 @@
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>0.9.7-incubating-SNAPSHOT</version>
+ <version>0.9.7-incubating</version>
</parent>
<dependencies>
<dependency>
@@ -49,4 +31,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
\ No newline at end of file
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=527320&r1=527319&r2=527320
==============================================================================
--- 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 14:59:02 2007
@@ -1,22 +1,4 @@
-<?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">
+<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>
@@ -27,7 +9,7 @@
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>0.9.7-incubating-SNAPSHOT</version>
+ <version>0.9.7-incubating</version>
</parent>
<dependencies>
<dependency>
@@ -55,4 +37,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
\ No newline at end of file
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=527320&r1=527319&r2=527320
==============================================================================
--- 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 14:59:02 2007
@@ -1,22 +1,4 @@
-<?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">
+<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>
@@ -27,7 +9,7 @@
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>0.9.7-incubating-SNAPSHOT</version>
+ <version>0.9.7-incubating</version>
</parent>
<dependencies>
<dependency>
@@ -62,4 +44,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
\ No newline at end of file
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=527320&r1=527319&r2=527320
==============================================================================
--- 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 14:59:02 2007
@@ -1,154 +1,133 @@
-<?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>
- <packaging>jar</packaging>
- <name>OpenJPA Kernel</name>
- <description>OpenJPA Kernel</description>
- <url>http://incubator.apache.org/projects/openjpa</url>
- <parent>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>0.9.7-incubating-SNAPSHOT</version>
- </parent>
- <dependencies>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-lib</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.0.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
- <version>1.0.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
- <version>1.0.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>1.3</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javacc-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>jjtree-jpql</id>
- <phase>generate-sources</phase>
- <configuration>
- <sourceDirectory>
- ${basedir}/src/main/jjtree/org/apache/openjpa/kernel/jpql</sourceDirectory>
- <outputDirectory>
- ${project.build.directory}/generated-sources/jjtree/org/apache/openjpa/kernel/jpql</outputDirectory>
- <buildNodeFiles>false</buildNodeFiles>
- </configuration>
- <goals>
- <goal>jjtree</goal>
- </goals>
- </execution>
- <execution>
- <id>javacc-jpql</id>
- <phase>generate-sources</phase>
- <configuration>
- <sourceDirectory>
- ${project.build.directory}/generated-sources/jjtree/org/apache/openjpa/kernel/jpql</sourceDirectory>
- <outputDirectory>
- ${project.build.directory}/generated-sources/javacc/org/apache/openjpa/kernel/jpql</outputDirectory>
- </configuration>
- <goals>
- <goal>javacc</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-sources</phase>
- <configuration>
- <tasks>
- <delete
- file="${project.build.directory}/generated-sources/javacc/org/apache/openjpa/kernel/jpql/ParseException.java"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>add-was-interfaces</id>
- <phase>process-classes</phase>
- <configuration>
- <tasks>
- <java
- classname="org.apache.openjpa.ee.WASManagedRuntime" classpathref="maven.runtime.classpath" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>generate-standard-sco-proxies</id>
- <phase>process-classes</phase>
- <configuration>
- <tasks>
- <java
- classname="org.apache.openjpa.util.ProxyManagerImpl" classpathref="maven.runtime.classpath">
- <arg line="-utils 5"/>
- </java>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
+<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>
+ <packaging>jar</packaging>
+ <name>OpenJPA Kernel</name>
+ <description>OpenJPA Kernel</description>
+ <url>http://incubator.apache.org/projects/openjpa</url>
+ <parent>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <version>0.9.7-incubating</version>
+ </parent>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-lib</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>1.0.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+ <version>1.0.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ <version>1.0.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.3</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javacc-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>jjtree-jpql</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <sourceDirectory>
+ ${basedir}/src/main/jjtree/org/apache/openjpa/kernel/jpql</sourceDirectory>
+ <outputDirectory>
+ ${project.build.directory}/generated-sources/jjtree/org/apache/openjpa/kernel/jpql</outputDirectory>
+ <buildNodeFiles>false</buildNodeFiles>
+ </configuration>
+ <goals>
+ <goal>jjtree</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>javacc-jpql</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <sourceDirectory>
+ ${project.build.directory}/generated-sources/jjtree/org/apache/openjpa/kernel/jpql</sourceDirectory>
+ <outputDirectory>
+ ${project.build.directory}/generated-sources/javacc/org/apache/openjpa/kernel/jpql</outputDirectory>
+ </configuration>
+ <goals>
+ <goal>javacc</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-sources</phase>
+ <configuration>
+ <tasks>
+ <delete file="${project.build.directory}/generated-sources/javacc/org/apache/openjpa/kernel/jpql/ParseException.java" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>add-was-interfaces</id>
+ <phase>process-classes</phase>
+ <configuration>
+ <tasks>
+ <java classname="org.apache.openjpa.ee.WASManagedRuntime" classpathref="maven.runtime.classpath" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>generate-standard-sco-proxies</id>
+ <phase>process-classes</phase>
+ <configuration>
+ <tasks>
+ <java classname="org.apache.openjpa.util.ProxyManagerImpl" classpathref="maven.runtime.classpath">
+ <arg line="-utils 5" />
+ </java>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
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=527320&r1=527319&r2=527320
==============================================================================
--- 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 14:59:02 2007
@@ -1,22 +1,4 @@
-<?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">
+<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>
@@ -27,7 +9,7 @@
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>0.9.7-incubating-SNAPSHOT</version>
+ <version>0.9.7-incubating</version>
</parent>
<dependencies>
<dependency>
@@ -101,8 +83,7 @@
<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>
@@ -114,31 +95,23 @@
<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>
@@ -149,4 +122,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
\ No newline at end of file
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=527320&r1=527319&r2=527320
==============================================================================
--- 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 14:59:02 2007
@@ -1,22 +1,4 @@
-<?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">
+<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>
@@ -27,7 +9,7 @@
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>0.9.7-incubating-SNAPSHOT</version>
+ <version>0.9.7-incubating</version>
</parent>
<properties>
@@ -382,21 +364,19 @@
<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>
@@ -408,4 +388,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
\ No newline at end of file
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=527320&r1=527319&r2=527320
==============================================================================
--- 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 14:59:02 2007
@@ -1,22 +1,4 @@
-<?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">
+<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>
@@ -27,7 +9,7 @@
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>0.9.7-incubating-SNAPSHOT</version>
+ <version>0.9.7-incubating</version>
</parent>
<dependencies>
<dependency>
@@ -55,4 +37,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
\ No newline at end of file
RE: svn commit: r527320 [1/2] - 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/
Posted by Patrick Linskey <pl...@bea.com>.
Speaking of licenses, I just went through trunk to look for files that
don't contain the URL of the license file. I got the following:
./openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/H2Dictionary.ja
va
./openjpa-jdbc/src/main/resources/META-INF/services/org.apache.openjpa.l
ib.conf.ProductDerivation
./openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/meta/java-keyw
ords.rsrc
./openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/schema/schemas
-doctype.rsrc
./openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/sql/sql-keywor
ds.rsrc
./openjpa-kernel/src/main/java/org/apache/openjpa/conf/BrokerValue.java
./openjpa-kernel/src/main/java/org/apache/openjpa/enhance/Reflection.jav
a
./openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FinalizingBroke
rImpl.java
./openjpa-kernel/src/main/resources/META-INF/services/org.apache.openjpa
.kernel.exps.ExpressionParser
./openjpa-persistence/src/main/resources/META-INF/services/javax.persist
ence.spi.PersistenceProvider
./openjpa-persistence/src/main/resources/META-INF/services/org.apache.op
enjpa.lib.conf.ProductDerivation
./openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/
orm-xsd.rsrc
./openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/
persistence-xsd.rsrc
./openjpa-persistence-jdbc/src/main/resources/META-INF/services/org.apac
he.openjpa.lib.conf.ProductDerivation
Some of these files are formats / get parsed in ways that do not allow
comments, but certainly all of the Java files should have licenses in
them. I would just add the license headers in myself, except that then
you'd need to patch your branch; can you add the headers to the files in
this list that support comments?
There were also 22 files in openjpa-*/src/test directories that don't
have the headers. I'm assuming that when we package up the source, we
don't include the test classes, and am therefore leaving those files
out.
Thanks,
-Patrick
--
Patrick Linskey
BEA Systems, Inc.
_______________________________________________________________________
Notice: This email message, together with any attachments, may contain
information of BEA Systems, Inc., its subsidiaries and affiliated
entities, that may be confidential, proprietary, copyrighted and/or
legally privileged, and is intended solely for the use of the individual
or entity named in this message. If you are not the intended recipient,
and have received this message in error, please immediately return this
by email and then delete it.
> -----Original Message-----
> From: Craig.Russell@Sun.COM [mailto:Craig.Russell@Sun.COM]
> Sent: Tuesday, April 10, 2007 3:26 PM
> To: open-jpa-dev@incubator.apache.org
> Cc: open-jpa-commits@incubator.apache.org
> Subject: Re: svn commit: r527320 [1/2] - 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/
>
> Hi Mike,
>
> Did you accidentally remove the licenses from the xml files???
>
> Craig
>
> On Apr 10, 2007, at 2:59 PM, mikedd@apache.org wrote:
>
> > 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=527320&r1=527319&r2=527320
> >
> ==============================================================
> ========
> > ========
> > --- 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 14:59:02 2007
> > @@ -1,22 +1,4 @@
> > -<?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">
> > +<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>
> > @@ -27,7 +9,7 @@
> > <parent>
> > <groupId>org.apache.openjpa</groupId>
> > <artifactId>openjpa</artifactId>
> > - <version>0.9.7-incubating-SNAPSHOT</version>
> > + <version>0.9.7-incubating</version>
>
> Craig Russell
> Architect, Sun Java Enterprise System http://java.sun.com/products/jdo
> 408 276-5638 mailto:Craig.Russell@sun.com
> P.S. A good JDO? O, Gasp!
>
>
Notice: This email message, together with any attachments, may contain information of BEA Systems, Inc., its subsidiaries and affiliated entities, that may be confidential, proprietary, copyrighted and/or legally privileged, and is intended solely for the use of the individual or entity named in this message. If you are not the intended recipient, and have received this message in error, please immediately return this by email and then delete it.
Re: svn commit: r527320 [1/2] - 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/ o...
Posted by Craig L Russell <Cr...@Sun.COM>.
Hi Mike,
Did you accidentally remove the licenses from the xml files???
Craig
On Apr 10, 2007, at 2:59 PM, mikedd@apache.org wrote:
> 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=527320&r1=527319&r2=527320
> ======================================================================
> ========
> --- 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 14:59:02 2007
> @@ -1,22 +1,4 @@
> -<?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">
> +<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>
> @@ -27,7 +9,7 @@
> <parent>
> <groupId>org.apache.openjpa</groupId>
> <artifactId>openjpa</artifactId>
> - <version>0.9.7-incubating-SNAPSHOT</version>
> + <version>0.9.7-incubating</version>
Craig Russell
Architect, Sun Java Enterprise System http://java.sun.com/products/jdo
408 276-5638 mailto:Craig.Russell@sun.com
P.S. A good JDO? O, Gasp!
Re: svn commit: r527320 [1/2] - 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/ o...
Posted by Craig L Russell <Cr...@Sun.COM>.
Hi Mike,
Did you accidentally remove the licenses from the xml files???
Craig
On Apr 10, 2007, at 2:59 PM, mikedd@apache.org wrote:
> 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=527320&r1=527319&r2=527320
> ======================================================================
> ========
> --- 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 14:59:02 2007
> @@ -1,22 +1,4 @@
> -<?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">
> +<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>
> @@ -27,7 +9,7 @@
> <parent>
> <groupId>org.apache.openjpa</groupId>
> <artifactId>openjpa</artifactId>
> - <version>0.9.7-incubating-SNAPSHOT</version>
> + <version>0.9.7-incubating</version>
Craig Russell
Architect, Sun Java Enterprise System http://java.sun.com/products/jdo
408 276-5638 mailto:Craig.Russell@sun.com
P.S. A good JDO? O, Gasp!