From a98213071a3b218813ea11c6a69d276945ef13e3 Mon Sep 17 00:00:00 2001 From: "A. Abram White" Date: Tue, 1 Aug 2006 23:09:17 +0000 Subject: [PATCH] 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 --- openjpa-jdbc-5/pom.xml | 13 ------ openjpa-jdbc/pom.xml | 15 ------- .../apache/openjpa/jdbc/meta/MappingTool.java | 3 +- openjpa-kernel-5/pom.xml | 6 --- openjpa-kernel/pom.xml | 28 +++---------- .../org/apache/openjpa/kernel/QueryImpl.java | 5 +-- .../apache/openjpa/meta/FieldMetaData.java | 5 ++- .../openjpa/kernel/localizer.properties | 14 ++++--- openjpa-lib/pom.xml | 9 +---- openjpa-persistence-jdbc/pom.xml | 29 ++------------ openjpa-persistence/pom.xml | 15 ------- openjpa-project/pom.xml | 9 +---- openjpa-xmlstore/pom.xml | 13 ------ pom.xml | 40 ++++--------------- 14 files changed, 34 insertions(+), 170 deletions(-) diff --git a/openjpa-jdbc-5/pom.xml b/openjpa-jdbc-5/pom.xml index 3453871f0..844dc2625 100644 --- a/openjpa-jdbc-5/pom.xml +++ b/openjpa-jdbc-5/pom.xml @@ -5,7 +5,6 @@ org.apache.openjpa openjpa-jdbc-5 jar - JDBC 1.5 JDBC 1.5 http://incubator.apache.org/projects/openjpa @@ -15,35 +14,23 @@ 0.9.0 - - org.apache.openjpa openjpa-jdbc ${pom.version} compile - - - - - org.apache.maven.plugins maven-compiler-plugin 1.5 1.5 - - - - - diff --git a/openjpa-jdbc/pom.xml b/openjpa-jdbc/pom.xml index 066c07bd9..a0c8b84c8 100644 --- a/openjpa-jdbc/pom.xml +++ b/openjpa-jdbc/pom.xml @@ -5,7 +5,6 @@ org.apache.openjpa openjpa-jdbc jar - JDBC JDBC http://incubator.apache.org/projects/openjpa @@ -15,43 +14,29 @@ 0.9.0 - - org.apache.openjpa openjpa-kernel ${pom.version} compile - - hsqldb hsqldb 1.8.0.1 compile - - - - - org.apache.maven.plugins maven-compiler-plugin 1.3 1.3 - - - - - diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java index f8f7919ed..27e10ae35 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java @@ -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); } } diff --git a/openjpa-kernel-5/pom.xml b/openjpa-kernel-5/pom.xml index 4c728ab07..d31a56e38 100644 --- a/openjpa-kernel-5/pom.xml +++ b/openjpa-kernel-5/pom.xml @@ -5,7 +5,6 @@ org.apache.openjpa openjpa-kernel-5 jar - Kernel 1.5 Kernel 1.5 http://incubator.apache.org/projects/openjpa @@ -15,16 +14,12 @@ 0.9.0 - - org.apache.openjpa openjpa-kernel ${pom.version} compile - - @@ -36,7 +31,6 @@ 1.5 - org.apache.maven.plugins diff --git a/openjpa-kernel/pom.xml b/openjpa-kernel/pom.xml index 575fec701..859f01459 100644 --- a/openjpa-kernel/pom.xml +++ b/openjpa-kernel/pom.xml @@ -5,7 +5,6 @@ org.apache.openjpa openjpa-kernel jar - Kernel Kernel http://incubator.apache.org/projects/openjpa @@ -15,58 +14,46 @@ 0.9.0 - - org.apache.openjpa openjpa-lib ${pom.version} compile - - - - org.apache.geronimo.specs geronimo-jms_1.1_spec 1.0.1 compile - - org.apache.geronimo.specs geronimo-j2ee-connector_1.5_spec 1.0.1 compile - - - org.apache.geronimo.specs geronimo-jta_1.0.1B_spec 1.0.1 compile - - - + + commons-pool + commons-pool + 1.3 + compile + - - - org.apache.maven.plugins maven-compiler-plugin 1.3 1.3 - org.codehaus.mojo @@ -119,8 +106,5 @@ - - - diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java index e0bbd3ae4..2293e6473 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java @@ -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; } } diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.java index f1800f8d4..bcadaf92d 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.java @@ -463,9 +463,12 @@ public class FieldMetaData *
  • {@link #MANAGE_TRANSACTIONAL}: the field is transactional but not * persistent
  • *
  • {@link #MANAGE_NONE}: the field is not managed
  • - * Defaults to {@link #MANAGE_PERSISTENT}. + * + * Defaults to {@link #MANAGE_PERSISTENT}. */ public void setManagement(int manage) { + if ((_manage == MANAGE_NONE) != (manage == MANAGE_NONE)) + _owner.clearFieldCache(); _manage = manage; } diff --git a/openjpa-kernel/src/main/resources/org/apache/openjpa/kernel/localizer.properties b/openjpa-kernel/src/main/resources/org/apache/openjpa/kernel/localizer.properties index b4c06c3a9..05e085a7d 100644 --- a/openjpa-kernel/src/main/resources/org/apache/openjpa/kernel/localizer.properties +++ b/openjpa-kernel/src/main/resources/org/apache/openjpa/kernel/localizer.properties @@ -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}" diff --git a/openjpa-lib/pom.xml b/openjpa-lib/pom.xml index 2891b6876..119bce1e6 100644 --- a/openjpa-lib/pom.xml +++ b/openjpa-lib/pom.xml @@ -5,7 +5,6 @@ org.apache.openjpa openjpa-lib jar - Utilities Utilities http://incubator.apache.org/projects/openjpa @@ -54,13 +53,7 @@ commons-collections commons-collections - 3.1 - compile - - - commons-pool - commons-pool - 1.2 + 3.2 compile diff --git a/openjpa-persistence-jdbc/pom.xml b/openjpa-persistence-jdbc/pom.xml index 8af7ef094..da5241132 100644 --- a/openjpa-persistence-jdbc/pom.xml +++ b/openjpa-persistence-jdbc/pom.xml @@ -5,7 +5,6 @@ org.apache.openjpa openjpa-persistence-jdbc jar - JPA JDBC JPA JDBC http://incubator.apache.org/projects/openjpa @@ -15,62 +14,46 @@ 0.9.0 - - org.apache.openjpa openjpa-jdbc-5 ${pom.version} compile - - org.apache.openjpa openjpa-persistence ${pom.version} compile - - org.apache.derby derby 10.1.3.1 test - - commons-dbcp commons-dbcp 1.2.1 test - - commons-collections commons-collections 3.1 test - - - - - org.apache.maven.plugins maven-compiler-plugin 1.5 1.5 - maven-antrun-plugin @@ -80,21 +63,18 @@ - + - + - + @@ -107,9 +87,6 @@ - - - diff --git a/openjpa-persistence/pom.xml b/openjpa-persistence/pom.xml index 3a5b3cc3b..4741683dc 100644 --- a/openjpa-persistence/pom.xml +++ b/openjpa-persistence/pom.xml @@ -5,7 +5,6 @@ org.apache.openjpa openjpa-persistence jar - JPA JPA http://incubator.apache.org/projects/openjpa @@ -15,43 +14,29 @@ 0.9.0 - - org.apache.openjpa openjpa-kernel-5 ${pom.version} compile - - javax.persistence persistence-api 1.0 compile - - - - - org.apache.maven.plugins maven-compiler-plugin 1.5 1.5 - - - - - diff --git a/openjpa-project/pom.xml b/openjpa-project/pom.xml index d6a34bb32..f9cc0918f 100644 --- a/openjpa-project/pom.xml +++ b/openjpa-project/pom.xml @@ -17,7 +17,6 @@ openjpa 0.9.0 - /none/ @@ -33,7 +32,6 @@ - maven-antrun-plugin @@ -64,7 +62,6 @@ - maven-assembly-plugin @@ -98,9 +95,9 @@ maven-resources-plugin @@ -126,7 +123,6 @@ - @@ -177,7 +173,6 @@ 10.1.3.1 - ant diff --git a/openjpa-xmlstore/pom.xml b/openjpa-xmlstore/pom.xml index 91eb64c82..c82df50de 100644 --- a/openjpa-xmlstore/pom.xml +++ b/openjpa-xmlstore/pom.xml @@ -5,7 +5,6 @@ org.apache.openjpa openjpa-xmlstore jar - XML Store XML Store for OpenJPA http://incubator.apache.org/projects/openjpa @@ -15,35 +14,23 @@ 0.9.0 - - org.apache.openjpa openjpa-kernel ${pom.version} compile - - - - - org.apache.maven.plugins maven-compiler-plugin 1.3 1.3 - - - - - diff --git a/pom.xml b/pom.xml index da331126e..8817772ae 100644 --- a/pom.xml +++ b/pom.xml @@ -10,18 +10,14 @@ org.apache.openjpa openjpa pom - OpenJPA OpenJPA - 0.9.0 - http://incubator.apache.org/projects/openjpa - jira http://issues.apache.org/jira/browse/OPENJPA @@ -31,21 +27,16 @@ OpenJPA Developer List open-jpa-dev-subscribe@incubator.apache.org - - open-jpa-dev-unsubscribe@incubator.apache.org + open-jpa-dev-unsubscribe@incubator.apache.org open-jpa-dev@incubator.apache.org - - http://mail-archives.apache.org/mod_mbox/incubator-open-jpa-dev/ + http://mail-archives.apache.org/mod_mbox/incubator-open-jpa-dev/ OpenJPA Commits List - - open-jpa-commits-subscribe@incubator.apache.org - - open-jpa-commits-unsubscribe@incubator.apache.org + open-jpa-commits-subscribe@incubator.apache.org + open-jpa-commits-unsubscribe@incubator.apache.org open-jpa-commits@incubator.apache.org - - http://mail-archives.apache.org/mod_mbox/incubator-open-jpa-commits/ + http://mail-archives.apache.org/mod_mbox/incubator-open-jpa-commits/ @@ -86,14 +77,10 @@ http://www.apache.org - - scm:svn:http://svn.apache.org/repos/asf/incubator/openjpa/trunk - - scm:svn:https://svn.apache.org/repos/asf/incubator/openjpa/trunk - - https://svn.apache.org/repos/asf/incubator/openjpa/trunk + scm:svn:http://svn.apache.org/repos/asf/incubator/openjpa/trunk + scm:svn:https://svn.apache.org/repos/asf/incubator/openjpa/trunk + https://svn.apache.org/repos/asf/incubator/openjpa/trunk - openjpa-lib openjpa-kernel @@ -101,7 +88,6 @@ openjpa-xmlstore openjpa-project - jdk1.5 @@ -115,7 +101,6 @@ openjpa-jdbc-5 - release @@ -128,7 +113,6 @@ - central @@ -155,7 +139,6 @@ compile - @@ -166,7 +149,6 @@ 1.5 - - - @@ -226,8 +206,6 @@ org.codehaus.mojo taglist-maven-plugin - - - -