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 2008/06/25 06:28:47 UTC
svn commit: r671418 - in /openjpa/branches/1.0.x: ./ openjpa-all/
openjpa-examples/ openjpa-integration/ openjpa-integration/examples/
openjpa-integration/tck/ openjpa-jdbc-5/ openjpa-jdbc/ openjpa-kernel-5/
openjpa-kernel/ openjpa-lib-5/ openjpa-lib/ ...
Author: mikedd
Date: Tue Jun 24 21:28:46 2008
New Revision: 671418
URL: http://svn.apache.org/viewvc?rev=671418&view=rev
Log:
OPENJPA-633 updating pom.xml files for 1.0.x branch with formatting changes required by the maven release plugin
Modified:
openjpa/branches/1.0.x/openjpa-all/pom.xml
openjpa/branches/1.0.x/openjpa-examples/pom.xml
openjpa/branches/1.0.x/openjpa-integration/examples/pom.xml
openjpa/branches/1.0.x/openjpa-integration/pom.xml
openjpa/branches/1.0.x/openjpa-integration/tck/pom.xml
openjpa/branches/1.0.x/openjpa-jdbc-5/pom.xml
openjpa/branches/1.0.x/openjpa-jdbc/pom.xml
openjpa/branches/1.0.x/openjpa-kernel-5/pom.xml
openjpa/branches/1.0.x/openjpa-kernel/pom.xml
openjpa/branches/1.0.x/openjpa-lib-5/pom.xml
openjpa/branches/1.0.x/openjpa-lib/pom.xml
openjpa/branches/1.0.x/openjpa-persistence-jdbc/pom.xml
openjpa/branches/1.0.x/openjpa-persistence/pom.xml
openjpa/branches/1.0.x/openjpa-project/pom.xml
openjpa/branches/1.0.x/openjpa-xmlstore/pom.xml
openjpa/branches/1.0.x/pom.xml
Modified: openjpa/branches/1.0.x/openjpa-all/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-all/pom.xml?rev=671418&r1=671417&r2=671418&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-all/pom.xml (original)
+++ openjpa/branches/1.0.x/openjpa-all/pom.xml Tue Jun 24 21:28:46 2008
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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">
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+ -->
+<!--
+ Maven release plugin requires the project tag to be on a single line.
+ -->
+<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</artifactId>
<packaging>jar</packaging>
@@ -57,11 +57,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>
@@ -70,18 +69,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>
Modified: openjpa/branches/1.0.x/openjpa-examples/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-examples/pom.xml?rev=671418&r1=671417&r2=671418&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-examples/pom.xml (original)
+++ openjpa/branches/1.0.x/openjpa-examples/pom.xml Tue Jun 24 21:28:46 2008
@@ -1,25 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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">
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+ -->
+<!--
+ Maven release plugin requires the project tag to be on a single line.
+ -->
+<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>
@@ -84,21 +85,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>
Modified: openjpa/branches/1.0.x/openjpa-integration/examples/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-integration/examples/pom.xml?rev=671418&r1=671417&r2=671418&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-integration/examples/pom.xml (original)
+++ openjpa/branches/1.0.x/openjpa-integration/examples/pom.xml Tue Jun 24 21:28:46 2008
@@ -1,23 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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.
--->
-
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
@@ -26,10 +25,10 @@
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">
+<!--
+ Maven release plugin requires the project tag to be on a single line.
+ -->
+<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>
@@ -55,29 +54,23 @@
<tasks>
<echo>Running OpenJPA Examples</echo>
- <property name="examples.base"
- value="${basedir}/target/examples"/>
- <mkdir dir="${examples.base}"/>
+ <property name="examples.base" value="${basedir}/target/examples" />
+ <mkdir dir="${examples.base}" />
- <unzip overwrite="false" dest="${examples.base}"
- src="../../target/site/downloads/apache-openjpa-${pom.version}-binary.zip"/>
+ <unzip overwrite="false" dest="${examples.base}" src="../../target/site/downloads/apache-openjpa-${pom.version}-binary.zip" />
<path id="assembly.classpath">
<fileset dir="${examples.base}">
- <include name="**/*.jar"/>
+ <include name="**/*.jar" />
</fileset>
</path>
- <available
- classname="org.apache.openjpa.conf.OpenJPAVersion"
- classpathref="assembly.classpath"
- property="unzip.success"/>
+ <available classname="org.apache.openjpa.conf.OpenJPAVersion" classpathref="assembly.classpath" property="unzip.success" />
<fail unless="unzip.success">
Could not extract assembly.
</fail>
<subant inheritAll="false" failonerror="true">
- <fileset dir="${examples.base}"
- includes="*/examples/*/build.xml"/>
+ <fileset dir="${examples.base}" includes="*/examples/*/build.xml" />
</subant>
</tasks>
Modified: openjpa/branches/1.0.x/openjpa-integration/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-integration/pom.xml?rev=671418&r1=671417&r2=671418&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-integration/pom.xml (original)
+++ openjpa/branches/1.0.x/openjpa-integration/pom.xml Tue Jun 24 21:28:46 2008
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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">
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+ -->
+<!--
+ Maven release plugin requires the project tag to be on a single line.
+ -->
+<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>
Modified: openjpa/branches/1.0.x/openjpa-integration/tck/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-integration/tck/pom.xml?rev=671418&r1=671417&r2=671418&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-integration/tck/pom.xml (original)
+++ openjpa/branches/1.0.x/openjpa-integration/tck/pom.xml Tue Jun 24 21:28:46 2008
@@ -1,23 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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.
--->
-
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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:
@@ -44,10 +43,10 @@
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">
+<!--
+ Maven release plugin requires the project tag to be on a single line.
+ -->
+<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>
@@ -73,52 +72,44 @@
<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" />
- <delete dir="${tck.dir}"/>
+ <delete dir="${tck.dir}" />
- <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="openjpa.properties"
- value="${tck.dir}/openjpa-provier.properties"/>
+ <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}">
@@ -136,8 +127,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="false" file="${jpatck.config}.tmp">
@@ -166,20 +156,18 @@
<!-- convert backslashes and known paths with spaces
to get around a problem with the TCK testrunner
on windows -->
- <replace summary="yes" file="${jpatck.config}.tmp"
- replacefilterfile="windows-replacefilter.properties"/>
+ <replace summary="yes" file="${jpatck.config}.tmp" replacefilterfile="windows-replacefilter.properties" />
<concat append="true" destfile="${jpatck.config}">
- <fileset file="${jpatck.config}.tmp"/>
+ <fileset file="${jpatck.config}.tmp" />
</concat>
<path id="agent.path">
<fileset dir="../../openjpa-all/target">
- <include name="*.jar"/>
+ <include name="*.jar" />
</fileset>
</path>
- <pathconvert dirsep="/" property="agent"
- refid="agent.path"/>
- <property name="agent.properties" value=""/>
+ <pathconvert dirsep="/" property="agent" refid="agent.path" />
+ <property name="agent.properties" value="" />
<echo>AGENT: ${agent}${agent.properties}</echo>
<!--
@@ -190,45 +178,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}${agent.properties} -Dopenjpa.MetaDataFactory=jpa(DefaultAccessType=PROPERTY)"/>
+ <replacefilter token="-javaagent:${jpa.home}/lib/toplink-essentials-agent.jar" value="-javaagent:${agent}${agent.properties} -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=".." />
+
+ <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>
@@ -238,32 +217,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>
Modified: openjpa/branches/1.0.x/openjpa-jdbc-5/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-jdbc-5/pom.xml?rev=671418&r1=671417&r2=671418&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-jdbc-5/pom.xml (original)
+++ openjpa/branches/1.0.x/openjpa-jdbc-5/pom.xml Tue Jun 24 21:28:46 2008
@@ -1,25 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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">
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+ -->
+<!--
+ Maven release plugin requires the project tag to be on a single line.
+ -->
+<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>
Modified: openjpa/branches/1.0.x/openjpa-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-jdbc/pom.xml?rev=671418&r1=671417&r2=671418&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-jdbc/pom.xml (original)
+++ openjpa/branches/1.0.x/openjpa-jdbc/pom.xml Tue Jun 24 21:28:46 2008
@@ -1,25 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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">
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+ -->
+<!--
+ Maven release plugin requires the project tag to be on a single line.
+ -->
+<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>
Modified: openjpa/branches/1.0.x/openjpa-kernel-5/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-kernel-5/pom.xml?rev=671418&r1=671417&r2=671418&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-kernel-5/pom.xml (original)
+++ openjpa/branches/1.0.x/openjpa-kernel-5/pom.xml Tue Jun 24 21:28:46 2008
@@ -1,25 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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.
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+ -->
+<!--
+ Maven release plugin requires the project tag to be on a single line.
-->
-<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>
Modified: openjpa/branches/1.0.x/openjpa-kernel/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-kernel/pom.xml?rev=671418&r1=671417&r2=671418&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-kernel/pom.xml (original)
+++ openjpa/branches/1.0.x/openjpa-kernel/pom.xml Tue Jun 24 21:28:46 2008
@@ -1,25 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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">
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+ -->
+<!--
+ Maven release plugin requires the project tag to be on a single line.
+ -->
+<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>
@@ -128,8 +129,7 @@
<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>
@@ -141,8 +141,7 @@
<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>
@@ -154,9 +153,8 @@
<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>
Modified: openjpa/branches/1.0.x/openjpa-lib-5/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-lib-5/pom.xml?rev=671418&r1=671417&r2=671418&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-lib-5/pom.xml (original)
+++ openjpa/branches/1.0.x/openjpa-lib-5/pom.xml Tue Jun 24 21:28:46 2008
@@ -1,25 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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">
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+ -->
+<!--
+ Maven release plugin requires the project tag to be on a single line.
+ -->
+<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-5</artifactId>
Modified: openjpa/branches/1.0.x/openjpa-lib/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-lib/pom.xml?rev=671418&r1=671417&r2=671418&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-lib/pom.xml (original)
+++ openjpa/branches/1.0.x/openjpa-lib/pom.xml Tue Jun 24 21:28:46 2008
@@ -1,25 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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">
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+ -->
+<!--
+ Maven release plugin requires the project tag to be on a single line.
+ -->
+<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>
@@ -123,8 +124,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>
@@ -136,33 +136,25 @@
<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>
<echo>OpenJPA version: ${project.version}</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}
openjpa.version=${project.version}</echo>
- <delete dir="${tmpdir}"/>
+ <delete dir="${tmpdir}" />
</tasks>
</configuration>
<goals>
Modified: openjpa/branches/1.0.x/openjpa-persistence-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-persistence-jdbc/pom.xml?rev=671418&r1=671417&r2=671418&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/branches/1.0.x/openjpa-persistence-jdbc/pom.xml Tue Jun 24 21:28:46 2008
@@ -1,25 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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">
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+ -->
+<!--
+ Maven release plugin requires the project tag to be on a single line.
+ -->
+<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>
@@ -387,24 +388,16 @@
<phase>test-compile</phase>
<configuration>
<tasks>
- <ant antfile="src/main/ant/enhancer.xml"
- target="enhance"
- inheritRefs="true">
+ <ant antfile="src/main/ant/enhancer.xml" target="enhance" inheritRefs="true">
<!--
InheritAll doesn't seem to work. Pass in
properties manually.
-->
- <property name="maven.test.skip"
- value="${maven.test.skip}" />
- <property name="test"
- value="${test}" />
- <property name="outdir"
- value="${project.build.outputDirectory}" />
- <property
- name="project.build.testOutputDirectory"
- value="${project.build.testOutputDirectory}" />
- <property name="openjpa.loglevel"
- value="${openjpa.loglevel}" />
+ <property name="maven.test.skip" value="${maven.test.skip}" />
+ <property name="test" value="${test}" />
+ <property name="outdir" value="${project.build.outputDirectory}" />
+ <property name="project.build.testOutputDirectory" value="${project.build.testOutputDirectory}" />
+ <property name="openjpa.loglevel" value="${openjpa.loglevel}" />
</ant>
</tasks>
</configuration>
Modified: openjpa/branches/1.0.x/openjpa-persistence/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-persistence/pom.xml?rev=671418&r1=671417&r2=671418&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-persistence/pom.xml (original)
+++ openjpa/branches/1.0.x/openjpa-persistence/pom.xml Tue Jun 24 21:28:46 2008
@@ -1,25 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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">
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+ -->
+<!--
+ Maven release plugin requires the project tag to be on a single line.
+ -->
+<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>
Modified: openjpa/branches/1.0.x/openjpa-project/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-project/pom.xml?rev=671418&r1=671417&r2=671418&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-project/pom.xml (original)
+++ openjpa/branches/1.0.x/openjpa-project/pom.xml Tue Jun 24 21:28:46 2008
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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">
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+ -->
+<!--
+ Maven release plugin requires the project tag to be on a single line.
+ -->
+<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:
@@ -79,9 +79,9 @@
</properties>
<scm>
- <connection>scm:svn:http://${scm.dir}</connection>
- <developerConnection>scm:svn:https://${scm.dir}</developerConnection>
- <url>https://${scm.dir}</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/openjpa/tags/1.0.3</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/openjpa/tags/1.0.3</developerConnection>
+ <url>https://svn.apache.org/repos/asf/openjpa/tags/1.0.3</url>
</scm>
<build>
@@ -212,24 +212,20 @@
</htmlCustomization>
<postProcess>
<!-- rename manual to index -->
- <move
- file="${docbook.target}/manual.html"
- tofile="${docbook.target}/index.html"/>
+ <move file="${docbook.target}/manual.html" tofile="${docbook.target}/index.html" />
<!-- copy over images and styles -->
- <mkdir dir="${docbook.target}/img"/>
+ <mkdir dir="${docbook.target}/img" />
<copy todir="${docbook.target}/img">
- <fileset
- dir="${docbook.source}/img">
- <include name="*.*"/>
+ <fileset dir="${docbook.source}/img">
+ <include name="*.*" />
</fileset>
</copy>
- <mkdir dir="${docbook.target}/css"/>
+ <mkdir dir="${docbook.target}/css" />
<copy todir="${docbook.target}/css">
- <fileset
- dir="${docbook.source}/css">
- <include name="*.*"/>
+ <fileset dir="${docbook.source}/css">
+ <include name="*.*" />
</fileset>
</copy>
</postProcess>
@@ -279,84 +275,6 @@
</pluginRepository>
</pluginRepositories>
</profile>
-
- <!-- sign the release files -->
- <profile>
- <id>sign-release</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>verify</phase>
- <configuration>
- <tasks>
- <echo>Signing release files...</echo>
- <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}"/>
- </exec>
- </sequential>
- </macrodef>
- <sign-file file="${openjpa.assembly.binaryFile}"/>
- <sign-file file="${openjpa.assembly.sourceFile}"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-signature-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>${openjpa.assembly.binaryFile}.asc</file>
- <classifier>${openjpa.assembly.binarySuffix}.zip</classifier>
- <type>asc</type>
- </artifact>
- <artifact>
- <file>${openjpa.assembly.sourceFile}.asc</file>
- <classifier>${openjpa.assembly.sourceSuffix}.zip</classifier>
- <type>asc</type>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <activation>
- <property>
- <name>sign</name>
- <value>true</value>
- </property>
- </activation>
- </profile>
</profiles>
<!-- need to explicitly list dependencies for assembly to work -->
Modified: openjpa/branches/1.0.x/openjpa-xmlstore/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-xmlstore/pom.xml?rev=671418&r1=671417&r2=671418&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-xmlstore/pom.xml (original)
+++ openjpa/branches/1.0.x/openjpa-xmlstore/pom.xml Tue Jun 24 21:28:46 2008
@@ -1,25 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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">
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+ -->
+<!--
+ Maven release plugin requires the project tag to be on a single line.
+ -->
+<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>
Modified: openjpa/branches/1.0.x/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/pom.xml?rev=671418&r1=671417&r2=671418&view=diff
==============================================================================
--- openjpa/branches/1.0.x/pom.xml (original)
+++ openjpa/branches/1.0.x/pom.xml Tue Jun 24 21:28:46 2008
@@ -17,10 +17,10 @@
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">
+<!--
+ Maven release plugin requires the project tag to be on a single line.
+-->
+<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>
<prerequisites>
<maven>2.0.4</maven>
@@ -50,15 +50,15 @@
<mailingLists>
<mailingList>
<name>OpenJPA Developer List</name>
- <subscribe>dev-subscribe@apache.org</subscribe>
- <unsubscribe>dev-unsubscribe@apache.org</unsubscribe>
+ <subscribe>dev-subscribe@openjpa.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe@openjpa.apache.org</unsubscribe>
<post>dev@openjpa.apache.org</post>
<archive>http://mail-archives.apache.org/mod_mbox/openjpa-dev/</archive>
</mailingList>
<mailingList>
<name>OpenJPA Users List</name>
- <subscribe>users-subscribe@apache.org</subscribe>
- <unsubscribe>users-unsubscribe@apache.org</unsubscribe>
+ <subscribe>users-subscribe@openjpa.apache.org</subscribe>
+ <unsubscribe>users-unsubscribe@openjpa.apache.org</unsubscribe>
<post>users@openjpa.apache.org</post>
<archive>http://mail-archives.apache.org/mod_mbox/openjpa-users/</archive>
</mailingList>
@@ -103,11 +103,7 @@
<name>Apache Software Foundation</name>
<url>http://www.apache.org</url>
</organization>
- <scm>
- <connection>scm:svn:http://${scm.dir}</connection>
- <developerConnection>scm:svn:https://${scm.dir}</developerConnection>
- <url>https://${scm.dir}</url>
- </scm>
+
<modules>
<module>openjpa-lib</module>
<module>openjpa-kernel</module>
@@ -142,6 +138,115 @@
<modules>
<module>openjpa-project</module>
</modules>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <executions>
+ <execution>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <excludes>
+ <!--
+ comments are usupported by
+ javax.persistence.Persistence
+ -->
+ <exclude>**/javax.persistence.spi.PersistenceProvider</exclude>
+
+ <!--
+ comments are usupported by our rsrc parser
+ -->
+ <exclude>**/*.rsrc</exclude>
+
+ <!-- General informational files -->
+ <exclude>openjpa-project/*.txt</exclude>
+ <exclude>README.txt</exclude>
+ <exclude>BUILDRELEASE</exclude>
+
+ <!-- generated content -->
+ <exclude>**/*.log</exclude>
+ <exclude>**/rat.txt</exclude>
+ <exclude>**/*.txt</exclude>
+ <exclude>**/org.apache.openjpa.revision.properties</exclude>
+ <exclude>**/target/**/*</exclude>
+ <exclude>release.properties</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.4</version>
+ <executions>
+ <execution>
+ <id>attach-javadoc</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ <execution>
+ <phase>process-classes</phase>
+ <goals><goal>javadoc</goal></goals>
+ <configuration>
+ <additionalparam>
+ ${javadoc.additionalparam}
+ </additionalparam>
+ <aggregate>true</aggregate>
+ <subpackages>org.apache.openjpa</subpackages>
+ <verbose>false</verbose>
+ <maxmemory>512m</maxmemory>
+ <links>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+ <link>http://java.sun.com/javaee/5/docs/api</link>
+ <link>http://jakarta.apache.org/commons/collections/api-release</link>
+ </links>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-7</version>
+ <configuration>
+ <useReleaseProfile>false</useReleaseProfile>
+ <goals>deploy</goals>
+ <arguments>-Prelease</arguments>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</profile>
<!--
@@ -380,20 +485,24 @@
</plugins>
</reporting>
-
<distributionManagement>
<repository>
- <id>local-repository</id>
- <url>file://${basedir}/target/site/m2-repository/</url>
+ <id>apache.releases</id>
+ <url>scp://people.apache.org/home/${user.name}/public_html/openjpa/${pom.version}/staging-repo</url>
</repository>
<snapshotRepository>
- <id>local-repository</id>
- <url>file://${basedir}/target/site/m2-repository/</url>
+ <id>apache.releases</id>
+ <url>scp://people.apache.org/home/${user.name}/public_html/openjpa/${pom.version}/staging-repo</url>
<uniqueVersion>false</uniqueVersion>
</snapshotRepository>
<site>
- <id>people.apache.org</id>
- <url>scpexe://${user.name}@people.apache.org/www/openjpa.apache.org/builds/${pom.version}</url>
+ <id>apache.releases</id>
+ <url>scp://people.apache.org/home/${user.name}/public_html/openjpa/${pom.version}/staging-site</url>
</site>
</distributionManagement>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/openjpa/branches/1.0.x</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/openjpa/branches/1.0.x</developerConnection>
+ <url>http://svn.apache.org/repos/asf/openjpa/branches/1.0.x</url>
+ </scm>
</project>