Author: dkulp
Date: Thu Jun 5 17:31:54 2014
New Revision: 1600709
URL: http://svn.apache.org/r1600709
Log:
JPA build with Java 6
JPA build with Maven 3.2.1
Modified:
aries/trunk/jpa/jpa-api/pom.xml
aries/trunk/jpa/jpa-blueprint-aries/pom.xml
aries/trunk/jpa/jpa-container-context/pom.xml
aries/trunk/jpa/jpa-container-eclipselink-adapter/pom.xml
aries/trunk/jpa/jpa-container/pom.xml
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/tx/impl/ConnectionWrapper.java
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/tx/impl/XADatasourceEnlistingWrapper.java
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/DataSourceFactoryDataSource.java
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/JndiDataSource.java
Modified: aries/trunk/jpa/jpa-api/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-api/pom.xml?rev=1600709&r1=1600708&r2=1600709&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-api/pom.xml (original)
+++ aries/trunk/jpa/jpa-api/pom.xml Thu Jun 5 17:31:54 2014
@@ -53,6 +53,7 @@
org.osgi.framework;version="[1.5.0,2.0.0)"
</aries.osgi.import>
<aries.osgi.private.pkg />
+ <lastReleaseVersion>1.0.0</lastReleaseVersion>
</properties>
<dependencies>
@@ -74,7 +75,6 @@
<plugin>
<groupId>org.apache.aries.versioning</groupId>
<artifactId>org.apache.aries.versioning.plugin</artifactId>
- <version>0.1.0</version>
<executions>
<execution>
<id>default-verify</id>
@@ -82,9 +82,6 @@
<goals>
<goal>version-check</goal>
</goals>
- <configuration>
-
<oldArtifact>org.apache.aries.jpa:org.apache.aries.jpa.api:1.0.0</oldArtifact>
- </configuration>
</execution>
</executions>
</plugin>
Modified: aries/trunk/jpa/jpa-blueprint-aries/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-blueprint-aries/pom.xml?rev=1600709&r1=1600708&r2=1600709&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-blueprint-aries/pom.xml (original)
+++ aries/trunk/jpa/jpa-blueprint-aries/pom.xml Thu Jun 5 17:31:54 2014
@@ -47,6 +47,7 @@
javax.persistence;version="[1.0.0,3.0.0)",
*
</aries.osgi.import>
+ <lastReleaseVersion>1.0.0</lastReleaseVersion>
</properties>
<dependencies>
@@ -105,7 +106,6 @@
<plugin>
<groupId>org.apache.aries.versioning</groupId>
<artifactId>org.apache.aries.versioning.plugin</artifactId>
- <version>0.1.0</version>
<executions>
<execution>
<id>default-verify</id>
@@ -113,9 +113,6 @@
<goals>
<goal>version-check</goal>
</goals>
- <configuration>
-
<oldArtifact>org.apache.aries.jpa:org.apache.aries.jpa.blueprint.aries:1.0.1</oldArtifact>
- </configuration>
</execution>
</executions>
</plugin>
Modified: aries/trunk/jpa/jpa-container-context/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-context/pom.xml?rev=1600709&r1=1600708&r2=1600709&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-context/pom.xml (original)
+++ aries/trunk/jpa/jpa-container-context/pom.xml Thu Jun 5 17:31:54 2014
@@ -55,6 +55,7 @@
<aries.osgi.activator>
org.apache.aries.jpa.container.context.impl.GlobalPersistenceManager
</aries.osgi.activator>
+ <lastReleaseVersion>1.0.1</lastReleaseVersion>
</properties>
<dependencies>
@@ -126,7 +127,6 @@
<plugin>
<groupId>org.apache.aries.versioning</groupId>
<artifactId>org.apache.aries.versioning.plugin</artifactId>
- <version>0.1.0</version>
<executions>
<execution>
<id>default-verify</id>
@@ -134,9 +134,6 @@
<goals>
<goal>version-check</goal>
</goals>
- <configuration>
-
<oldArtifact>org.apache.aries.jpa:org.apache.aries.jpa.container.context:1.0.0</oldArtifact>
- </configuration>
</execution>
</executions>
</plugin>
Modified: aries/trunk/jpa/jpa-container-eclipselink-adapter/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-eclipselink-adapter/pom.xml?rev=1600709&r1=1600708&r2=1600709&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-eclipselink-adapter/pom.xml (original)
+++ aries/trunk/jpa/jpa-container-eclipselink-adapter/pom.xml Thu Jun 5
17:31:54 2014
@@ -31,7 +31,7 @@
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.eclipselink.adapter</artifactId>
<packaging>bundle</packaging>
- <version>0.3.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<name>Aries JPA Container adapter for use with EclipseLink</name>
<scm>
@@ -50,6 +50,7 @@
</aries.osgi.import.pkg>
<aries.osgi.failok>true</aries.osgi.failok>
<aries.osgi.activator>org.apache.aries.jpa.eclipselink.adapter.Activator</aries.osgi.activator>
+ <lastReleaseVersion>1.0.0</lastReleaseVersion>
</properties>
<dependencies>
@@ -98,7 +99,6 @@
<plugin>
<groupId>org.apache.aries.versioning</groupId>
<artifactId>org.apache.aries.versioning.plugin</artifactId>
- <version>0.1.0</version>
<executions>
<execution>
<id>default-verify</id>
@@ -106,10 +106,6 @@
<goals>
<goal>version-check</goal>
</goals>
- <configuration>
-
<oldArtifact>org.apache.aries.jpa:org.apache.aries.jpa.eclipselink.adapter:1.0.0
- </oldArtifact>
- </configuration>
</execution>
</executions>
</plugin>
Modified: aries/trunk/jpa/jpa-container/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/pom.xml?rev=1600709&r1=1600708&r2=1600709&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container/pom.xml (original)
+++ aries/trunk/jpa/jpa-container/pom.xml Thu Jun 5 17:31:54 2014
@@ -64,6 +64,7 @@
<aries.osgi.activator>
org.apache.aries.jpa.container.impl.PersistenceBundleManager
</aries.osgi.activator>
+ <lastReleaseVersion>1.0.0</lastReleaseVersion>
</properties>
<dependencies>
@@ -141,7 +142,6 @@
<plugin>
<groupId>org.apache.aries.versioning</groupId>
<artifactId>org.apache.aries.versioning.plugin</artifactId>
- <version>0.1.0</version>
<executions>
<execution>
<id>default-verify</id>
@@ -149,9 +149,6 @@
<goals>
<goal>version-check</goal>
</goals>
- <configuration>
-
<oldArtifact>org.apache.aries.jpa:org.apache.aries.jpa.container:1.0.0</oldArtifact>
- </configuration>
</execution>
</executions>
</plugin>
Modified:
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/tx/impl/ConnectionWrapper.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/tx/impl/ConnectionWrapper.java?rev=1600709&r1=1600708&r2=1600709&view=diff
==============================================================================
---
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/tx/impl/ConnectionWrapper.java
(original)
+++
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/tx/impl/ConnectionWrapper.java
Thu Jun 5 17:31:54 2014
@@ -159,29 +159,49 @@ public class ConnectionWrapper implement
return connection.createStruct(typeName, attributes);
}
- @Override
public void setSchema(String schema) throws SQLException {
- connection.setSchema(schema);
+ invokeViaReflection("setSchema", new Class<?>[] {String.class},
+ new Object[] {schema});
}
- @Override
public String getSchema() throws SQLException {
- return connection.getSchema();
+ return invokeViaReflection(String.class, "getSchema", new Class<?>[0],
+ new Object[0]);
}
- @Override
public void abort(Executor executor) throws SQLException {
- connection.abort(executor);
+ invokeViaReflection("abort", new Class<?>[] {Executor.class},
+ new Object[] {executor});
}
- @Override
public void setNetworkTimeout(Executor executor, int milliseconds) throws
SQLException {
- connection.setNetworkTimeout(executor, milliseconds);
+ invokeViaReflection("setNetworkTimeout", new Class<?>[]
{Executor.class, Integer.TYPE},
+ new Object[] {executor, milliseconds});
}
- @Override
public int getNetworkTimeout() throws SQLException {
- return connection.getNetworkTimeout();
+ return invokeViaReflection(Integer.TYPE, "getNetworkTimeout", new
Class<?>[0], new Object[0]);
+ }
+
+ private <T> T invokeViaReflection(Class<T> retType, String name,
+ Class<?> argClasses[], Object args[])
throws SQLException {
+ try {
+ return retType.cast(connection.getClass().getMethod(name,
argClasses).invoke(args));
+ } catch (RuntimeException re) {
+ throw re;
+ } catch (Throwable t) {
+ throw new SQLException(t);
+ }
+ }
+ private void invokeViaReflection(String name,
+ Class<?> argClasses[], Object args[])
throws SQLException {
+ try {
+ connection.getClass().getMethod(name, argClasses).invoke(args);
+ } catch (RuntimeException re) {
+ throw re;
+ } catch (Throwable t) {
+ throw new SQLException(t);
+ }
}
public boolean getAutoCommit() throws SQLException {
Modified:
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/tx/impl/XADatasourceEnlistingWrapper.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/tx/impl/XADatasourceEnlistingWrapper.java?rev=1600709&r1=1600708&r2=1600709&view=diff
==============================================================================
---
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/tx/impl/XADatasourceEnlistingWrapper.java
(original)
+++
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/tx/impl/XADatasourceEnlistingWrapper.java
Thu Jun 5 17:31:54 2014
@@ -155,7 +155,6 @@ public class XADatasourceEnlistingWrappe
return wrappedDS.getLoginTimeout();
}
- @Override
public Logger getParentLogger() throws SQLFeatureNotSupportedException {
return null;
}
Modified:
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/DataSourceFactoryDataSource.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/DataSourceFactoryDataSource.java?rev=1600709&r1=1600708&r2=1600709&view=diff
==============================================================================
---
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/DataSourceFactoryDataSource.java
(original)
+++
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/DataSourceFactoryDataSource.java
Thu Jun 5 17:31:54 2014
@@ -128,7 +128,6 @@ public class DataSourceFactoryDataSource
ds.set(null);
}
- @Override
public java.util.logging.Logger getParentLogger() throws
SQLFeatureNotSupportedException {
return null;
}
Modified:
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/JndiDataSource.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/JndiDataSource.java?rev=1600709&r1=1600708&r2=1600709&view=diff
==============================================================================
---
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/JndiDataSource.java
(original)
+++
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/JndiDataSource.java
Thu Jun 5 17:31:54 2014
@@ -90,7 +90,6 @@ public class JndiDataSource extends Dela
return ds.get();
}
- @Override
public java.util.logging.Logger getParentLogger() throws
SQLFeatureNotSupportedException {
return null;
}
