You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by mp...@apache.org on 2007/07/04 00:42:46 UTC
svn commit: r553010 [3/3] - in /openjpa/trunk: ./
openjpa-examples/src/main/java/hellojpa/
openjpa-examples/src/main/java/relations/
openjpa-jdbc-5/src/main/java/org/apache/openjpa/jdbc/meta/strats/
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/an...
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestSelectForUpdateOverride.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestSelectForUpdateOverride.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestSelectForUpdateOverride.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestSelectForUpdateOverride.java Tue Jul 3 15:42:39 2007
@@ -59,8 +59,8 @@
em.find(AllFieldTypes.class, 0);
assertEquals(1, sql.size());
if (dict instanceof DB2Dictionary) {
- if ((((DB2Dictionary)dict).getDb2ServerType() == 1)
- || (((DB2Dictionary)dict).getDb2ServerType()== 2)) {
+ if ((((DB2Dictionary) dict).getDb2ServerType() == 1)
+ || (((DB2Dictionary) dict).getDb2ServerType()== 2)) {
assertEquals(1, sql.size());
assertSQL("SELECT t0.booleanField, t0.byteField, "
+ "t0.charField, t0.dateField, t0.doubleField,"
@@ -70,8 +70,8 @@
+ " FOR UPDATE OF optimize for 1 row");
}
// it is DB2 v82 or later
- else if ((((DB2Dictionary)dict).getDb2ServerType() == 3)
- || (((DB2Dictionary)dict).getDb2ServerType() == 4)) {
+ else if ((((DB2Dictionary) dict).getDb2ServerType() == 3)
+ || (((DB2Dictionary) dict).getDb2ServerType() == 4)) {
assertEquals(1, sql.size());
assertSQL("SELECT t0.booleanField, t0.byteField, "
+ "t0.charField, t0.dateField, t0.doubleField,"
@@ -81,7 +81,7 @@
+ " FOR READ ONLY WITH RS USE AND KEEP UPDATE LOCKS"
+ " optimize for 1 row");
}
- else if (((DB2Dictionary)dict).getDb2ServerType() == 5) {
+ else if (((DB2Dictionary) dict).getDb2ServerType() == 5) {
assertEquals(1, sql.size());
assertSQL("SELECT t0.booleanField, t0.byteField, "
+ "t0.charField, t0.dateField, t0.doubleField,"
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ManyOneCompoundIdOwnerId.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ManyOneCompoundIdOwnerId.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ManyOneCompoundIdOwnerId.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ManyOneCompoundIdOwnerId.java Tue Jul 3 15:42:39 2007
@@ -30,7 +30,7 @@
static {
// register persistent class in JVM
try { Class.forName("org.apache.openjpa.persistence.relations.ManyOneCompoundIdOwner"); }
- catch(Exception e) {}
+ catch (Exception e) {}
}
public long entityId;
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestManyOneAsId.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestManyOneAsId.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestManyOneAsId.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestManyOneAsId.java Tue Jul 3 15:42:39 2007
@@ -343,7 +343,8 @@
+ "where e.longId = :cid and e.entityId.id = :id");
q.setParameter("cid", cid);
q.setParameter("id", id);
- ManyOneCompoundIdOwner pc = (ManyOneCompoundIdOwner)q.getSingleResult();
+ ManyOneCompoundIdOwner pc = (ManyOneCompoundIdOwner)
+ q.getSingleResult();
assertNotNull(pc);
assertEquals("cparent", pc.getName());
em.close();
Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java Tue Jul 3 15:42:39 2007
@@ -661,17 +661,17 @@
cls = cls.getEnclosingClass();
String rsrc = StringUtils.replace(cls.getName(), ".", "/");
- ClassLoader loader = (ClassLoader)AccessController.doPrivileged(
+ ClassLoader loader = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(cls));
if (loader == null)
- loader = (ClassLoader)AccessController.doPrivileged(
+ loader = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getSystemClassLoaderAction());
if (loader == null)
return null;
- URL url = (URL)AccessController.doPrivileged(
+ URL url = (URL) AccessController.doPrivileged(
J2DoPrivHelper.getResourceAction(loader, rsrc + ".java"));
if (url == null) {
- url = (URL)AccessController.doPrivileged(
+ url = (URL) AccessController.doPrivileged(
J2DoPrivHelper.getResourceAction(loader, rsrc + ".class"));
if (url == null)
return null;
@@ -756,7 +756,7 @@
else
meta.setDetachedState(detached.fieldName());
} else {
- Field[] fields = (Field[])AccessController.doPrivileged(
+ Field[] fields = (Field[]) AccessController.doPrivileged(
J2DoPrivHelper.getDeclaredFieldsAction(
meta.getDescribedType()));
for (int i = 0; i < fields.length; i++)
@@ -798,8 +798,8 @@
MethodKey key;
Set<MethodKey> seen = new HashSet<MethodKey>();
do {
- for (Method m : (Method[])AccessController.doPrivileged(
- J2DoPrivHelper.getDeclaredMethodsAction( sup ))) {
+ for (Method m : (Method[]) AccessController.doPrivileged(
+ J2DoPrivHelper.getDeclaredMethodsAction(sup))) {
mods = m.getModifiers();
if (Modifier.isStatic(mods) || Modifier.isFinal(mods) ||
Object.class.equals(m.getDeclaringClass()))
@@ -1050,7 +1050,7 @@
break;
case LOAD_FETCH_GROUP:
if (isMetaDataMode())
- fmd.setLoadFetchGroup(((LoadFetchGroup)anno).value());
+ fmd.setLoadFetchGroup(((LoadFetchGroup) anno).value());
break;
case LRS:
if (isMetaDataMode())
Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/MetaDataParsers.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/MetaDataParsers.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/MetaDataParsers.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/MetaDataParsers.java Tue Jul 3 15:42:39 2007
@@ -77,7 +77,7 @@
for (LifecycleCallbacks lc: callbacks) {
if (!(lc instanceof MethodLifecycleCallbacks))
continue;
- Method exists = ((MethodLifecycleCallbacks)lc).getCallbackMethod();
+ Method exists = ((MethodLifecycleCallbacks) lc).getCallbackMethod();
if (!exists.getDeclaringClass().equals(method.getDeclaringClass()))
continue;
Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataDefaults.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataDefaults.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataDefaults.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataDefaults.java Tue Jul 3 15:42:39 2007
@@ -252,11 +252,11 @@
return ClassMetaData.ACCESS_UNKNOWN;
int access = 0;
- if (usesAccess((Field[])AccessController.doPrivileged(
- J2DoPrivHelper.getDeclaredFieldsAction( cls ))))
+ if (usesAccess((Field[]) AccessController.doPrivileged(
+ J2DoPrivHelper.getDeclaredFieldsAction(cls))))
access |= ClassMetaData.ACCESS_FIELD;
- if (usesAccess((Method[])AccessController.doPrivileged(
- J2DoPrivHelper.getDeclaredMethodsAction( cls ))))
+ if (usesAccess((Method[]) AccessController.doPrivileged(
+ J2DoPrivHelper.getDeclaredMethodsAction(cls))))
access |= ClassMetaData.ACCESS_PROPERTY;
return (access == 0) ? getAccessType(cls.getSuperclass()) : access;
}
Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataFactory.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataFactory.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataFactory.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataFactory.java Tue Jul 3 15:42:39 2007
@@ -440,12 +440,12 @@
private File defaultXMLFile() {
ClassLoader loader = repos.getConfiguration().
getClassResolverInstance().getClassLoader(getClass(), null);
- URL rsrc = (URL)AccessController.doPrivileged(
+ URL rsrc = (URL) AccessController.doPrivileged(
J2DoPrivHelper.getResourceAction(loader, "META-INF/orm.xml"));
if (rsrc != null) {
File file = new File(rsrc.getFile());
- if (((Boolean)AccessController.doPrivileged(
- J2DoPrivHelper.existsAction( file ))).booleanValue())
+ if (((Boolean) AccessController.doPrivileged(
+ J2DoPrivHelper.existsAction(file))).booleanValue())
return file;
}
return new File("orm.xml");
Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java Tue Jul 3 15:42:39 2007
@@ -109,7 +109,7 @@
@Override
public boolean afterSpecificationSet(Configuration c) {
if (!(c instanceof OpenJPAConfigurationImpl)
- || !SPEC_JPA.equals(((OpenJPAConfiguration)c).getSpecification()))
+ || !SPEC_JPA.equals(((OpenJPAConfiguration) c).getSpecification()))
return false;
OpenJPAConfigurationImpl conf = (OpenJPAConfigurationImpl) c;
@@ -248,23 +248,23 @@
String name, Map m, ClassLoader loader, boolean explicit)
throws IOException {
if (loader == null)
- loader = (ClassLoader)AccessController.doPrivileged(
+ loader = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getContextClassLoaderAction());
Enumeration<URL> urls = null;
try {
- urls = (Enumeration)AccessController.doPrivileged(
+ urls = (Enumeration) AccessController.doPrivileged(
J2DoPrivHelper.getResourcesAction(loader, rsrc));
if (!urls.hasMoreElements()) {
if (!rsrc.startsWith("META-INF"))
- urls = (Enumeration)AccessController.doPrivileged(
+ urls = (Enumeration) AccessController.doPrivileged(
J2DoPrivHelper.getResourcesAction(
loader, "META-INF/" + rsrc));
if (!urls.hasMoreElements())
return null;
}
- } catch( PrivilegedActionException pae ) {
- throw (IOException)pae.getException();
+ } catch (PrivilegedActionException pae) {
+ throw (IOException) pae.getException();
}
ConfigurationParser parser = new ConfigurationParser(m);
@@ -346,7 +346,7 @@
return true;
if (loader == null)
- loader = (ClassLoader)AccessController.doPrivileged(
+ loader = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getContextClassLoaderAction());
try {
if (PersistenceProviderImpl.class.isAssignableFrom
Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceUnitInfoImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceUnitInfoImpl.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceUnitInfoImpl.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceUnitInfoImpl.java Tue Jul 3 15:42:39 2007
@@ -94,7 +94,7 @@
public ClassLoader getNewTempClassLoader() {
return new TemporaryClassLoader(
- (ClassLoader)AccessController.doPrivileged(
+ (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getContextClassLoaderAction()));
}
@@ -204,7 +204,7 @@
MultiClassLoader loader = new MultiClassLoader();
loader.addClassLoader(getClass().getClassLoader());
loader.addClassLoader(MultiClassLoader.THREAD_LOADER);
- URL url = (URL)AccessController.doPrivileged(
+ URL url = (URL) AccessController.doPrivileged(
J2DoPrivHelper.getResourceAction(loader, name));
if (url != null) {
addJarFile(url);
@@ -212,7 +212,7 @@
}
// jar file is not a resource; check classpath
- String[] cp = ((String)AccessController.doPrivileged(
+ String[] cp = ((String) AccessController.doPrivileged(
J2DoPrivHelper.getPropertyAction("java.class.path")))
.split(J2DoPrivHelper.getPathSeparator());
for (int i = 0; i < cp.length; i++) {
Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java Tue Jul 3 15:42:39 2007
@@ -1121,7 +1121,7 @@
}
} catch (Exception e) {
if (e instanceof PrivilegedActionException)
- e = ((PrivilegedActionException)e).getException();
+ e = ((PrivilegedActionException) e).getException();
throw getException(_loc.get("invalid-attr", name, meta), e);
}
Modified: openjpa/trunk/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLFileHandler.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLFileHandler.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLFileHandler.java (original)
+++ openjpa/trunk/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLFileHandler.java Tue Jul 3 15:42:39 2007
@@ -80,10 +80,10 @@
*/
public Collection load(ClassMetaData meta) {
File f = getFile(meta);
- if (!((Boolean)AccessController.doPrivileged(
- J2DoPrivHelper.existsAction( f ))).booleanValue() ||
- ((Long)AccessController.doPrivileged(
- J2DoPrivHelper.lengthAction( f ))).longValue() == 0)
+ if (!((Boolean) AccessController.doPrivileged(
+ J2DoPrivHelper.existsAction(f))).booleanValue() ||
+ ((Long) AccessController.doPrivileged(
+ J2DoPrivHelper.lengthAction(f))).longValue() == 0)
return Collections.EMPTY_SET;
try {
return read(f);
@@ -133,10 +133,10 @@
throw new InternalException();
File f = getFile(meta);
- if (!((Boolean)AccessController.doPrivileged(
- J2DoPrivHelper.existsAction( f.getParentFile() ))).booleanValue())
- AccessController.doPrivileged(
- J2DoPrivHelper.mkdirsAction( f.getParentFile() ));
+ if (!((Boolean) AccessController.doPrivileged(
+ J2DoPrivHelper.existsAction(f.getParentFile()))).booleanValue())
+ AccessController.doPrivileged(
+ J2DoPrivHelper.mkdirsAction(f.getParentFile()));
FileWriter fw = null;
try {
Modified: openjpa/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/pom.xml?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/pom.xml (original)
+++ openjpa/trunk/pom.xml Tue Jul 3 15:42:39 2007
@@ -1,347 +1,347 @@
-<?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">
- <modelVersion>4.0.0</modelVersion>
- <prerequisites>
- <maven>2.0.4</maven>
- </prerequisites>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-parent</artifactId>
- <packaging>pom</packaging>
- <name>OpenJPA</name>
- <description>OpenJPA</description>
-
- <properties>
- <scm.dir>svn.apache.org/repos/asf/openjpa/trunk</scm.dir>
- </properties>
-
- <!--
- Changing this version needs to also be done in all children poms
- See: http://jira.codehaus.org/browse/MNG-624
- -->
- <version>1.0.0-SNAPSHOT</version>
- <url>http://incubator.apache.org/projects/openjpa</url>
- <issueManagement>
- <system>jira</system>
- <url>http://issues.apache.org/jira/browse/OPENJPA</url>
- </issueManagement>
- <inceptionYear>2006</inceptionYear>
- <mailingLists>
- <mailingList>
- <name>OpenJPA Developer List</name>
- <subscribe>open-jpa-dev-subscribe@incubator.apache.org</subscribe>
- <unsubscribe>open-jpa-dev-unsubscribe@incubator.apache.org</unsubscribe>
- <post>open-jpa-dev@incubator.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/incubator-open-jpa-dev/</archive>
- </mailingList>
- <mailingList>
- <name>OpenJPA Commits List</name>
- <subscribe>open-jpa-commits-subscribe@incubator.apache.org</subscribe>
- <unsubscribe>open-jpa-commits-unsubscribe@incubator.apache.org</unsubscribe>
- <post>open-jpa-commits@incubator.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/incubator-open-jpa-commits/</archive>
- </mailingList>
- </mailingLists>
- <developers>
- <developer>
- <name>Patrick Linskey</name>
- <id>plinskey</id>
- <organization>BEA Systems, Inc.</organization>
- <email>plinskey@bea.com</email>
- </developer>
- <developer>
- <name>Abe White</name>
- <id>awhite</id>
- <organization>BEA Systems, Inc.</organization>
- <email>awhite@bea.com</email>
- </developer>
- <developer>
- <name>Steve Kim</name>
- <id>stkim</id>
- <organization>BEA Systems, Inc.</organization>
- <email>stkim@bea.com</email>
- </developer>
- <developer>
- <name>Marc Prud'hommeaux</name>
- <id>mprudhom</id>
- <organization>BEA Systems, Inc.</organization>
- <email>mprudhom@bea.com</email>
- </developer>
- </developers>
- <licenses>
- <license>
- <name>Apache Software License 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <organization>
- <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>
- <module>openjpa-jdbc</module>
- <module>openjpa-xmlstore</module>
- <module>openjpa-all</module>
- <module>openjpa-project</module>
- <module>openjpa-integration</module>
- </modules>
- <profiles>
- <profile>
- <id>jdk1.5</id>
- <activation>
- <jdk>1.5</jdk>
- </activation>
- <modules>
- <module>openjpa-persistence</module>
- <module>openjpa-persistence-jdbc</module>
- <module>openjpa-kernel-5</module>
- <module>openjpa-jdbc-5</module>
- <module>openjpa-examples</module>
- </modules>
- </profile>
- <profile>
- <id>release</id>
- <activation>
- <property>
- <name>release</name>
- </property>
- </activation>
- <modules>
- <module>openjpa-project</module>
- </modules>
- </profile>
-
- <!--
- Generate the documentation using the YDoc UML generation plugin.
- Assumes you have the YDoc libraries locally, as well as a valid
- YDoc license file. Example usage for building the docs:
-
- mvn process-classes -Pydoc-profile,javadoc-profile -Dydoc.home=${HOME}/.m2/privaterepos/ydoc/ydoc-2.2_04-jdk1.5 -Dydoc.license=${HOME}/.m2/privaterepos/ydoc/ydoc.license
- -->
- <profile>
- <id>ydoc-profile</id>
- <properties>
- <javadoc.additionalparam>
- -generic
- -umlautogen
- -tag param
- -tag return
- -tag see
- -ytag y.uml
- -license ${ydoc.license}
- -filter ydoc.filters.ExcludeFilter
- -filterpath ${ydoc.home}/lib/ydoc.jar
- -doclet ydoc.doclets.YStandard
- -docletpath ${ydoc.home}/lib/ydoc.jar${path.separator}${ydoc.home}/lib/class2svg.jar${path.separator}${ydoc.home}/resources
- ${ydoc.params}
- </javadoc.additionalparam>
- </properties>
- </profile>
-
- <profile>
- <!--
- Javadoc profile. Docs can be built by running:
- mvn process-resources -Dtest=false -Pjavadoc-profile
- -->
- <id>javadoc-profile</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.2</version>
- <executions>
- <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>
- <!-- <linksource>true</linksource> -->
- <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>
- </plugins>
- </build>
- <activation>
- <property>
- <name>builddocs</name>
- <value>true</value>
- </property>
- </activation>
- </profile>
-
- <profile>
- <id>enable-security</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <properties>
- <test.env>-Dtest.basedir=${basedir}/..</test.env>
- <policy.file>${basedir}/../openjpa-persistence-jdbc/src/test/resources/j2.security.test.policy</policy.file>
- <surefire.jvm.args>-Djava.security.manager -Djava.security.policy=${policy.file} ${test.env}</surefire.jvm.args>
- </properties>
- </profile>
-
- </profiles>
-
- <repositories>
- <repository>
- <id>central</id>
- <name>Maven Repository Switchboard</name>
- <url>http://www.ibiblio.org/maven2</url>
- </repository>
- <repository>
- <id>java.net</id>
- <url>https://maven-repository.dev.java.net/nonav/repository</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <!-- also include license and notice files in all the jars -->
- <resource>
- <directory>${basedir}/../openjpa-project/</directory>
- <includes>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- <include>DISCLAIMER.txt</include>
- </includes>
- <targetPath>META-INF</targetPath>
- </resource>
- </resources>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <argLine>${surefire.jvm.args}</argLine>
- <useFile>false</useFile>
- <trimStackTrace>false</trimStackTrace>
- <useSystemClassLoader>true</useSystemClassLoader>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>jdepend-maven-plugin</report>
- <!-- <report>jxr-maven-plugin</report> -->
- <report>surefire-report-maven-plugin</report>
- <report>maven-javadoc-plugin</report>
- <report>project-team</report>
- <report>mailing-list</report>
- <report>issue-tracking</report>
- <report>license</report>
- <report>scm</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
-
-
- <distributionManagement>
- <repository>
- <id>people.apache.org</id>
- <url>scp://people.apache.org/www/people.apache.org/repo/m2-incubating-repository/</url>
- </repository>
- <snapshotRepository>
- <id>people.apache.org</id>
- <url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository/</url>
- <uniqueVersion>false</uniqueVersion>
- </snapshotRepository>
- <site>
- <id>people.apache.org</id>
- <url>scpexe://people.apache.org/home/mprudhom/public_html/openjpa/site/</url>
- </site>
- </distributionManagement>
-</project>
+<?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">
+ <modelVersion>4.0.0</modelVersion>
+ <prerequisites>
+ <maven>2.0.4</maven>
+ </prerequisites>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-parent</artifactId>
+ <packaging>pom</packaging>
+ <name>OpenJPA</name>
+ <description>OpenJPA</description>
+
+ <properties>
+ <scm.dir>svn.apache.org/repos/asf/openjpa/trunk</scm.dir>
+ </properties>
+
+ <!--
+ Changing this version needs to also be done in all children poms
+ See: http://jira.codehaus.org/browse/MNG-624
+ -->
+ <version>1.0.0-SNAPSHOT</version>
+ <url>http://incubator.apache.org/projects/openjpa</url>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://issues.apache.org/jira/browse/OPENJPA</url>
+ </issueManagement>
+ <inceptionYear>2006</inceptionYear>
+ <mailingLists>
+ <mailingList>
+ <name>OpenJPA Developer List</name>
+ <subscribe>open-jpa-dev-subscribe@incubator.apache.org</subscribe>
+ <unsubscribe>open-jpa-dev-unsubscribe@incubator.apache.org</unsubscribe>
+ <post>open-jpa-dev@incubator.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/incubator-open-jpa-dev/</archive>
+ </mailingList>
+ <mailingList>
+ <name>OpenJPA Commits List</name>
+ <subscribe>open-jpa-commits-subscribe@incubator.apache.org</subscribe>
+ <unsubscribe>open-jpa-commits-unsubscribe@incubator.apache.org</unsubscribe>
+ <post>open-jpa-commits@incubator.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/incubator-open-jpa-commits/</archive>
+ </mailingList>
+ </mailingLists>
+ <developers>
+ <developer>
+ <name>Patrick Linskey</name>
+ <id>plinskey</id>
+ <organization>BEA Systems, Inc.</organization>
+ <email>plinskey@bea.com</email>
+ </developer>
+ <developer>
+ <name>Abe White</name>
+ <id>awhite</id>
+ <organization>BEA Systems, Inc.</organization>
+ <email>awhite@bea.com</email>
+ </developer>
+ <developer>
+ <name>Steve Kim</name>
+ <id>stkim</id>
+ <organization>BEA Systems, Inc.</organization>
+ <email>stkim@bea.com</email>
+ </developer>
+ <developer>
+ <name>Marc Prud'hommeaux</name>
+ <id>mprudhom</id>
+ <organization>BEA Systems, Inc.</organization>
+ <email>mprudhom@bea.com</email>
+ </developer>
+ </developers>
+ <licenses>
+ <license>
+ <name>Apache Software License 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <organization>
+ <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>
+ <module>openjpa-jdbc</module>
+ <module>openjpa-xmlstore</module>
+ <module>openjpa-all</module>
+ <module>openjpa-project</module>
+ <module>openjpa-integration</module>
+ </modules>
+ <profiles>
+ <profile>
+ <id>jdk1.5</id>
+ <activation>
+ <jdk>1.5</jdk>
+ </activation>
+ <modules>
+ <module>openjpa-persistence</module>
+ <module>openjpa-persistence-jdbc</module>
+ <module>openjpa-kernel-5</module>
+ <module>openjpa-jdbc-5</module>
+ <module>openjpa-examples</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>release</id>
+ <activation>
+ <property>
+ <name>release</name>
+ </property>
+ </activation>
+ <modules>
+ <module>openjpa-project</module>
+ </modules>
+ </profile>
+
+ <!--
+ Generate the documentation using the YDoc UML generation plugin.
+ Assumes you have the YDoc libraries locally, as well as a valid
+ YDoc license file. Example usage for building the docs:
+
+ mvn process-classes -Pydoc-profile,javadoc-profile -Dydoc.home=${HOME}/.m2/privaterepos/ydoc/ydoc-2.2_04-jdk1.5 -Dydoc.license=${HOME}/.m2/privaterepos/ydoc/ydoc.license
+ -->
+ <profile>
+ <id>ydoc-profile</id>
+ <properties>
+ <javadoc.additionalparam>
+ -generic
+ -umlautogen
+ -tag param
+ -tag return
+ -tag see
+ -ytag y.uml
+ -license ${ydoc.license}
+ -filter ydoc.filters.ExcludeFilter
+ -filterpath ${ydoc.home}/lib/ydoc.jar
+ -doclet ydoc.doclets.YStandard
+ -docletpath ${ydoc.home}/lib/ydoc.jar${path.separator}${ydoc.home}/lib/class2svg.jar${path.separator}${ydoc.home}/resources
+ ${ydoc.params}
+ </javadoc.additionalparam>
+ </properties>
+ </profile>
+
+ <profile>
+ <!--
+ Javadoc profile. Docs can be built by running:
+ mvn process-resources -Dtest=false -Pjavadoc-profile
+ -->
+ <id>javadoc-profile</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <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>
+ <!-- <linksource>true</linksource> -->
+ <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>
+ </plugins>
+ </build>
+ <activation>
+ <property>
+ <name>builddocs</name>
+ <value>true</value>
+ </property>
+ </activation>
+ </profile>
+
+ <profile>
+ <id>enable-security</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <test.env>-Dtest.basedir=${basedir}/..</test.env>
+ <policy.file>${basedir}/../openjpa-persistence-jdbc/src/test/resources/j2.security.test.policy</policy.file>
+ <surefire.jvm.args>-Djava.security.manager -Djava.security.policy=${policy.file} ${test.env}</surefire.jvm.args>
+ </properties>
+ </profile>
+
+ </profiles>
+
+ <repositories>
+ <repository>
+ <id>central</id>
+ <name>Maven Repository Switchboard</name>
+ <url>http://www.ibiblio.org/maven2</url>
+ </repository>
+ <repository>
+ <id>java.net</id>
+ <url>https://maven-repository.dev.java.net/nonav/repository</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <!-- also include license and notice files in all the jars -->
+ <resource>
+ <directory>${basedir}/../openjpa-project/</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ <include>DISCLAIMER.txt</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <argLine>${surefire.jvm.args}</argLine>
+ <useFile>false</useFile>
+ <trimStackTrace>false</trimStackTrace>
+ <useSystemClassLoader>true</useSystemClassLoader>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>jdepend-maven-plugin</report>
+ <!-- <report>jxr-maven-plugin</report> -->
+ <report>surefire-report-maven-plugin</report>
+ <report>maven-javadoc-plugin</report>
+ <report>project-team</report>
+ <report>mailing-list</report>
+ <report>issue-tracking</report>
+ <report>license</report>
+ <report>scm</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+
+
+ <distributionManagement>
+ <repository>
+ <id>people.apache.org</id>
+ <url>scp://people.apache.org/www/people.apache.org/repo/m2-incubating-repository/</url>
+ </repository>
+ <snapshotRepository>
+ <id>people.apache.org</id>
+ <url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository/</url>
+ <uniqueVersion>false</uniqueVersion>
+ </snapshotRepository>
+ <site>
+ <id>people.apache.org</id>
+ <url>scpexe://people.apache.org/home/mprudhom/public_html/openjpa/site/</url>
+ </site>
+ </distributionManagement>
+</project>