Author: mprudhom
Date: Tue Aug 14 15:39:55 2007
New Revision: 565955
URL: http://svn.apache.org/viewvc?view=rev&rev=565955
Log:
Build system work in preparation for 1.0.0 release; fixed some missing license
headers; added maven ARAT plugin
Removed:
openjpa/trunk/openjpa-project/DISCLAIMER.txt
openjpa/trunk/src/site/apt/building.apt
openjpa/trunk/src/site/xdoc/downloads.xml
Modified:
openjpa/trunk/openjpa-examples/pom.xml
openjpa/trunk/openjpa-integration/examples/pom.xml
openjpa/trunk/openjpa-integration/tck/windows-replacefilter.properties
openjpa/trunk/openjpa-jdbc-5/pom.xml
openjpa/trunk/openjpa-jdbc/pom.xml
openjpa/trunk/openjpa-kernel-5/pom.xml
openjpa/trunk/openjpa-kernel/pom.xml
openjpa/trunk/openjpa-lib/pom.xml
openjpa/trunk/openjpa-lib/src/test/java/org/apache/openjpa/lib/conf/TestValue.java
openjpa/trunk/openjpa-persistence-jdbc/pom.xml
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/j2.security.jse.policy
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/j2.security.test.policy
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.db2
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.oracle
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.sqlserver
openjpa/trunk/openjpa-persistence/pom.xml
openjpa/trunk/openjpa-project/BUILDING.txt
openjpa/trunk/openjpa-project/README.txt
openjpa/trunk/openjpa-project/pom.xml
openjpa/trunk/openjpa-xmlstore/pom.xml
openjpa/trunk/pom.xml
openjpa/trunk/src/site/apt/index.apt
openjpa/trunk/src/site/site.xml
Modified: openjpa/trunk/openjpa-examples/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/pom.xml?view=diff&rev=565955&r1=565954&r2=565955
==============================================================================
--- openjpa/trunk/openjpa-examples/pom.xml (original)
+++ openjpa/trunk/openjpa-examples/pom.xml Tue Aug 14 15:39:55 2007
@@ -26,7 +26,7 @@
<packaging>jar</packaging>
<name>OpenJPA Persistence Examples</name>
<description>OpenJPA Persistence Examples</description>
- <url>http://incubator.apache.org/projects/openjpa</url>
+ <url>http://openjpa.apache.org</url>
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-parent</artifactId>
Modified: openjpa/trunk/openjpa-integration/examples/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/examples/pom.xml?view=diff&rev=565955&r1=565954&r2=565955
==============================================================================
--- openjpa/trunk/openjpa-integration/examples/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/examples/pom.xml Tue Aug 14 15:39:55 2007
@@ -50,22 +50,33 @@
<executions>
<execution>
<id>run-examples</id>
- <phase>integration-test</phase>
+ <phase>process-resources</phase>
+ <!-- ### <phase>integration-test</phase> -->
<configuration>
<tasks>
<echo>Running OpenJPA Examples</echo>
-
<property name="examples.base"
value="${basedir}/target/examples"/>
<mkdir dir="${examples.base}"/>
- <unzip overwrite="false" dest="${examples.base}">
- <fileset dir="../../openjpa-project/target/assembly">
- <include name="openjpa-*${version}-binary.zip"/>
- </fileset>
- </unzip>
- <subant inheritAll="false">
+ <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"/>
+ </fileset>
+ </path>
+ <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"/>
</subant>
Modified: openjpa/trunk/openjpa-integration/tck/windows-replacefilter.properties
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/tck/windows-replacefilter.properties?view=diff&rev=565955&r1=565954&r2=565955
==============================================================================
--- openjpa/trunk/openjpa-integration/tck/windows-replacefilter.properties
(original)
+++ openjpa/trunk/openjpa-integration/tck/windows-replacefilter.properties Tue
Aug 14 15:39:55 2007
@@ -1,3 +1,18 @@
+# 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.
+
\\: /
Documents\ and\ Settings: Docume~1
Program\ Files: Progra~1
Modified: openjpa/trunk/openjpa-jdbc-5/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc-5/pom.xml?view=diff&rev=565955&r1=565954&r2=565955
==============================================================================
--- openjpa/trunk/openjpa-jdbc-5/pom.xml (original)
+++ openjpa/trunk/openjpa-jdbc-5/pom.xml Tue Aug 14 15:39:55 2007
@@ -26,7 +26,7 @@
<packaging>jar</packaging>
<name>OpenJPA JDBC 1.5</name>
<description>OpenJPA JDBC 1.5</description>
- <url>http://incubator.apache.org/projects/openjpa</url>
+ <url>http://openjpa.apache.org</url>
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-parent</artifactId>
Modified: openjpa/trunk/openjpa-jdbc/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/pom.xml?view=diff&rev=565955&r1=565954&r2=565955
==============================================================================
--- openjpa/trunk/openjpa-jdbc/pom.xml (original)
+++ openjpa/trunk/openjpa-jdbc/pom.xml Tue Aug 14 15:39:55 2007
@@ -26,7 +26,7 @@
<packaging>jar</packaging>
<name>OpenJPA JDBC</name>
<description>OpenJPA JDBC</description>
- <url>http://incubator.apache.org/projects/openjpa</url>
+ <url>http://openjpa.apache.org</url>
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-parent</artifactId>
Modified: openjpa/trunk/openjpa-kernel-5/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel-5/pom.xml?view=diff&rev=565955&r1=565954&r2=565955
==============================================================================
--- openjpa/trunk/openjpa-kernel-5/pom.xml (original)
+++ openjpa/trunk/openjpa-kernel-5/pom.xml Tue Aug 14 15:39:55 2007
@@ -26,7 +26,7 @@
<packaging>jar</packaging>
<name>OpenJPA Kernel 1.5</name>
<description>OpenJPA Kernel 1.5</description>
- <url>http://incubator.apache.org/projects/openjpa</url>
+ <url>http://openjpa.apache.org</url>
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-parent</artifactId>
Modified: openjpa/trunk/openjpa-kernel/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/pom.xml?view=diff&rev=565955&r1=565954&r2=565955
==============================================================================
--- openjpa/trunk/openjpa-kernel/pom.xml (original)
+++ openjpa/trunk/openjpa-kernel/pom.xml Tue Aug 14 15:39:55 2007
@@ -26,7 +26,7 @@
<packaging>jar</packaging>
<name>OpenJPA Kernel</name>
<description>OpenJPA Kernel</description>
- <url>http://incubator.apache.org/projects/openjpa</url>
+ <url>http://openjpa.apache.org</url>
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-parent</artifactId>
Modified: openjpa/trunk/openjpa-lib/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/pom.xml?view=diff&rev=565955&r1=565954&r2=565955
==============================================================================
--- openjpa/trunk/openjpa-lib/pom.xml (original)
+++ openjpa/trunk/openjpa-lib/pom.xml Tue Aug 14 15:39:55 2007
@@ -26,7 +26,7 @@
<packaging>jar</packaging>
<name>OpenJPA Utilities</name>
<description>OpenJPA Utilities</description>
- <url>http://incubator.apache.org/projects/openjpa</url>
+ <url>http://openjpa.apache.org</url>
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-parent</artifactId>
Modified:
openjpa/trunk/openjpa-lib/src/test/java/org/apache/openjpa/lib/conf/TestValue.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/test/java/org/apache/openjpa/lib/conf/TestValue.java?view=diff&rev=565955&r1=565954&r2=565955
==============================================================================
---
openjpa/trunk/openjpa-lib/src/test/java/org/apache/openjpa/lib/conf/TestValue.java
(original)
+++
openjpa/trunk/openjpa-lib/src/test/java/org/apache/openjpa/lib/conf/TestValue.java
Tue Aug 14 15:39:55 2007
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package org.apache.openjpa.lib.conf;
import junit.framework.TestCase;
Modified: openjpa/trunk/openjpa-persistence-jdbc/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/pom.xml?view=diff&rev=565955&r1=565954&r2=565955
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/pom.xml Tue Aug 14 15:39:55 2007
@@ -26,7 +26,7 @@
<packaging>jar</packaging>
<name>OpenJPA JPA JDBC</name>
<description>OpenJPA JPA JDBC</description>
- <url>http://incubator.apache.org/projects/openjpa</url>
+ <url>http://openjpa.apache.org</url>
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-parent</artifactId>
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/j2.security.jse.policy
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/j2.security.jse.policy?view=diff&rev=565955&r1=565954&r2=565955
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/j2.security.jse.policy
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/j2.security.jse.policy
Tue Aug 14 15:39:55 2007
@@ -1,3 +1,20 @@
+// 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.
+
// ================================================================
// Example JSE Java 2 security policy required by OpenJPA.
//
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/j2.security.test.policy
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/j2.security.test.policy?view=diff&rev=565955&r1=565954&r2=565955
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/j2.security.test.policy
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/j2.security.test.policy
Tue Aug 14 15:39:55 2007
@@ -1,3 +1,20 @@
+// 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.
+
// Default Java 2 security policy required by OpenJPA.
// ================================================================
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.db2
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.db2?view=diff&rev=565955&r1=565954&r2=565955
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.db2
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.db2
Tue Aug 14 15:39:55 2007
@@ -1,3 +1,20 @@
+-- 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.
+
DELETE FROM TORDER t0
SELECT t0.countryCode, t0.id, t0.version, t0.city, t0.state, t0.street,
t0.zip, t0.name FROM TCUSTOMER t0
DELETE FROM TCUSTOMER WHERE countryCode = ? AND id = ? AND version = ?
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.oracle
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.oracle?view=diff&rev=565955&r1=565954&r2=565955
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.oracle
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.oracle
Tue Aug 14 15:39:55 2007
@@ -1,3 +1,20 @@
+-- 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.
+
DELETE FROM TORDER t0
SELECT t0.countryCode, t0.id, t0.version, t0.city, t0.state, t0.street,
t0.zip, t0.name FROM TCUSTOMER t0
DELETE FROM TCUSTOMER WHERE countryCode = ? AND id = ? AND version = ?
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.sqlserver
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.sqlserver?view=diff&rev=565955&r1=565954&r2=565955
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.sqlserver
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.sqlserver
Tue Aug 14 15:39:55 2007
@@ -1,3 +1,20 @@
+-- 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.
+
DELETE FROM TORDER
SELECT t0.countryCode, t0.id, t0.version, t0.city, t0.state, t0.street,
t0.zip, t0.name FROM TCUSTOMER t0
DELETE FROM TCUSTOMER WHERE countryCode = ? AND id = ? AND version = ?
Modified: openjpa/trunk/openjpa-persistence/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/pom.xml?view=diff&rev=565955&r1=565954&r2=565955
==============================================================================
--- openjpa/trunk/openjpa-persistence/pom.xml (original)
+++ openjpa/trunk/openjpa-persistence/pom.xml Tue Aug 14 15:39:55 2007
@@ -26,7 +26,7 @@
<packaging>jar</packaging>
<name>OpenJPA JPA</name>
<description>OpenJPA JPA</description>
- <url>http://incubator.apache.org/projects/openjpa</url>
+ <url>http://openjpa.apache.org</url>
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-parent</artifactId>
Modified: openjpa/trunk/openjpa-project/BUILDING.txt
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/BUILDING.txt?view=diff&rev=565955&r1=565954&r2=565955
==============================================================================
--- openjpa/trunk/openjpa-project/BUILDING.txt (original)
+++ openjpa/trunk/openjpa-project/BUILDING.txt Tue Aug 14 15:39:55 2007
@@ -22,7 +22,7 @@
known to work on Linux and Mac OSX. They are also reported to work from
Windows.
The most up to date version of these instructions may be found on the OpenJPA
-website at http://incubator.apache.org/openjpa/building-openjpa.html
+website at http://openjpa.apache.org/building-openjpa.html
1. Ensure that you have Java 1.5 installed and in your path by running:
java -version
@@ -77,7 +77,7 @@
svn, version 1.1.4 (r13838)
compiled Jul 10 2006, 22:17:43
-$ svn co https://svn.apache.org/repos/asf/incubator/openjpa/trunk/
+$ svn co https://svn.apache.org/repos/asf/openjpa/trunk/
A trunk/openjpa-lib
A trunk/openjpa-lib/src
Modified: openjpa/trunk/openjpa-project/README.txt
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/README.txt?view=diff&rev=565955&r1=565954&r2=565955
==============================================================================
--- openjpa/trunk/openjpa-project/README.txt (original)
+++ openjpa/trunk/openjpa-project/README.txt Tue Aug 14 15:39:55 2007
@@ -1,6 +1,6 @@
-Thank you for downloading this incubator release of OpenJPA. For
+Thank you for downloading this release of OpenJPA. For
documentation and project information, please see:
- http://incubator.apache.org/openjpa/
+ http://openjpa.apache.org
Modified: openjpa/trunk/openjpa-project/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/pom.xml?view=diff&rev=565955&r1=565954&r2=565955
==============================================================================
--- openjpa/trunk/openjpa-project/pom.xml (original)
+++ openjpa/trunk/openjpa-project/pom.xml Tue Aug 14 15:39:55 2007
@@ -48,10 +48,11 @@
<openjpa.release.keyAlias>
[EMAIL PROTECTED]
</openjpa.release.keyAlias>
+
<openjpa.assembly.finalName>
${artifactId}-${version}</openjpa.assembly.finalName>
<openjpa.assembly.outputDirectory>
- ${project.basedir}/target/assembly
+ ${project.basedir}/../target/site/downloads
</openjpa.assembly.outputDirectory>
<openjpa.assembly.binarySuffix>binary</openjpa.assembly.binarySuffix>
@@ -70,6 +71,7 @@
${openjpa.assembly.sourceBase}.zip
</openjpa.assembly.sourceFile>
+
<docbook.source>${project.basedir}/src/doc/manual</docbook.source>
<docbook.target>${project.basedir}/target/manual</docbook.target>
<docbook.version>1.67.2</docbook.version>
@@ -120,7 +122,7 @@
</goals>
<configuration>
<descriptor>source-assembly.xml</descriptor>
-
<outputDirectory>${project.basedir}/target/assembly</outputDirectory>
+
<outputDirectory>${openjpa.assembly.outputDirectory}</outputDirectory>
<workDirectory>target/work</workDirectory>
</configuration>
</execution>
Modified: openjpa/trunk/openjpa-xmlstore/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-xmlstore/pom.xml?view=diff&rev=565955&r1=565954&r2=565955
==============================================================================
--- openjpa/trunk/openjpa-xmlstore/pom.xml (original)
+++ openjpa/trunk/openjpa-xmlstore/pom.xml Tue Aug 14 15:39:55 2007
@@ -26,7 +26,7 @@
<packaging>jar</packaging>
<name>OpenJPA XML Store</name>
<description>OpenJPA XML Store</description>
- <url>http://incubator.apache.org/projects/openjpa</url>
+ <url>http://openjpa.apache.org</url>
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-parent</artifactId>
Modified: openjpa/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/pom.xml?view=diff&rev=565955&r1=565954&r2=565955
==============================================================================
--- openjpa/trunk/pom.xml (original)
+++ openjpa/trunk/pom.xml Tue Aug 14 15:39:55 2007
@@ -33,6 +33,7 @@
<properties>
<scm.dir>svn.apache.org/repos/asf/openjpa/trunk</scm.dir>
+ <openjpa.version>${pom.version}</openjpa.version>
</properties>
<!--
@@ -40,7 +41,7 @@
See: http://jira.codehaus.org/browse/MNG-624
-->
<version>1.0.0-SNAPSHOT</version>
- <url>http://incubator.apache.org/projects/openjpa</url>
+ <url>http://openjpa.apache.org</url>
<issueManagement>
<system>jira</system>
<url>http://issues.apache.org/jira/browse/OPENJPA</url>
@@ -49,44 +50,44 @@
<mailingLists>
<mailingList>
<name>OpenJPA Developer List</name>
- <subscribe>[EMAIL PROTECTED]</subscribe>
- <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
- <post>[EMAIL PROTECTED]</post>
-
<archive>http://mail-archives.apache.org/mod_mbox/incubator-open-jpa-dev/</archive>
+ <subscribe>[EMAIL PROTECTED]</subscribe>
+ <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
+ <post>[EMAIL PROTECTED]</post>
+
<archive>http://mail-archives.apache.org/mod_mbox/openjpa-dev/</archive>
+ </mailingList>
+ <mailingList>
+ <name>OpenJPA Users List</name>
+ <subscribe>[EMAIL PROTECTED]</subscribe>
+ <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
+ <post>[EMAIL PROTECTED]</post>
+
<archive>http://mail-archives.apache.org/mod_mbox/openjpa-users/</archive>
</mailingList>
<mailingList>
<name>OpenJPA Commits List</name>
- <subscribe>[EMAIL PROTECTED]</subscribe>
- <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
- <post>[EMAIL PROTECTED]</post>
-
<archive>http://mail-archives.apache.org/mod_mbox/incubator-open-jpa-commits/</archive>
+ <subscribe>[EMAIL PROTECTED]</subscribe>
+ <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
+ <post>[email protected]</post>
+
<archive>http://mail-archives.apache.org/mod_mbox/openjpa-commits/</archive>
</mailingList>
</mailingLists>
<developers>
- <developer>
- <name>Patrick Linskey</name>
- <id>plinskey</id>
- <organization>BEA Systems, Inc.</organization>
- <email>[EMAIL PROTECTED]</email>
- </developer>
- <developer>
- <name>Abe White</name>
- <id>awhite</id>
- <organization>BEA Systems, Inc.</organization>
- <email>[EMAIL PROTECTED]</email>
- </developer>
- <developer>
- <name>Steve Kim</name>
- <id>stkim</id>
- <organization>BEA Systems, Inc.</organization>
- <email>[EMAIL PROTECTED]</email>
- </developer>
- <developer>
- <name>Marc Prud'hommeaux</name>
- <id>mprudhom</id>
- <organization>BEA Systems, Inc.</organization>
- <email>[EMAIL PROTECTED]</email>
- </developer>
+ <!--
+ Committer list taken from http://openjpa.apache.org/committers.html
+ -->
+ <developer><name>Abe White</name></developer>
+ <developer><name>Brian McCallister</name></developer>
+ <developer><name>Bryan Noll</name></developer>
+ <developer><name>Craig Russell</name></developer>
+ <developer><name>David Wisneski</name></developer>
+ <developer><name>Eddie O'Neil</name></developer>
+ <developer><name>Geir Magnusson Jr.</name></developer>
+ <developer><name>Kevin Sutter</name></developer>
+ <developer><name>Marc Prud'hommeaux</name></developer>
+ <developer><name>Michael Dick</name></developer>
+ <developer><name>Patrick Linskey</name></developer>
+ <developer><name>Pinaki Poddar</name></developer>
+ <developer><name>Srinivasa Segu</name></developer>
+ <developer><name>Stephen Kim</name></developer>
</developers>
<licenses>
<license>
@@ -212,6 +213,32 @@
</profile>
<profile>
+ <!--
+ Apache License check plugin. Run manually with:
+ mvn rat:check
+ Or add it to the verify phase with:
+ mvn verify -Plicense-verify-profile
+ -->
+ <id>license-verify-profile</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
<id>enable-security</id>
<activation>
<activeByDefault>false</activeByDefault>
@@ -295,6 +322,38 @@
<useSystemClassLoader>true</useSystemClassLoader>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <numUnapprovedLicenses>0</numUnapprovedLicenses>
+ <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>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -331,17 +390,17 @@
<distributionManagement>
<repository>
- <id>people.apache.org</id>
- <url>scpexe://[EMAIL
PROTECTED]/www/people.apache.org/repo/m2-incubating-repository/</url>
+ <id>local-repository</id>
+ <url>${basedir}/target/site/m2-repository/</url>
</repository>
<snapshotRepository>
- <id>people.apache.org</id>
- <url>scpexe://[EMAIL
PROTECTED]/www/people.apache.org/repo/m2-snapshot-repository/</url>
+ <id>local-repository</id>
+ <url>${basedir}/target/site/m2-repository/</url>
<uniqueVersion>false</uniqueVersion>
</snapshotRepository>
<site>
<id>people.apache.org</id>
- <url>scpexe://[EMAIL
PROTECTED]/home/mprudhom/public_html/openjpa/site/</url>
+ <url>scpexe://[EMAIL
PROTECTED]/www/openjpa.apache.org/builds/${pom.version}</url>
</site>
</distributionManagement>
</project>
Modified: openjpa/trunk/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/openjpa/trunk/src/site/apt/index.apt?view=diff&rev=565955&r1=565954&r2=565955
==============================================================================
--- openjpa/trunk/src/site/apt/index.apt (original)
+++ openjpa/trunk/src/site/apt/index.apt Tue Aug 14 15:39:55 2007
@@ -1,28 +1,24 @@
--- 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.
------
openjpa
------
-Welcome to the OpenJPA project site!
-
- OpenJPA is a set of Java persistence Application Program Interfaces (APIs)
that are based on the Enterprise Java Beans 3.0 persistenace specification.
This is the distribution and project management site for OpenJPA. For community
resources, please see the {{{http://wiki.apache.org/incubator/OpenJPA}OpenJPA
wiki}}.
-
- To download OpenJPA, please go to the {{{downloads.html}downloads}} page.
+ This is the OpenJPA build site. For the official site, please visit
{{{http://openjpa.apache.org}http://openjpa.apache.org}}.
Modified: openjpa/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/src/site/site.xml?view=diff&rev=565955&r1=565954&r2=565955
==============================================================================
--- openjpa/trunk/src/site/site.xml (original)
+++ openjpa/trunk/src/site/site.xml Tue Aug 14 15:39:55 2007
@@ -20,22 +20,17 @@
<project name="OpenJPA">
<bannerLeft>
<name>OpenJPA</name>
- <!-- <src>http://www.apache.org/images/asf_logo_wide.gif</src> -->
- <!-- <href>/</href> -->
</bannerLeft>
<body>
<menu name="OpenJPA">
<item name="Home" href="index.html"/>
- <item name="Manual" href="openjpa-project/manual/index.html"/>
- <item name="Download" href="downloads.html"/>
- <item name="Building" href="building.html"/>
+ <item name="Main Site" href="http://openjpa.apache.org"/>
+ <item name="Downloads" href="downloads/"/>
</menu>
<menu name="Community">
<item name="Issue Tracker"
href="https://issues.apache.org/jira/browse/OPENJPA"/>
- <item name="Wiki"
- href="http://wiki.apache.org/incubator/OpenJPA"/>
</menu>
<menu ref="parent"/>
