Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use latest stable releases of commmons dependencies. Add missing localized msg. 

git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@427784 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
A. Abram White 2006-08-01 23:09:17 +00:00
parent 021c4b85d5
commit a98213071a
14 changed files with 34 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
openjpa-jdbc-5/pom.xml
View File

@ -5,7 +5,6 @@
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-jdbc-5</artifactId>
<packaging>jar</packaging>
<name>JDBC 1.5</name>
<description>JDBC 1.5</description>
<url>http://incubator.apache.org/projects/openjpa</url>
@ -15,35 +14,23 @@
<version>0.9.0</version>
</parent>
<dependencies>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-jdbc</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
</plugins>
</build>
</project>

15
openjpa-jdbc/pom.xml
View File

@ -5,7 +5,6 @@
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-jdbc</artifactId>
<packaging>jar</packaging>
<name>JDBC</name>
<description>JDBC</description>
<url>http://incubator.apache.org/projects/openjpa</url>
@ -15,43 +14,29 @@
<version>0.9.0</version>
</parent>
<dependencies>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-kernel</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>1.8.0.1</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.3</source>
<target>1.3</target>
</configuration>
</plugin>
</plugins>
</build>
</project>

3
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java
View File

@ -1054,8 +1054,7 @@ public class MappingTool
instances[i] = (ImportExport) types[i].newInstance();
return instances;
} catch (Throwable t) {
throw new InternalException(_loc.get("importexport-instantiate"),
t);
throw new InternalException(_loc.get("importexport-instantiate"),t);
}
}

6
openjpa-kernel-5/pom.xml
View File

@ -5,7 +5,6 @@
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-kernel-5</artifactId>
<packaging>jar</packaging>
<name>Kernel 1.5</name>
<description>Kernel 1.5</description>
<url>http://incubator.apache.org/projects/openjpa</url>
@ -15,16 +14,12 @@
<version>0.9.0</version>
</parent>
<dependencies>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-kernel</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
@ -36,7 +31,6 @@
<target>1.5</target>
</configuration>
</plugin>
<!-- create enhancer pre-main attribute -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>

28
openjpa-kernel/pom.xml
View File

@ -5,7 +5,6 @@
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-kernel</artifactId>
<packaging>jar</packaging>
<name>Kernel</name>
<description>Kernel</description>
<url>http://incubator.apache.org/projects/openjpa</url>
@ -15,58 +14,46 @@
<version>0.9.0</version>
</parent>
<dependencies>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-lib</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
<version>1.0.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
<version>1.0.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.0.1B_spec</artifactId>
<version>1.0.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>1.3</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.3</source>
<target>1.3</target>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@ -119,8 +106,5 @@
</executions>
</plugin>
</plugins>
</build>
</project>

5
openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java
View File

@ -950,10 +950,7 @@ public class QueryImpl
return toResult(ex, rop, lrs);
} catch (Exception e) {
if (rop != null)
try {
rop.close();
} catch (Exception e2) {
}
try { rop.close(); } catch (Exception e2) {}
throw e;
}
}

5
openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.java
View File

@ -463,9 +463,12 @@ public class FieldMetaData
* <li>{@link #MANAGE_TRANSACTIONAL}: the field is transactional but not
* persistent</li>
* <li>{@link #MANAGE_NONE}: the field is not managed</li>
* </ul> Defaults to {@link #MANAGE_PERSISTENT}.
* </ul>
* Defaults to {@link #MANAGE_PERSISTENT}.
*/
public void setManagement(int manage) {
if ((_manage == MANAGE_NONE) != (manage == MANAGE_NONE))
_owner.clearFieldCache();
_manage = manage;
}

14
openjpa-kernel/src/main/resources/org/apache/openjpa/kernel/localizer.properties
View File

@ -282,12 +282,12 @@ pack-instantiation-err: There was an error creating an instance of type "{0}" \
that you have defined a public no-args constructor in "{0}".
bad-inmem-method: Method "{0}(StoreContext, ClassMetaData, boolean, Object, \
Map, FetchConfiguration)" is not declared in type "{1}". \
Check the method name supplied in your org.apache.openjpa.MethodQL query filter. \
OpenJPA is attempting to execute this query in-memory; if you implemented the \
datastore method instead (a method with the same signature but without the \
Object argument) and want this query to execute in the datastore, either \
make the query before modifying objects in the current transaction, \
set IgnoreCache to true, or set the org.apache.openjpa.FlushBeforeQueries property to \
Check the method name supplied in your MethodQL query filter. \
OpenJPA is attempting to execute this query in-memory; if you implemented \
the datastore method instead (a method with the same signature but without \
the Object argument) and want this query to execute in the datastore, \
either make the query before modifying objects in the current transaction, \
set IgnoreCache to true, or set the openjpa.FlushBeforeQueries property to \
true.
bad-datastore-method: Method "{0}(StoreContext, ClassMetaData, boolean, Map, \
FetchConfiguration)" is not declared in type "{1}". Check \
@ -328,3 +328,5 @@ no-expressions: The query cannot be executed because it has no \
valid expressions.
null-fg: Attempt to add null/empty fetch group name to fetch configuration.
null-field: Attempt to add null/empty field name to fetch configuration.
container-projection: Query projections cannot include array, collection, or \
map fields. Invalid query: "{0}"

9
openjpa-lib/pom.xml
View File

@ -5,7 +5,6 @@
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-lib</artifactId>
<packaging>jar</packaging>
<name>Utilities</name>
<description>Utilities</description>
<url>http://incubator.apache.org/projects/openjpa</url>
@ -54,13 +53,7 @@
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>1.2</version>
<version>3.2</version>
<scope>compile</scope>
</dependency>
<dependency>

29
openjpa-persistence-jdbc/pom.xml
View File

@ -5,7 +5,6 @@
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId>
<packaging>jar</packaging>
<name>JPA JDBC</name>
<description>JPA JDBC</description>
<url>http://incubator.apache.org/projects/openjpa</url>
@ -15,62 +14,46 @@
<version>0.9.0</version>
</parent>
<dependencies>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-jdbc-5</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.1.3.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>1.2.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.1</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<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>
<artifactId>maven-antrun-plugin</artifactId>
@ -80,21 +63,18 @@
<configuration>
<tasks>
<path id="enhance.path.ref">
<fileset
dir="${project.build.testOutputDirectory}">
<fileset dir="${project.build.testOutputDirectory}">
<include name="**/*.class"/>
</fileset>
</path>
<pathconvert property="enhance.files"
refid="enhance.path.ref"
pathsep=" "/>
<java
classname="org.apache.openjpa.enhance.PCEnhancer">
<java classname="org.apache.openjpa.enhance.PCEnhancer">
<arg line="-p persistence.xml"/>
<arg line="${enhance.files}"/>
<classpath>
<path
refid="maven.dependency.classpath"/>
<path refid="maven.dependency.classpath"/>
<path refid="maven.compile.classpath"/>
<path refid="maven.test.classpath"/>
</classpath>
@ -107,9 +87,6 @@
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

15
openjpa-persistence/pom.xml
View File

@ -5,7 +5,6 @@
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence</artifactId>
<packaging>jar</packaging>
<name>JPA</name>
<description>JPA</description>
<url>http://incubator.apache.org/projects/openjpa</url>
@ -15,43 +14,29 @@
<version>0.9.0</version>
</parent>
<dependencies>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-kernel-5</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
<version>1.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
</plugins>
</build>
</project>

9
openjpa-project/pom.xml
View File

@ -17,7 +17,6 @@
<artifactId>openjpa</artifactId>
<version>0.9.0</version>
</parent>
<build>
<!-- needed to let maven pass the "compile" phase -->
<testSourceDirectory>/none/</testSourceDirectory>
@ -33,7 +32,6 @@
</resources>
<plugins>
<!-- build the docs when creating the site from docbook source -->
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
@ -64,7 +62,6 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
@ -98,9 +95,9 @@
</plugin>
<!--
copy over site files from src/site to target/filtered-site
Copy over site files from src/site to target/filtered-site
so we can filter resources and include other generated
content from the openjpa-project module
content from the openjpa-project module.
-->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
@ -126,7 +123,6 @@
</plugins>
</build>
<!-- need to explicitly list dependencies for assembly to work -->
<dependencies>
<dependency>
@ -177,7 +173,6 @@
<version>10.1.3.1</version>
</dependency>
<!-- jars needed for for docbook -->
<dependency>
<groupId>ant</groupId>

13
openjpa-xmlstore/pom.xml
View File

@ -5,7 +5,6 @@
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-xmlstore</artifactId>
<packaging>jar</packaging>
<name>XML Store</name>
<description>XML Store for OpenJPA</description>
<url>http://incubator.apache.org/projects/openjpa</url>
@ -15,35 +14,23 @@
<version>0.9.0</version>
</parent>
<dependencies>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-kernel</artifactId>
<version>${pom.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.3</source>
<target>1.3</target>
</configuration>
</plugin>
</plugins>
</build>
</project>

40
pom.xml
View File

@ -10,18 +10,14 @@
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
<packaging>pom</packaging>
<name>OpenJPA</name>
<description>OpenJPA</description>
<!--
Changing this version needs to also be done in all children poms
See: http://jira.codehaus.org/browse/MNG-624
-->
<version>0.9.0</version>
<url>http://incubator.apache.org/projects/openjpa</url>
<issueManagement>
<system>jira</system>
<url>http://issues.apache.org/jira/browse/OPENJPA</url>
@ -31,21 +27,16 @@
<mailingList>
<name>OpenJPA Developer List</name>
<subscribe>open-jpa-dev-subscribe@incubator.apache.org</subscribe>
<unsubscribe>
open-jpa-dev-unsubscribe@incubator.apache.org</unsubscribe>
<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>
<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>
<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>
<archive>http://mail-archives.apache.org/mod_mbox/incubator-open-jpa-commits/</archive>
</mailingList>
</mailingLists>
<developers>
@ -86,14 +77,10 @@
<url>http://www.apache.org</url>
</organization>
<scm>
<connection>
scm:svn:http://svn.apache.org/repos/asf/incubator/openjpa/trunk</connection>
<developerConnection>
scm:svn:https://svn.apache.org/repos/asf/incubator/openjpa/trunk</developerConnection>
<url>
https://svn.apache.org/repos/asf/incubator/openjpa/trunk</url>
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/openjpa/trunk</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/openjpa/trunk</developerConnection>
<url>https://svn.apache.org/repos/asf/incubator/openjpa/trunk</url>
</scm>
<modules>
<module>openjpa-lib</module>
<module>openjpa-kernel</module>
@ -101,7 +88,6 @@
<module>openjpa-xmlstore</module>
<module>openjpa-project</module>
</modules>
<profiles>
<profile>
<id>jdk1.5</id>
@ -115,7 +101,6 @@
<module>openjpa-jdbc-5</module>
</modules>
</profile>
<profile>
<id>release</id>
<activation>
@ -128,7 +113,6 @@
</modules>
</profile>
</profiles>
<repositories>
<repository>
<id>central</id>
@ -155,7 +139,6 @@
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
@ -166,7 +149,6 @@
<target>1.5</target>
</configuration>
</plugin>
<!--
get the svn revision number and set it in the
project.revision setting - disabled for now
@ -195,10 +177,8 @@
</executions>
</plugin>
-->
</plugins>
</build>
<reporting>
<plugins>
<plugin>
@ -226,8 +206,6 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
</plugin>
<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@ -244,8 +222,6 @@
</configuration>
</plugin>
-->
</plugins>
</reporting>
<distributionManagement>