You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2017/04/18 12:54:53 UTC
[01/50] aries-jpa git commit: [ARIES-1532] [jpa] Provide an extender
capability
Repository: aries-jpa
Updated Branches:
refs/heads/master [created] a5df7f6c1
[ARIES-1532] [jpa] Provide an extender capability
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1738980 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/f1ff9046
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/f1ff9046
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/f1ff9046
Branch: refs/heads/master
Commit: f1ff9046b1002546f53e91cd14f0b597fc89bf98
Parents: 858f5e4
Author: gnodet <gn...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Wed Apr 13 18:36:59 2016 +0000
Committer: gnodet <gn...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Wed Apr 13 18:36:59 2016 +0000
----------------------------------------------------------------------
jpa-container/osgi.bnd | 1 +
jpa-parent/pom.xml | 12 ++++++++++++
2 files changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/f1ff9046/jpa-container/osgi.bnd
----------------------------------------------------------------------
diff --git a/jpa-container/osgi.bnd b/jpa-container/osgi.bnd
index 909cd6e..9992fcf 100644
--- a/jpa-container/osgi.bnd
+++ b/jpa-container/osgi.bnd
@@ -5,3 +5,4 @@ Import-Package: \
Bundle-Activator: org.apache.aries.jpa.container.impl.Activator
Export-Service: \
javax.persistence.EntityManagerFactory
+Provide-Capability: osgi.extender;osgi.extender=aries.jpa;version:Version="${project.version.clean}"
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/f1ff9046/jpa-parent/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-parent/pom.xml b/jpa-parent/pom.xml
index a9711dd..5738e9b 100644
--- a/jpa-parent/pom.xml
+++ b/jpa-parent/pom.xml
@@ -167,6 +167,18 @@
</instructions>
</configuration>
<executions>
+ <execution>
+ <id>cleanVersions</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>cleanVersions</goal>
+ </goals>
+ <configuration>
+ <versions>
+ <project.version.clean>${project.version}</project.version.clean>
+ </versions>
+ </configuration>
+ </execution>
<execution>
<id>baseline</id>
<goals>
[07/50] aries-jpa git commit: [maven-release-plugin] prepare release
org.apache.aries.jpa-2.4.0
Posted by cs...@apache.org.
[maven-release-plugin] prepare release org.apache.aries.jpa-2.4.0
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1747679 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/c0b9b1b2
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/c0b9b1b2
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/c0b9b1b2
Branch: refs/heads/master
Commit: c0b9b1b2bcb45a652524997e3dc454bbc41736e2
Parents: 168b966
Author: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Fri Jun 10 10:35:13 2016 +0000
Committer: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Fri Jun 10 10:35:13 2016 +0000
----------------------------------------------------------------------
examples/pom.xml | 2 +-
examples/tasklist-blueprint/pom.xml | 5 ++---
examples/tasklist-ds/pom.xml | 2 +-
examples/tasklist-model/pom.xml | 2 +-
itests/jpa-container-blueprint-testbundle/pom.xml | 2 +-
itests/jpa-container-itest-karaf/pom.xml | 2 +-
itests/jpa-container-itest/pom.xml | 2 +-
itests/jpa-container-testbundle-eclipselink/pom.xml | 2 +-
itests/jpa-container-testbundle/pom.xml | 2 +-
itests/pom.xml | 2 +-
jpa-api/pom.xml | 2 +-
jpa-blueprint/pom.xml | 2 +-
jpa-container-eclipselink-adapter/pom.xml | 2 +-
jpa-container/pom.xml | 2 +-
jpa-features/pom.xml | 2 +-
jpa-parent/pom.xml | 8 +++++++-
jpa-repository/pom.xml | 11 ++++++++---
jpa-support/pom.xml | 2 +-
pom.xml | 8 ++++----
19 files changed, 36 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c0b9b1b2/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 6ba9730..088ebfc 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.0</version>
<relativePath>../jpa-parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c0b9b1b2/examples/tasklist-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/tasklist-blueprint/pom.xml b/examples/tasklist-blueprint/pom.xml
index b5afd1e..87b72c2 100644
--- a/examples/tasklist-blueprint/pom.xml
+++ b/examples/tasklist-blueprint/pom.xml
@@ -9,13 +9,12 @@
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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.aries.jpa.example</groupId>
<artifactId>org.apache.aries.jpa.example.parent</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.0</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.example.tasklist.blueprint</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c0b9b1b2/examples/tasklist-ds/pom.xml
----------------------------------------------------------------------
diff --git a/examples/tasklist-ds/pom.xml b/examples/tasklist-ds/pom.xml
index 0e06fda..2692c77 100644
--- a/examples/tasklist-ds/pom.xml
+++ b/examples/tasklist-ds/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>org.apache.aries.jpa.example</groupId>
<artifactId>org.apache.aries.jpa.example.parent</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.0</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.example.tasklist.ds</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c0b9b1b2/examples/tasklist-model/pom.xml
----------------------------------------------------------------------
diff --git a/examples/tasklist-model/pom.xml b/examples/tasklist-model/pom.xml
index 3468e1c..31ee5fc 100644
--- a/examples/tasklist-model/pom.xml
+++ b/examples/tasklist-model/pom.xml
@@ -12,7 +12,7 @@
<parent>
<groupId>org.apache.aries.jpa.example</groupId>
<artifactId>org.apache.aries.jpa.example.parent</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.0</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c0b9b1b2/itests/jpa-container-blueprint-testbundle/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-blueprint-testbundle/pom.xml b/itests/jpa-container-blueprint-testbundle/pom.xml
index 0820cb2..878455f 100644
--- a/itests/jpa-container-blueprint-testbundle/pom.xml
+++ b/itests/jpa-container-blueprint-testbundle/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.0</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c0b9b1b2/itests/jpa-container-itest-karaf/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-itest-karaf/pom.xml b/itests/jpa-container-itest-karaf/pom.xml
index 608175b..285b1f8 100644
--- a/itests/jpa-container-itest-karaf/pom.xml
+++ b/itests/jpa-container-itest-karaf/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.0</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c0b9b1b2/itests/jpa-container-itest/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-itest/pom.xml b/itests/jpa-container-itest/pom.xml
index 854bd6b..073c540 100644
--- a/itests/jpa-container-itest/pom.xml
+++ b/itests/jpa-container-itest/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.0</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c0b9b1b2/itests/jpa-container-testbundle-eclipselink/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-testbundle-eclipselink/pom.xml b/itests/jpa-container-testbundle-eclipselink/pom.xml
index 073f874..cbad0e8 100644
--- a/itests/jpa-container-testbundle-eclipselink/pom.xml
+++ b/itests/jpa-container-testbundle-eclipselink/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.0</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c0b9b1b2/itests/jpa-container-testbundle/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-testbundle/pom.xml b/itests/jpa-container-testbundle/pom.xml
index 93f1aa2..e65fd85 100644
--- a/itests/jpa-container-testbundle/pom.xml
+++ b/itests/jpa-container-testbundle/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.0</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c0b9b1b2/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index 008873b..c7dfa99 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.0</version>
<relativePath>../jpa-parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c0b9b1b2/jpa-api/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-api/pom.xml b/jpa-api/pom.xml
index 3065368..a0979dd 100644
--- a/jpa-api/pom.xml
+++ b/jpa-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.0</version>
<relativePath>../jpa-parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c0b9b1b2/jpa-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-blueprint/pom.xml b/jpa-blueprint/pom.xml
index e149d61..5c508a8 100644
--- a/jpa-blueprint/pom.xml
+++ b/jpa-blueprint/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.0</version>
<relativePath>../jpa-parent</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.blueprint</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c0b9b1b2/jpa-container-eclipselink-adapter/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-container-eclipselink-adapter/pom.xml b/jpa-container-eclipselink-adapter/pom.xml
index 384eef5..b81e4ea 100644
--- a/jpa-container-eclipselink-adapter/pom.xml
+++ b/jpa-container-eclipselink-adapter/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.0</version>
<relativePath>../jpa-parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c0b9b1b2/jpa-container/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-container/pom.xml b/jpa-container/pom.xml
index 1db21ca..b778594 100644
--- a/jpa-container/pom.xml
+++ b/jpa-container/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.0</version>
<relativePath>../jpa-parent</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.container</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c0b9b1b2/jpa-features/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-features/pom.xml b/jpa-features/pom.xml
index 737065a..4ba0f89 100644
--- a/jpa-features/pom.xml
+++ b/jpa-features/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.0</version>
<relativePath>../jpa-parent</relativePath>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c0b9b1b2/jpa-parent/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-parent/pom.xml b/jpa-parent/pom.xml
index 5738e9b..b6c3a3e 100644
--- a/jpa-parent/pom.xml
+++ b/jpa-parent/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.0</version>
<name>Apache Aries JPA parent</name>
<packaging>pom</packaging>
@@ -267,4 +267,10 @@
</build>
</profile>
</profiles>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/org.apache.aries.jpa-2.4.0/org.apache.aries.jpa.parent</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/org.apache.aries.jpa-2.4.0/org.apache.aries.jpa.parent</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/pom/tags/org.apache.aries.jpa-2.4.0/org.apache.aries.jpa.parent</url>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c0b9b1b2/jpa-repository/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-repository/pom.xml b/jpa-repository/pom.xml
index 58a9bc1..e02d03f 100644
--- a/jpa-repository/pom.xml
+++ b/jpa-repository/pom.xml
@@ -9,8 +9,7 @@
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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.aries</groupId>
@@ -22,7 +21,7 @@
<groupId>org.apache.aries.jpa</groupId>
<artifactId>jpa-repository</artifactId>
<name>Apache Aries JPA Repository</name>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.0</version>
<packaging>pom</packaging>
<properties>
<bnd.version>3.1.0</bnd.version>
@@ -118,4 +117,10 @@
<version>2.1.0</version>
</dependency>
</dependencies>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.4.0/jpa-repository</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.4.0/jpa-repository</developerConnection>
+ <url>scm:svn:http://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.4.0/jpa-repository</url>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c0b9b1b2/jpa-support/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-support/pom.xml b/jpa-support/pom.xml
index e665de0..f31eec7 100644
--- a/jpa-support/pom.xml
+++ b/jpa-support/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.0</version>
<relativePath>../jpa-parent</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.support</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c0b9b1b2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f8d5863..e548305 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.0</version>
<relativePath>jpa-parent</relativePath>
</parent>
@@ -37,9 +37,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/jpa</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.4.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.4.0</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/tags/org.apache.aries.jpa-2.4.0</url>
</scm>
<modules>
[08/50] aries-jpa git commit: [maven-release-plugin] prepare for next
development iteration
Posted by cs...@apache.org.
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1747681 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/c52145de
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/c52145de
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/c52145de
Branch: refs/heads/master
Commit: c52145deef3fe8516ba71c2e40cc2a256354d78a
Parents: c0b9b1b
Author: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Fri Jun 10 10:35:32 2016 +0000
Committer: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Fri Jun 10 10:35:32 2016 +0000
----------------------------------------------------------------------
examples/pom.xml | 2 +-
examples/tasklist-blueprint/pom.xml | 2 +-
examples/tasklist-ds/pom.xml | 2 +-
examples/tasklist-model/pom.xml | 2 +-
itests/jpa-container-blueprint-testbundle/pom.xml | 2 +-
itests/jpa-container-itest-karaf/pom.xml | 2 +-
itests/jpa-container-itest/pom.xml | 2 +-
itests/jpa-container-testbundle-eclipselink/pom.xml | 2 +-
itests/jpa-container-testbundle/pom.xml | 2 +-
itests/pom.xml | 2 +-
jpa-api/pom.xml | 2 +-
jpa-blueprint/pom.xml | 2 +-
jpa-container-eclipselink-adapter/pom.xml | 2 +-
jpa-container/pom.xml | 2 +-
jpa-features/pom.xml | 2 +-
jpa-parent/pom.xml | 8 +-------
jpa-repository/pom.xml | 8 +-------
jpa-support/pom.xml | 2 +-
pom.xml | 8 ++++----
19 files changed, 22 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c52145de/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 088ebfc..486338d 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.4.0</version>
+ <version>2.5.0-SNAPSHOT</version>
<relativePath>../jpa-parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c52145de/examples/tasklist-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/tasklist-blueprint/pom.xml b/examples/tasklist-blueprint/pom.xml
index 87b72c2..fce0258 100644
--- a/examples/tasklist-blueprint/pom.xml
+++ b/examples/tasklist-blueprint/pom.xml
@@ -14,7 +14,7 @@
<parent>
<groupId>org.apache.aries.jpa.example</groupId>
<artifactId>org.apache.aries.jpa.example.parent</artifactId>
- <version>2.4.0</version>
+ <version>2.5.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.example.tasklist.blueprint</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c52145de/examples/tasklist-ds/pom.xml
----------------------------------------------------------------------
diff --git a/examples/tasklist-ds/pom.xml b/examples/tasklist-ds/pom.xml
index 2692c77..12cc798 100644
--- a/examples/tasklist-ds/pom.xml
+++ b/examples/tasklist-ds/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>org.apache.aries.jpa.example</groupId>
<artifactId>org.apache.aries.jpa.example.parent</artifactId>
- <version>2.4.0</version>
+ <version>2.5.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.example.tasklist.ds</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c52145de/examples/tasklist-model/pom.xml
----------------------------------------------------------------------
diff --git a/examples/tasklist-model/pom.xml b/examples/tasklist-model/pom.xml
index 31ee5fc..3d43310 100644
--- a/examples/tasklist-model/pom.xml
+++ b/examples/tasklist-model/pom.xml
@@ -12,7 +12,7 @@
<parent>
<groupId>org.apache.aries.jpa.example</groupId>
<artifactId>org.apache.aries.jpa.example.parent</artifactId>
- <version>2.4.0</version>
+ <version>2.5.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c52145de/itests/jpa-container-blueprint-testbundle/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-blueprint-testbundle/pom.xml b/itests/jpa-container-blueprint-testbundle/pom.xml
index 878455f..e8d84f6 100644
--- a/itests/jpa-container-blueprint-testbundle/pom.xml
+++ b/itests/jpa-container-blueprint-testbundle/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.4.0</version>
+ <version>2.5.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c52145de/itests/jpa-container-itest-karaf/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-itest-karaf/pom.xml b/itests/jpa-container-itest-karaf/pom.xml
index 285b1f8..10df01a 100644
--- a/itests/jpa-container-itest-karaf/pom.xml
+++ b/itests/jpa-container-itest-karaf/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.4.0</version>
+ <version>2.5.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c52145de/itests/jpa-container-itest/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-itest/pom.xml b/itests/jpa-container-itest/pom.xml
index 073c540..07ed434 100644
--- a/itests/jpa-container-itest/pom.xml
+++ b/itests/jpa-container-itest/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.4.0</version>
+ <version>2.5.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c52145de/itests/jpa-container-testbundle-eclipselink/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-testbundle-eclipselink/pom.xml b/itests/jpa-container-testbundle-eclipselink/pom.xml
index cbad0e8..0a3e058 100644
--- a/itests/jpa-container-testbundle-eclipselink/pom.xml
+++ b/itests/jpa-container-testbundle-eclipselink/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.4.0</version>
+ <version>2.5.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c52145de/itests/jpa-container-testbundle/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-testbundle/pom.xml b/itests/jpa-container-testbundle/pom.xml
index e65fd85..94eb3d9 100644
--- a/itests/jpa-container-testbundle/pom.xml
+++ b/itests/jpa-container-testbundle/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.4.0</version>
+ <version>2.5.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c52145de/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index c7dfa99..061f358 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.4.0</version>
+ <version>2.5.0-SNAPSHOT</version>
<relativePath>../jpa-parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c52145de/jpa-api/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-api/pom.xml b/jpa-api/pom.xml
index a0979dd..4e1b307 100644
--- a/jpa-api/pom.xml
+++ b/jpa-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.4.0</version>
+ <version>2.5.0-SNAPSHOT</version>
<relativePath>../jpa-parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c52145de/jpa-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-blueprint/pom.xml b/jpa-blueprint/pom.xml
index 5c508a8..0b3a14a 100644
--- a/jpa-blueprint/pom.xml
+++ b/jpa-blueprint/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.4.0</version>
+ <version>2.5.0-SNAPSHOT</version>
<relativePath>../jpa-parent</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.blueprint</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c52145de/jpa-container-eclipselink-adapter/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-container-eclipselink-adapter/pom.xml b/jpa-container-eclipselink-adapter/pom.xml
index b81e4ea..a42d9b0 100644
--- a/jpa-container-eclipselink-adapter/pom.xml
+++ b/jpa-container-eclipselink-adapter/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.4.0</version>
+ <version>2.5.0-SNAPSHOT</version>
<relativePath>../jpa-parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c52145de/jpa-container/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-container/pom.xml b/jpa-container/pom.xml
index b778594..ea7324e 100644
--- a/jpa-container/pom.xml
+++ b/jpa-container/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.4.0</version>
+ <version>2.5.0-SNAPSHOT</version>
<relativePath>../jpa-parent</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.container</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c52145de/jpa-features/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-features/pom.xml b/jpa-features/pom.xml
index 4ba0f89..777ec71 100644
--- a/jpa-features/pom.xml
+++ b/jpa-features/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.4.0</version>
+ <version>2.5.0-SNAPSHOT</version>
<relativePath>../jpa-parent</relativePath>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c52145de/jpa-parent/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-parent/pom.xml b/jpa-parent/pom.xml
index b6c3a3e..70574a5 100644
--- a/jpa-parent/pom.xml
+++ b/jpa-parent/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.4.0</version>
+ <version>2.5.0-SNAPSHOT</version>
<name>Apache Aries JPA parent</name>
<packaging>pom</packaging>
@@ -267,10 +267,4 @@
</build>
</profile>
</profiles>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/org.apache.aries.jpa-2.4.0/org.apache.aries.jpa.parent</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/org.apache.aries.jpa-2.4.0/org.apache.aries.jpa.parent</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/pom/tags/org.apache.aries.jpa-2.4.0/org.apache.aries.jpa.parent</url>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c52145de/jpa-repository/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-repository/pom.xml b/jpa-repository/pom.xml
index e02d03f..f05ccea 100644
--- a/jpa-repository/pom.xml
+++ b/jpa-repository/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.apache.aries.jpa</groupId>
<artifactId>jpa-repository</artifactId>
<name>Apache Aries JPA Repository</name>
- <version>2.4.0</version>
+ <version>2.5.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<bnd.version>3.1.0</bnd.version>
@@ -117,10 +117,4 @@
<version>2.1.0</version>
</dependency>
</dependencies>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.4.0/jpa-repository</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.4.0/jpa-repository</developerConnection>
- <url>scm:svn:http://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.4.0/jpa-repository</url>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c52145de/jpa-support/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-support/pom.xml b/jpa-support/pom.xml
index f31eec7..ffb1c32 100644
--- a/jpa-support/pom.xml
+++ b/jpa-support/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.4.0</version>
+ <version>2.5.0-SNAPSHOT</version>
<relativePath>../jpa-parent</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.support</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/c52145de/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e548305..6a4e741 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.4.0</version>
+ <version>2.5.0-SNAPSHOT</version>
<relativePath>jpa-parent</relativePath>
</parent>
@@ -37,9 +37,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.4.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.4.0</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/tags/org.apache.aries.jpa-2.4.0</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jpa</url>
</scm>
<modules>
[12/50] aries-jpa git commit: [ARIES-1626] Added "Provide-Capability"
declaration in the pom to expose javax.persistence.spi.PersistenceProvider
service
Posted by cs...@apache.org.
[ARIES-1626] Added "Provide-Capability" declaration in the pom to expose javax.persistence.spi.PersistenceProvider service
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1764331 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/6414efc4
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/6414efc4
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/6414efc4
Branch: refs/heads/master
Commit: 6414efc4f7a9e70247b775b03fece87359fb3e56
Parents: 305581d
Author: ggerla <gg...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Tue Oct 11 19:47:10 2016 +0000
Committer: ggerla <gg...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Tue Oct 11 19:47:10 2016 +0000
----------------------------------------------------------------------
jpa-container-eclipselink-adapter/pom.xml | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/6414efc4/jpa-container-eclipselink-adapter/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-container-eclipselink-adapter/pom.xml b/jpa-container-eclipselink-adapter/pom.xml
index a42d9b0..6fa0f47 100644
--- a/jpa-container-eclipselink-adapter/pom.xml
+++ b/jpa-container-eclipselink-adapter/pom.xml
@@ -56,8 +56,24 @@
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.jpa</artifactId>
- <version>2.5.2</version>
+ <version>2.6.4</version>
</dependency>
</dependencies>
-
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>3.0.1</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Provide-Capability>osgi.service; effective:=active; objectClass=javax.persistence.spi.PersistenceProvider</Provide-Capability>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
[45/50] aries-jpa git commit: [maven-release-plugin] prepare release
org.apache.aries.jpa-2.6.1
Posted by cs...@apache.org.
[maven-release-plugin] prepare release org.apache.aries.jpa-2.6.1
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1789074 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/9860e849
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/9860e849
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/9860e849
Branch: refs/heads/master
Commit: 9860e84928b94465b319ec5a9af204ff83a371a3
Parents: a9e9c16
Author: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Tue Mar 28 09:57:07 2017 +0000
Committer: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Tue Mar 28 09:57:07 2017 +0000
----------------------------------------------------------------------
examples/pom.xml | 2 +-
examples/tasklist-blueprint/pom.xml | 2 +-
examples/tasklist-ds/pom.xml | 2 +-
examples/tasklist-model/pom.xml | 2 +-
itests/jpa-container-blueprint-testbundle/pom.xml | 2 +-
itests/jpa-container-itest-karaf/pom.xml | 2 +-
itests/jpa-container-itest/pom.xml | 2 +-
itests/jpa-container-testbundle-eclipselink/pom.xml | 2 +-
itests/jpa-container-testbundle/pom.xml | 2 +-
itests/pom.xml | 2 +-
jpa-api/pom.xml | 2 +-
jpa-blueprint/pom.xml | 2 +-
jpa-container-eclipselink-adapter/pom.xml | 2 +-
jpa-container/pom.xml | 2 +-
jpa-features/pom.xml | 2 +-
jpa-parent/pom.xml | 8 +++++++-
jpa-repository/pom.xml | 8 +++++++-
jpa-support/pom.xml | 2 +-
pom.xml | 8 ++++----
19 files changed, 34 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/9860e849/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 4310781..914616e 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.6.1</version>
<relativePath>../jpa-parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/9860e849/examples/tasklist-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/tasklist-blueprint/pom.xml b/examples/tasklist-blueprint/pom.xml
index 1821c75..6efa5c0 100644
--- a/examples/tasklist-blueprint/pom.xml
+++ b/examples/tasklist-blueprint/pom.xml
@@ -14,7 +14,7 @@
<parent>
<groupId>org.apache.aries.jpa.example</groupId>
<artifactId>org.apache.aries.jpa.example.parent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.6.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.example.tasklist.blueprint</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/9860e849/examples/tasklist-ds/pom.xml
----------------------------------------------------------------------
diff --git a/examples/tasklist-ds/pom.xml b/examples/tasklist-ds/pom.xml
index 3a39216..188ccf7 100644
--- a/examples/tasklist-ds/pom.xml
+++ b/examples/tasklist-ds/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>org.apache.aries.jpa.example</groupId>
<artifactId>org.apache.aries.jpa.example.parent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.6.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.example.tasklist.ds</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/9860e849/examples/tasklist-model/pom.xml
----------------------------------------------------------------------
diff --git a/examples/tasklist-model/pom.xml b/examples/tasklist-model/pom.xml
index aa7de00..3e9240f 100644
--- a/examples/tasklist-model/pom.xml
+++ b/examples/tasklist-model/pom.xml
@@ -12,7 +12,7 @@
<parent>
<groupId>org.apache.aries.jpa.example</groupId>
<artifactId>org.apache.aries.jpa.example.parent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.6.1</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/9860e849/itests/jpa-container-blueprint-testbundle/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-blueprint-testbundle/pom.xml b/itests/jpa-container-blueprint-testbundle/pom.xml
index e615398..c4d390a 100644
--- a/itests/jpa-container-blueprint-testbundle/pom.xml
+++ b/itests/jpa-container-blueprint-testbundle/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.6.1</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/9860e849/itests/jpa-container-itest-karaf/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-itest-karaf/pom.xml b/itests/jpa-container-itest-karaf/pom.xml
index 3b32efc..2e1f89a 100644
--- a/itests/jpa-container-itest-karaf/pom.xml
+++ b/itests/jpa-container-itest-karaf/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.6.1</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/9860e849/itests/jpa-container-itest/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-itest/pom.xml b/itests/jpa-container-itest/pom.xml
index 5c25de7..abbab79 100644
--- a/itests/jpa-container-itest/pom.xml
+++ b/itests/jpa-container-itest/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.6.1</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/9860e849/itests/jpa-container-testbundle-eclipselink/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-testbundle-eclipselink/pom.xml b/itests/jpa-container-testbundle-eclipselink/pom.xml
index 6387e14..72b66d0 100644
--- a/itests/jpa-container-testbundle-eclipselink/pom.xml
+++ b/itests/jpa-container-testbundle-eclipselink/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.6.1</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/9860e849/itests/jpa-container-testbundle/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-testbundle/pom.xml b/itests/jpa-container-testbundle/pom.xml
index 1a5bc8a..9368298 100644
--- a/itests/jpa-container-testbundle/pom.xml
+++ b/itests/jpa-container-testbundle/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.6.1</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/9860e849/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index 43b830a..2ca5632 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.6.1</version>
<relativePath>../jpa-parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/9860e849/jpa-api/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-api/pom.xml b/jpa-api/pom.xml
index 523a882..f93a71b 100644
--- a/jpa-api/pom.xml
+++ b/jpa-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.6.1</version>
<relativePath>../jpa-parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/9860e849/jpa-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-blueprint/pom.xml b/jpa-blueprint/pom.xml
index 4293cc5..cd96e4a 100644
--- a/jpa-blueprint/pom.xml
+++ b/jpa-blueprint/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.6.1</version>
<relativePath>../jpa-parent</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.blueprint</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/9860e849/jpa-container-eclipselink-adapter/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-container-eclipselink-adapter/pom.xml b/jpa-container-eclipselink-adapter/pom.xml
index 6d32567..88b65a2 100644
--- a/jpa-container-eclipselink-adapter/pom.xml
+++ b/jpa-container-eclipselink-adapter/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.6.1</version>
<relativePath>../jpa-parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/9860e849/jpa-container/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-container/pom.xml b/jpa-container/pom.xml
index 699bf40..bba6c96 100644
--- a/jpa-container/pom.xml
+++ b/jpa-container/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.6.1</version>
<relativePath>../jpa-parent</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.container</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/9860e849/jpa-features/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-features/pom.xml b/jpa-features/pom.xml
index 3d2974f..e0d93b9 100644
--- a/jpa-features/pom.xml
+++ b/jpa-features/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.6.1</version>
<relativePath>../jpa-parent</relativePath>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/9860e849/jpa-parent/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-parent/pom.xml b/jpa-parent/pom.xml
index e72ba88..75e28fb 100644
--- a/jpa-parent/pom.xml
+++ b/jpa-parent/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.6.1</version>
<name>Apache Aries JPA parent</name>
<packaging>pom</packaging>
@@ -312,4 +312,10 @@
</build>
</profile>
</profiles>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/org.apache.aries.jpa-2.6.1/org.apache.aries.jpa.parent</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/org.apache.aries.jpa-2.6.1/org.apache.aries.jpa.parent</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/pom/tags/org.apache.aries.jpa-2.6.1/org.apache.aries.jpa.parent</url>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/9860e849/jpa-repository/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-repository/pom.xml b/jpa-repository/pom.xml
index 562bf6f..11ef56f 100644
--- a/jpa-repository/pom.xml
+++ b/jpa-repository/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.apache.aries.jpa</groupId>
<artifactId>jpa-repository</artifactId>
<name>Apache Aries JPA Repository</name>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.6.1</version>
<packaging>pom</packaging>
<properties>
<bnd.version>3.1.0</bnd.version>
@@ -119,4 +119,10 @@
<version>2.1.0</version>
</dependency>
</dependencies>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.6.1/jpa-repository</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.6.1/jpa-repository</developerConnection>
+ <url>scm:svn:http://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.6.1/jpa-repository</url>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/9860e849/jpa-support/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-support/pom.xml b/jpa-support/pom.xml
index 66a5db3..699b430 100644
--- a/jpa-support/pom.xml
+++ b/jpa-support/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.6.1</version>
<relativePath>../jpa-parent</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.support</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/9860e849/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 03d3633..c3cdaa5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.6.1</version>
<relativePath>jpa-parent</relativePath>
</parent>
@@ -37,9 +37,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/jpa</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.6.1</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.6.1</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/tags/org.apache.aries.jpa-2.6.1</url>
</scm>
<modules>
[35/50] aries-jpa git commit: [jpa] Update to use OSGi API snapshots
for the JPA Service
Posted by cs...@apache.org.
[jpa] Update to use OSGi API snapshots for the JPA Service
Fixes ARIES-1698
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1785281 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/8b366ae1
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/8b366ae1
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/8b366ae1
Branch: refs/heads/master
Commit: 8b366ae1b058461bdb5501ea6cf77e0a660febfc
Parents: 0a9a175
Author: timothyjward <ti...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Fri Mar 3 12:44:20 2017 +0000
Committer: timothyjward <ti...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Fri Mar 3 12:44:20 2017 +0000
----------------------------------------------------------------------
jpa-container/osgi.bnd | 2 +-
jpa-container/pom.xml | 65 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 66 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/8b366ae1/jpa-container/osgi.bnd
----------------------------------------------------------------------
diff --git a/jpa-container/osgi.bnd b/jpa-container/osgi.bnd
index 8026e5c..0616b1e 100644
--- a/jpa-container/osgi.bnd
+++ b/jpa-container/osgi.bnd
@@ -1,5 +1,5 @@
Export-Package: \
- org.osgi.service.jpa
+ org.osgi.service.jpa;provide:=true
Import-Package: \
javax.persistence;version="[1.1,3)", \
javax.persistence.spi;version="[1.1,3)", \
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/8b366ae1/jpa-container/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-container/pom.xml b/jpa-container/pom.xml
index a6f4de1..85b0e6b 100644
--- a/jpa-container/pom.xml
+++ b/jpa-container/pom.xml
@@ -30,9 +30,25 @@
<description>Implements the OSGi JPA Container from the enterprise spec. Provider a EntityManagerFactory and EntityManagerFactoryBuilder service</description>
<packaging>bundle</packaging>
+ <repositories>
+ <repository>
+ <id>OSGi Public APIs</id>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <url>https://oss.sonatype.org/content/repositories/osgi/</url>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.jpa</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
@@ -47,4 +63,53 @@
<scope>provided</scope>
</dependency>
</dependencies>
+
+ <build>
+ <!-- This configuration makes sure that we backport
+ the OSGi provided APIs to Java 1.6 class compatibility.
+ Becuase of the way the maven-bundle-plugin works we must
+ extract the JAR before we translate and slurp in the API -->
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.0.0</version>
+ <executions>
+ <execution>
+ <id>extract-osgi-api</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.jpa</artifactId>
+ <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+ <includes>org/osgi/service/jpa/**</includes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>net.orfjackal.retrolambda</groupId>
+ <artifactId>retrolambda-maven-plugin</artifactId>
+ <version>2.5.1</version>
+ <executions>
+ <execution>
+ <id>backport-osgi-api</id>
+ <goals>
+ <goal>process-main</goal>
+ </goals>
+ <configuration>
+ <target>1.6</target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
[33/50] aries-jpa git commit: [maven-release-plugin] prepare release
org.apache.aries.jpa-2.6.0
Posted by cs...@apache.org.
[maven-release-plugin] prepare release org.apache.aries.jpa-2.6.0
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1784301 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/4474858a
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/4474858a
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/4474858a
Branch: refs/heads/master
Commit: 4474858afc3082f94c3f3eb115b2a89829a10003
Parents: 0ef1f91
Author: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Fri Feb 24 17:12:28 2017 +0000
Committer: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Fri Feb 24 17:12:28 2017 +0000
----------------------------------------------------------------------
examples/pom.xml | 2 +-
examples/tasklist-blueprint/pom.xml | 2 +-
examples/tasklist-ds/pom.xml | 2 +-
examples/tasklist-model/pom.xml | 2 +-
itests/jpa-container-blueprint-testbundle/pom.xml | 2 +-
itests/jpa-container-itest-karaf/pom.xml | 2 +-
itests/jpa-container-itest/pom.xml | 2 +-
itests/jpa-container-testbundle-eclipselink/pom.xml | 2 +-
itests/jpa-container-testbundle/pom.xml | 2 +-
itests/pom.xml | 2 +-
jpa-api/pom.xml | 2 +-
jpa-blueprint/pom.xml | 2 +-
jpa-container-eclipselink-adapter/pom.xml | 2 +-
jpa-container/pom.xml | 2 +-
jpa-features/pom.xml | 2 +-
jpa-parent/pom.xml | 8 +++++++-
jpa-repository/pom.xml | 8 +++++++-
jpa-support/pom.xml | 2 +-
pom.xml | 8 ++++----
19 files changed, 34 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/4474858a/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 6c4e0ee..2842641 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
<relativePath>../jpa-parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/4474858a/examples/tasklist-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/tasklist-blueprint/pom.xml b/examples/tasklist-blueprint/pom.xml
index 34bc3ff..64b4e87 100644
--- a/examples/tasklist-blueprint/pom.xml
+++ b/examples/tasklist-blueprint/pom.xml
@@ -14,7 +14,7 @@
<parent>
<groupId>org.apache.aries.jpa.example</groupId>
<artifactId>org.apache.aries.jpa.example.parent</artifactId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.example.tasklist.blueprint</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/4474858a/examples/tasklist-ds/pom.xml
----------------------------------------------------------------------
diff --git a/examples/tasklist-ds/pom.xml b/examples/tasklist-ds/pom.xml
index 768d993..426a1c9 100644
--- a/examples/tasklist-ds/pom.xml
+++ b/examples/tasklist-ds/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>org.apache.aries.jpa.example</groupId>
<artifactId>org.apache.aries.jpa.example.parent</artifactId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.example.tasklist.ds</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/4474858a/examples/tasklist-model/pom.xml
----------------------------------------------------------------------
diff --git a/examples/tasklist-model/pom.xml b/examples/tasklist-model/pom.xml
index ae1d126..b03aec0 100644
--- a/examples/tasklist-model/pom.xml
+++ b/examples/tasklist-model/pom.xml
@@ -12,7 +12,7 @@
<parent>
<groupId>org.apache.aries.jpa.example</groupId>
<artifactId>org.apache.aries.jpa.example.parent</artifactId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/4474858a/itests/jpa-container-blueprint-testbundle/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-blueprint-testbundle/pom.xml b/itests/jpa-container-blueprint-testbundle/pom.xml
index 215aade..30edff4 100644
--- a/itests/jpa-container-blueprint-testbundle/pom.xml
+++ b/itests/jpa-container-blueprint-testbundle/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/4474858a/itests/jpa-container-itest-karaf/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-itest-karaf/pom.xml b/itests/jpa-container-itest-karaf/pom.xml
index c60c5c4..145ca01 100644
--- a/itests/jpa-container-itest-karaf/pom.xml
+++ b/itests/jpa-container-itest-karaf/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/4474858a/itests/jpa-container-itest/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-itest/pom.xml b/itests/jpa-container-itest/pom.xml
index 1f4beed..1a52d4a 100644
--- a/itests/jpa-container-itest/pom.xml
+++ b/itests/jpa-container-itest/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/4474858a/itests/jpa-container-testbundle-eclipselink/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-testbundle-eclipselink/pom.xml b/itests/jpa-container-testbundle-eclipselink/pom.xml
index a4ce5ec..6f5e7a6 100644
--- a/itests/jpa-container-testbundle-eclipselink/pom.xml
+++ b/itests/jpa-container-testbundle-eclipselink/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/4474858a/itests/jpa-container-testbundle/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-testbundle/pom.xml b/itests/jpa-container-testbundle/pom.xml
index 8084d15..5ec2fbc 100644
--- a/itests/jpa-container-testbundle/pom.xml
+++ b/itests/jpa-container-testbundle/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/4474858a/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index cffe121..f7c224f 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
<relativePath>../jpa-parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/4474858a/jpa-api/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-api/pom.xml b/jpa-api/pom.xml
index e03c5cd..2c79ac7 100644
--- a/jpa-api/pom.xml
+++ b/jpa-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
<relativePath>../jpa-parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/4474858a/jpa-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-blueprint/pom.xml b/jpa-blueprint/pom.xml
index 747283e..f220dab 100644
--- a/jpa-blueprint/pom.xml
+++ b/jpa-blueprint/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
<relativePath>../jpa-parent</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.blueprint</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/4474858a/jpa-container-eclipselink-adapter/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-container-eclipselink-adapter/pom.xml b/jpa-container-eclipselink-adapter/pom.xml
index 32ec492..46095c2 100644
--- a/jpa-container-eclipselink-adapter/pom.xml
+++ b/jpa-container-eclipselink-adapter/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
<relativePath>../jpa-parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/4474858a/jpa-container/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-container/pom.xml b/jpa-container/pom.xml
index 5012e1e..44618d9 100644
--- a/jpa-container/pom.xml
+++ b/jpa-container/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
<relativePath>../jpa-parent</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.container</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/4474858a/jpa-features/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-features/pom.xml b/jpa-features/pom.xml
index 78d60a8..6085c77 100644
--- a/jpa-features/pom.xml
+++ b/jpa-features/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
<relativePath>../jpa-parent</relativePath>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/4474858a/jpa-parent/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-parent/pom.xml b/jpa-parent/pom.xml
index 3b8f216..cb35f16 100644
--- a/jpa-parent/pom.xml
+++ b/jpa-parent/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
<name>Apache Aries JPA parent</name>
<packaging>pom</packaging>
@@ -292,4 +292,10 @@
</build>
</profile>
</profiles>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/org.apache.aries.jpa-2.6.0/org.apache.aries.jpa.parent</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/org.apache.aries.jpa-2.6.0/org.apache.aries.jpa.parent</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/pom/tags/org.apache.aries.jpa-2.6.0/org.apache.aries.jpa.parent</url>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/4474858a/jpa-repository/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-repository/pom.xml b/jpa-repository/pom.xml
index 666ce85..4495515 100644
--- a/jpa-repository/pom.xml
+++ b/jpa-repository/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.apache.aries.jpa</groupId>
<artifactId>jpa-repository</artifactId>
<name>Apache Aries JPA Repository</name>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
<packaging>pom</packaging>
<properties>
<bnd.version>3.1.0</bnd.version>
@@ -119,4 +119,10 @@
<version>2.1.0</version>
</dependency>
</dependencies>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.6.0/jpa-repository</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.6.0/jpa-repository</developerConnection>
+ <url>scm:svn:http://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.6.0/jpa-repository</url>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/4474858a/jpa-support/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-support/pom.xml b/jpa-support/pom.xml
index 5857ab9..7ae4f87 100644
--- a/jpa-support/pom.xml
+++ b/jpa-support/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
<relativePath>../jpa-parent</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.support</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/4474858a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1feff7e..de0c6e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
<relativePath>jpa-parent</relativePath>
</parent>
@@ -37,9 +37,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/jpa</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.6.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.6.0</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/tags/org.apache.aries.jpa-2.6.0</url>
</scm>
<modules>
[38/50] aries-jpa git commit: [ARIES-1689] Added check that entity
manager is not null
Posted by cs...@apache.org.
[ARIES-1689] Added check that entity manager is not null
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1785769 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/90229e84
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/90229e84
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/90229e84
Branch: refs/heads/master
Commit: 90229e843f0c66c7965ea9a81a7e3d188df6c0ac
Parents: 8f23eb0
Author: ggerla <gg...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Mon Mar 6 21:20:45 2017 +0000
Committer: ggerla <gg...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Mon Mar 6 21:20:45 2017 +0000
----------------------------------------------------------------------
.../java/org/apache/aries/jpa/blueprint/impl/JpaInterceptor.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/90229e84/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptor.java
----------------------------------------------------------------------
diff --git a/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptor.java b/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptor.java
index 59a5c8e..a6d5bf2 100644
--- a/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptor.java
+++ b/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptor.java
@@ -53,7 +53,7 @@ public class JpaInterceptor implements Interceptor {
@Override
public Object preCall(ComponentMetadata cm, Method m, Object... parameters) throws Throwable {
- if (coordinator == null) {
+ if (coordinator == null || em == null) {
initServices();
}
try {
@@ -71,7 +71,7 @@ public class JpaInterceptor implements Interceptor {
}
private synchronized void initServices() {
- if (coordinator == null) {
+ if (coordinator == null || em == null) {
coordinator = (Coordinator)container.getComponentInstance(coordinatorId);
em = (EntityManager)container.getComponentInstance(emId);
}
[03/50] aries-jpa git commit: [ARIES-1533] Make sure interfaces do
not cause a NPE
Posted by cs...@apache.org.
[ARIES-1533] Make sure interfaces do not cause a NPE
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1739703 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/7bd8dc54
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/7bd8dc54
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/7bd8dc54
Branch: refs/heads/master
Commit: 7bd8dc5489258950113eb7cd63068b57deca82b0
Parents: 5f03952
Author: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Mon Apr 18 08:01:56 2016 +0000
Committer: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Mon Apr 18 08:01:56 2016 +0000
----------------------------------------------------------------------
.../apache/aries/jpa/blueprint/impl/AnnotationScanner.java | 2 +-
.../aries/jpa/blueprint/impl/AnnotationScannerTest.java | 9 +++++++++
.../org/apache/aries/jpa/blueprint/impl/TestInterface.java | 5 +++++
3 files changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/7bd8dc54/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/AnnotationScanner.java
----------------------------------------------------------------------
diff --git a/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/AnnotationScanner.java b/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/AnnotationScanner.java
index 4ec46ae..8fec169 100644
--- a/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/AnnotationScanner.java
+++ b/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/AnnotationScanner.java
@@ -29,7 +29,7 @@ public class AnnotationScanner {
public List<AccessibleObject> getJpaAnnotatedMembers(Class<?> c, Class<? extends Annotation> annotation) {
final List<AccessibleObject> jpaAnnotated = new ArrayList<AccessibleObject>();
- for (Class<?> cl = c; cl != Object.class; cl = cl.getSuperclass()) {
+ for (Class<?> cl = c; cl != Object.class && cl != null; cl = cl.getSuperclass()) {
parseClass(annotation, jpaAnnotated, cl);
}
return jpaAnnotated;
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/7bd8dc54/jpa-blueprint/src/test/java/org/apache/aries/jpa/blueprint/impl/AnnotationScannerTest.java
----------------------------------------------------------------------
diff --git a/jpa-blueprint/src/test/java/org/apache/aries/jpa/blueprint/impl/AnnotationScannerTest.java b/jpa-blueprint/src/test/java/org/apache/aries/jpa/blueprint/impl/AnnotationScannerTest.java
index d317cee..ebd3b85 100644
--- a/jpa-blueprint/src/test/java/org/apache/aries/jpa/blueprint/impl/AnnotationScannerTest.java
+++ b/jpa-blueprint/src/test/java/org/apache/aries/jpa/blueprint/impl/AnnotationScannerTest.java
@@ -87,5 +87,14 @@ public class AnnotationScannerTest {
Assert.assertEquals("setEmf", method.getName());
}
+ /**
+ * When using a factory the class can be an interface. We need to make sure this does not cause a NPE
+ */
+ @Test
+ public void getFactoryTest() {
+ AnnotationScanner scanner = new AnnotationScanner();
+ List<AccessibleObject> members = scanner.getJpaAnnotatedMembers(TestInterface.class, PersistenceUnit.class);
+ Assert.assertEquals(0, members.size());
+ }
}
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/7bd8dc54/jpa-blueprint/src/test/java/org/apache/aries/jpa/blueprint/impl/TestInterface.java
----------------------------------------------------------------------
diff --git a/jpa-blueprint/src/test/java/org/apache/aries/jpa/blueprint/impl/TestInterface.java b/jpa-blueprint/src/test/java/org/apache/aries/jpa/blueprint/impl/TestInterface.java
new file mode 100644
index 0000000..87303f8
--- /dev/null
+++ b/jpa-blueprint/src/test/java/org/apache/aries/jpa/blueprint/impl/TestInterface.java
@@ -0,0 +1,5 @@
+package org.apache.aries.jpa.blueprint.impl;
+
+public interface TestInterface {
+
+}
[02/50] aries-jpa git commit: [jpa] Fix service capabilities
Posted by cs...@apache.org.
[jpa] Fix service capabilities
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1739112 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/5f039521
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/5f039521
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/5f039521
Branch: refs/heads/master
Commit: 5f039521fd0226a69f1b7110c5d3eaccb9a04b45
Parents: f1ff904
Author: gnodet <gn...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Thu Apr 14 14:14:01 2016 +0000
Committer: gnodet <gn...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Thu Apr 14 14:14:01 2016 +0000
----------------------------------------------------------------------
jpa-container/osgi.bnd | 3 +--
jpa-support/osgi.bnd | 7 ++-----
2 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/5f039521/jpa-container/osgi.bnd
----------------------------------------------------------------------
diff --git a/jpa-container/osgi.bnd b/jpa-container/osgi.bnd
index 9992fcf..aed8b5a 100644
--- a/jpa-container/osgi.bnd
+++ b/jpa-container/osgi.bnd
@@ -3,6 +3,5 @@ Import-Package: \
javax.persistence.spi;version="[1.1,3)", \
*
Bundle-Activator: org.apache.aries.jpa.container.impl.Activator
-Export-Service: \
- javax.persistence.EntityManagerFactory
Provide-Capability: osgi.extender;osgi.extender=aries.jpa;version:Version="${project.version.clean}"
+Require-Capability: osgi.service;effective:=active;filter:="(objectClass=javax.persistence.spi.PersistenceProvider)"
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/5f039521/jpa-support/osgi.bnd
----------------------------------------------------------------------
diff --git a/jpa-support/osgi.bnd b/jpa-support/osgi.bnd
index 162da6a..8873499 100644
--- a/jpa-support/osgi.bnd
+++ b/jpa-support/osgi.bnd
@@ -3,8 +3,5 @@ Import-Package: \
javax.persistence.spi;version="[1.1,3)", \
*
Bundle-Activator: org.apache.aries.jpa.support.osgi.impl.Activator
-Export-Service: \
- javax.persistence.EntityManager,
- org.apache.aries.jpa.template.JpaTemplate
-Import-Service:\
- org.osgi.service.coordinator.Coordinator
+Require-Capability:\
+ osgi.service;effective:=active;filter:="(objectClass=org.osgi.service.coordinator.Coordinator)"
[19/50] aries-jpa git commit: [ARIES-1497] Update to new versions.
Simpler config handling
Posted by cs...@apache.org.
[ARIES-1497] Update to new versions. Simpler config handling
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1776938 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/805e98d2
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/805e98d2
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/805e98d2
Branch: refs/heads/master
Commit: 805e98d23652c4c078651085996f60de0302738b
Parents: 1d3e36c
Author: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Mon Jan 2 14:31:00 2017 +0000
Committer: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Mon Jan 2 14:31:00 2017 +0000
----------------------------------------------------------------------
itests/jpa-container-itest-karaf/pom.xml | 4 +-
.../aries/jpa/itest/karaf/AbstractJPAItest.java | 69 ++++----------------
.../test/resources/org.ops4j.pax.logging.cfg | 7 ++
itests/pom.xml | 4 +-
4 files changed, 23 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/805e98d2/itests/jpa-container-itest-karaf/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-itest-karaf/pom.xml b/itests/jpa-container-itest-karaf/pom.xml
index 68b3485..c60c5c4 100644
--- a/itests/jpa-container-itest-karaf/pom.xml
+++ b/itests/jpa-container-itest-karaf/pom.xml
@@ -34,6 +34,7 @@
<properties>
<baseline.skip>true</baseline.skip>
+ <karaf.version>4.0.8</karaf.version>
</properties>
<dependencies>
@@ -55,7 +56,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>1.0</version>
<scope>test</scope>
</dependency>
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>enterprise</artifactId>
- <version>4.0.1</version>
+ <version>${karaf.version}</version>
<type>xml</type>
<classifier>features</classifier>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/805e98d2/itests/jpa-container-itest-karaf/src/test/java/org/apache/aries/jpa/itest/karaf/AbstractJPAItest.java
----------------------------------------------------------------------
diff --git a/itests/jpa-container-itest-karaf/src/test/java/org/apache/aries/jpa/itest/karaf/AbstractJPAItest.java b/itests/jpa-container-itest-karaf/src/test/java/org/apache/aries/jpa/itest/karaf/AbstractJPAItest.java
index 3a5b875..c188e80 100644
--- a/itests/jpa-container-itest-karaf/src/test/java/org/apache/aries/jpa/itest/karaf/AbstractJPAItest.java
+++ b/itests/jpa-container-itest-karaf/src/test/java/org/apache/aries/jpa/itest/karaf/AbstractJPAItest.java
@@ -17,22 +17,21 @@ package org.apache.aries.jpa.itest.karaf;
import static org.ops4j.pax.exam.CoreOptions.maven;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
import static org.ops4j.pax.exam.CoreOptions.vmOption;
import static org.ops4j.pax.exam.CoreOptions.when;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.configureSecurity;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.replaceConfigurationFile;
import java.io.File;
-import java.io.IOException;
-import java.util.Dictionary;
-import java.util.Hashtable;
import javax.inject.Inject;
-import org.junit.Before;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.CoreOptions;
import org.ops4j.pax.exam.Option;
@@ -49,30 +48,16 @@ import org.osgi.framework.Constants;
import org.osgi.framework.Filter;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.service.cm.Configuration;
-import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.jdbc.DataSourceFactory;
import org.osgi.util.tracker.ServiceTracker;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
public abstract class AbstractJPAItest {
- private static Logger LOG = LoggerFactory.getLogger(AbstractJPAItest.class);
+ private static final String DS_CONFIG = "etc/org.ops4j.datasource-tasklist.cfg";
- /*
- * The @Inject annotations below currently do not work as the transaction-api/1.2 feature installs an atinject bundle that
- * confuses pax exam. As a workaround the services are set below in the @Before method
- */
-
- @Inject
- BundleContext bundleContext;
-
@Inject
- ConfigurationAdmin configAdmin;
-
- private static Configuration config;
+ private BundleContext bundleContext;
/**
* Helps to diagnose bundles that are not resolved as it will throw a detailed exception
@@ -137,7 +122,7 @@ public abstract class AbstractJPAItest {
if (localRepo == null) {
localRepo = System.getProperty("org.ops4j.pax.url.mvn.localRepository");
}
- MavenArtifactUrlReference karafUrl = maven().groupId("org.apache.karaf").artifactId("apache-karaf").version("4.0.1").type("tar.gz");
+ MavenArtifactUrlReference karafUrl = maven().groupId("org.apache.karaf").artifactId("apache-karaf").version("4.0.8").type("tar.gz");
UrlReference enterpriseFeatureUrl = maven().groupId("org.apache.karaf.features").artifactId("enterprise").versionAsInProject().type("xml").classifier("features");
UrlReference jpaFeatureUrl = maven().groupId("org.apache.aries.jpa").artifactId("jpa-features").versionAsInProject().type("xml").classifier("features");
UrlReference paxJdbcFeatureUrl = maven().groupId("org.ops4j.pax.jdbc").artifactId("pax-jdbc-features").version("0.7.0").type("xml").classifier("features");
@@ -145,50 +130,20 @@ public abstract class AbstractJPAItest {
//KarafDistributionOption.debugConfiguration("8000", true),
karafDistributionConfiguration().frameworkUrl(karafUrl).name("Apache Karaf").unpackDirectory(new File("target/exam")).useDeployFolder(false),
configureSecurity().disableKarafMBeanServerBuilder(),
+ systemProperty("pax.exam.osgi.unresolved.fail").value("true"),
keepRuntimeFolder(),
logLevel(LogLevel.INFO),
when(localRepo != null).useOptions(vmOption("-Dorg.ops4j.pax.url.mvn.localRepository=" + localRepo)),
features(paxJdbcFeatureUrl, "pax-jdbc-config", "pax-jdbc-h2", "pax-jdbc-pool-dbcp2"),
features(enterpriseFeatureUrl, "transaction", "http-whiteboard", "hibernate/4.3.6.Final", "scr"),
features(jpaFeatureUrl, "jpa"),
- mavenBundle("org.apache.aries.jpa.example", "org.apache.aries.jpa.example.tasklist.model").versionAsInProject()
+ mavenBundle("org.apache.aries.jpa.example", "org.apache.aries.jpa.example.tasklist.model").versionAsInProject(),
+ editConfigurationFilePut(DS_CONFIG, DataSourceFactory.OSGI_JDBC_DRIVER_NAME, "H2-pool-xa"),
+ editConfigurationFilePut(DS_CONFIG, DataSourceFactory.JDBC_DATABASE_NAME, "tasklist;create=true"),
+ editConfigurationFilePut(DS_CONFIG, DataSourceFactory.JDBC_DATASOURCE_NAME, "tasklist"),
+ replaceConfigurationFile("etc/org.ops4j.pax.logging.cfg", new File("src/test/resources/org.ops4j.pax.logging.cfg"))
// replaceConfigurationFile("etc/org.ops4j.pax.logging.cfg", getConfigFile("/etc/org.ops4j.pax.logging.cfg")),
);
-
- }
-
- @Before
- public void createConfigs() throws Exception {
- if (config == null) {
- bundleContext = FrameworkUtil.getBundle(this.getClass()).getBundleContext();
- configAdmin = getService(ConfigurationAdmin.class, null);
- createConfigForLogging();
- createConfigForDS();
-
- }
- }
-
- private void createConfigForDS() throws IOException {
- config = configAdmin.createFactoryConfiguration("org.ops4j.datasource", null);
- Dictionary<String, String> props = new Hashtable<String, String>();
- props.put(DataSourceFactory.OSGI_JDBC_DRIVER_NAME, "H2-pool-xa");
- props.put(DataSourceFactory.JDBC_DATABASE_NAME, "tasklist;create=true");
- props.put(DataSourceFactory.JDBC_DATASOURCE_NAME, "tasklist");
- config.update(props);
- LOG.info("Created DataSource config tasklist");
- }
-
- private void createConfigForLogging() throws IOException {
- Configuration logConfig = configAdmin.getConfiguration("org.ops4j.pax.logging", null);
- Dictionary<String, String> props = new Hashtable<String, String>();
- props.put("log4j.rootLogger", "INFO, stdout");
- props.put("log4j.logger.org.apache.aries.transaction", "DEBUG");
- props.put("log4j.logger.org.apache.aries.transaction.parsing", "DEBUG");
- props.put("log4j.logger.org.apache.aries.jpa.blueprint.impl", "DEBUG");
- props.put("log4j.appender.stdout", "org.apache.log4j.ConsoleAppender");
- props.put("log4j.appender.stdout.layout", "org.apache.log4j.PatternLayout");
- props.put("log4j.appender.stdout.layout.ConversionPattern", "%d{ISO8601} | %-5.5p | %-16.16t | %c | %m%n");
- logConfig.update(props);
}
}
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/805e98d2/itests/jpa-container-itest-karaf/src/test/resources/org.ops4j.pax.logging.cfg
----------------------------------------------------------------------
diff --git a/itests/jpa-container-itest-karaf/src/test/resources/org.ops4j.pax.logging.cfg b/itests/jpa-container-itest-karaf/src/test/resources/org.ops4j.pax.logging.cfg
new file mode 100644
index 0000000..38c577f
--- /dev/null
+++ b/itests/jpa-container-itest-karaf/src/test/resources/org.ops4j.pax.logging.cfg
@@ -0,0 +1,7 @@
+log4j.rootLogger=INFO, stdout
+log4j.logger.org.apache.aries.transaction=DEBUG
+log4j.logger.org.apache.aries.transaction.parsing=DEBUG
+log4j.logger.org.apache.aries.jpa.blueprint.impl=DEBUG
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %c | %m%n
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/805e98d2/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index 657e7e8..43176ef 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -35,10 +35,10 @@
<properties>
<paxlogging.version>1.7.3</paxlogging.version>
- <exam.version>4.6.0</exam.version>
+ <exam.version>4.9.1</exam.version>
<url.version>1.6.0</url.version>
<hibernate42.version>4.2.15.Final</hibernate42.version>
- <hibernate43.version>4.2.15.Final</hibernate43.version>
+ <hibernate43.version>4.4.9</hibernate43.version>
<ant.bundle.version>1.8.2_2</ant.bundle.version>
<antlr.bundle.version>2.7.7_5</antlr.bundle.version>
<dom4j.bundle.version>1.6.1_5</dom4j.bundle.version>
[04/50] aries-jpa git commit: Improve readme
Posted by cs...@apache.org.
Improve readme
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1742219 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/3e816a5e
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/3e816a5e
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/3e816a5e
Branch: refs/heads/master
Commit: 3e816a5e4f5918a0cc34a7660120a62a5e404cbc
Parents: 7bd8dc5
Author: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Wed May 4 07:40:57 2016 +0000
Committer: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Wed May 4 07:40:57 2016 +0000
----------------------------------------------------------------------
examples/README.md | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/3e816a5e/examples/README.md
----------------------------------------------------------------------
diff --git a/examples/README.md b/examples/README.md
index e0af97a..32f48d3 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -2,21 +2,29 @@
Install at least Karaf 4.0.0
-# copy DataSource config
-cat https://svn.apache.org/repos/asf/aries/trunk/jpa/examples/org.ops4j.datasource-tasklist.cfg | tac -f etc/org.ops4j.datasource-tasklist.cfg
-
-feature:repo-add mvn:org.ops4j.pax.jdbc/pax-jdbc-features/0.6.0/xml/features
+## Copy DataSource config
+```
+cat https://svn.apache.org/repos/asf/aries/trunk/jpa/examples/org.ops4j.datasource-tasklist.cfg | tac -f etc/org.ops4j.datasource-tasklist.cfg
+```
+
+## Install features
+```
+feature:repo-add mvn:org.ops4j.pax.jdbc/pax-jdbc-features/0.8.0/xml/features
feature:install scr transaction pax-jdbc-config pax-jdbc-h2 pax-jdbc-pool-dbcp2 http-whiteboard jpa hibernate/4.3.6.Final
+```
# Closure based example. (Make sure to start karaf with JDK 8)
+```
install -s mvn:org.apache.aries.jpa.example/org.apache.aries.jpa.example.tasklist.model/2.1.0
install -s mvn:org.apache.aries.jpa.example/org.apache.aries.jpa.example.tasklist.ds/2.1.0
+```
# Blueprint based example
+```
install -s mvn:org.apache.aries.jpa/org.apache.aries.jpa.blueprint/2.1.0
install -s mvn:org.apache.aries.jpa.example/org.apache.aries.jpa.example.tasklist.model/2.1.0
install -s mvn:org.apache.aries.jpa.example/org.apache.aries.jpa.example.tasklist.blueprint/2.1.0
-
+```
After installing the examples you can check for the services.
[22/50] aries-jpa git commit: [ARIES-1648] Add capabilities for EMF
and EM services to container
Posted by cs...@apache.org.
[ARIES-1648] Add capabilities for EMF and EM services to container
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1777349 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/ef62c045
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/ef62c045
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/ef62c045
Branch: refs/heads/master
Commit: ef62c04520024eea685f1e59b42ca69578488742
Parents: d5bbe7b
Author: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Wed Jan 4 17:18:38 2017 +0000
Committer: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Wed Jan 4 17:18:38 2017 +0000
----------------------------------------------------------------------
jpa-container/osgi.bnd | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/ef62c045/jpa-container/osgi.bnd
----------------------------------------------------------------------
diff --git a/jpa-container/osgi.bnd b/jpa-container/osgi.bnd
index aed8b5a..859022c 100644
--- a/jpa-container/osgi.bnd
+++ b/jpa-container/osgi.bnd
@@ -3,5 +3,8 @@ Import-Package: \
javax.persistence.spi;version="[1.1,3)", \
*
Bundle-Activator: org.apache.aries.jpa.container.impl.Activator
-Provide-Capability: osgi.extender;osgi.extender=aries.jpa;version:Version="${project.version.clean}"
+Provide-Capability: \
+ osgi.extender;osgi.extender=aries.jpa;version:Version="${project.version.clean}",\
+ osgi.service;objectClass=javax.persistence.EntityManagerFactory;effective:=active;uses:=javax.persistence,\
+ osgi.service;objectClass=org.osgi.service.jpa.EntityManagerFactoryBuilder;effective:=active";uses:=org.osgi.service.jpa
Require-Capability: osgi.service;effective:=active;filter:="(objectClass=javax.persistence.spi.PersistenceProvider)"
[39/50] aries-jpa git commit: [ARIES-1689] Fix initialization
Posted by cs...@apache.org.
[ARIES-1689] Fix initialization
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1785770 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/3e7d639d
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/3e7d639d
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/3e7d639d
Branch: refs/heads/master
Commit: 3e7d639d9a939fea8ffcca17d79a7e1f207dd373
Parents: 90229e8
Author: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Mon Mar 6 21:41:47 2017 +0000
Committer: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Mon Mar 6 21:41:47 2017 +0000
----------------------------------------------------------------------
.../org/apache/aries/jpa/blueprint/impl/JpaInterceptor.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/3e7d639d/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptor.java
----------------------------------------------------------------------
diff --git a/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptor.java b/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptor.java
index a6d5bf2..93a37b1 100644
--- a/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptor.java
+++ b/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptor.java
@@ -19,6 +19,7 @@
package org.apache.aries.jpa.blueprint.impl;
import java.lang.reflect.Method;
+import java.util.concurrent.atomic.AtomicBoolean;
import javax.persistence.EntityManager;
import javax.persistence.spi.PersistenceUnitTransactionType;
@@ -39,11 +40,13 @@ public class JpaInterceptor implements Interceptor {
private BlueprintContainer container;
private String coordinatorId;
private String emId;
+ private AtomicBoolean initialized;
public JpaInterceptor(BlueprintContainer container, String coordinatorId, String emId) {
this.container = container;
this.coordinatorId = coordinatorId;
this.emId = emId;
+ this.initialized = new AtomicBoolean(false);
}
@Override
@@ -53,7 +56,7 @@ public class JpaInterceptor implements Interceptor {
@Override
public Object preCall(ComponentMetadata cm, Method m, Object... parameters) throws Throwable {
- if (coordinator == null || em == null) {
+ if (!initialized.get()) {
initServices();
}
try {
@@ -71,7 +74,7 @@ public class JpaInterceptor implements Interceptor {
}
private synchronized void initServices() {
- if (coordinator == null || em == null) {
+ if (initialized.compareAndSet(false, true)) {
coordinator = (Coordinator)container.getComponentInstance(coordinatorId);
em = (EntityManager)container.getComponentInstance(emId);
}
[29/50] aries-jpa git commit: Update of itest libs
Posted by cs...@apache.org.
Update of itest libs
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1783851 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/a0bd814b
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/a0bd814b
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/a0bd814b
Branch: refs/heads/master
Commit: a0bd814bb1e247f06304fe34830812f9f13224a0
Parents: 0b82592
Author: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Tue Feb 21 09:14:20 2017 +0000
Committer: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Tue Feb 21 09:14:20 2017 +0000
----------------------------------------------------------------------
itests/jpa-tck-itest/org.osgi.test.cases.jpa.bnd | 7 +++++--
itests/jpa-tck-itest/pom.xml | 6 +++---
itests/jpa-tck-itest/runtests | 2 +-
3 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/a0bd814b/itests/jpa-tck-itest/org.osgi.test.cases.jpa.bnd
----------------------------------------------------------------------
diff --git a/itests/jpa-tck-itest/org.osgi.test.cases.jpa.bnd b/itests/jpa-tck-itest/org.osgi.test.cases.jpa.bnd
index 755bd31..09704e3 100644
--- a/itests/jpa-tck-itest/org.osgi.test.cases.jpa.bnd
+++ b/itests/jpa-tck-itest/org.osgi.test.cases.jpa.bnd
@@ -14,11 +14,14 @@
# bnd pack for project org.osgi.test.cases.jpa
# Thu Nov 01 12:39:45 EDT 2012
+
+-standalone:
+
-runpath = \
lib/org.eclipse.osgi-3.8.0.v20120529-1548.jar;version=file, \
- lib/org.apache.servicemix.bundles.junit-3.8.2_2.jar;version=file;export="junit.framework;version=3.8"
+lib/org.apache.servicemix.bundles.junit-4.11_1.jar;version=file;export="junit.framework;version=3.8,junit.framework;version=4.11"
--runtrace = true
+#-runtrace = true
-target = \
lib/org.osgi.test.cases.jpa-5.0.0.jar;version=file,
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/a0bd814b/itests/jpa-tck-itest/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-tck-itest/pom.xml b/itests/jpa-tck-itest/pom.xml
index c864433..ddfd7ae 100644
--- a/itests/jpa-tck-itest/pom.xml
+++ b/itests/jpa-tck-itest/pom.xml
@@ -44,13 +44,13 @@
<!-- Test framework -->
<dependency>
<groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd</artifactId>
- <version>2.4.0</version>
+ <artifactId>biz.aQute.bnd</artifactId>
+ <version>3.3.0</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.junit</artifactId>
- <version>3.8.2_2</version>
+ <version>4.11_1</version>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/a0bd814b/itests/jpa-tck-itest/runtests
----------------------------------------------------------------------
diff --git a/itests/jpa-tck-itest/runtests b/itests/jpa-tck-itest/runtests
index b81ddf9..a2984fe 100755
--- a/itests/jpa-tck-itest/runtests
+++ b/itests/jpa-tck-itest/runtests
@@ -17,5 +17,5 @@
cp org.osgi.test.cases.jpa.bnd target
cd target
-java -jar lib/bnd-2.4.0.jar runtests --title osgi.ct
+java -jar lib/biz.aQute.bnd-3.3.0.jar runtests --title osgi.ct
cd ..
[36/50] aries-jpa git commit: [jpa] Add support for the standard JPA
service extender capability
Posted by cs...@apache.org.
[jpa] Add support for the standard JPA service extender capability
Fixes ARIES-1671
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1785286 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/07a76098
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/07a76098
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/07a76098
Branch: refs/heads/master
Commit: 07a7609829205b311b476c5d3bf8f871dd2c05b5
Parents: 8b366ae
Author: timothyjward <ti...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Fri Mar 3 12:50:24 2017 +0000
Committer: timothyjward <ti...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Fri Mar 3 12:50:24 2017 +0000
----------------------------------------------------------------------
jpa-container/osgi.bnd | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/07a76098/jpa-container/osgi.bnd
----------------------------------------------------------------------
diff --git a/jpa-container/osgi.bnd b/jpa-container/osgi.bnd
index 0616b1e..bb4fd81 100644
--- a/jpa-container/osgi.bnd
+++ b/jpa-container/osgi.bnd
@@ -7,6 +7,7 @@ Import-Package: \
Bundle-Activator: org.apache.aries.jpa.container.impl.Activator
Provide-Capability: \
osgi.extender;osgi.extender=aries.jpa;version:Version="${project.version.clean}",\
+ osgi.extender;osgi.extender="osgi.jpa";version:Version="1.1";uses:="org.osgi.service.jpa,javax.persistence",\
osgi.service;objectClass=javax.persistence.EntityManagerFactory;effective:=active;uses:=javax.persistence,\
osgi.service;objectClass=org.osgi.service.jpa.EntityManagerFactoryBuilder;effective:=active";uses:=org.osgi.service.jpa
Require-Capability: \
[34/50] aries-jpa git commit: [maven-release-plugin] prepare for next
development iteration
Posted by cs...@apache.org.
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1784303 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/0a9a175d
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/0a9a175d
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/0a9a175d
Branch: refs/heads/master
Commit: 0a9a175d7fd18b51da3e065cd2e3ff1684c7ea3e
Parents: 4474858
Author: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Fri Feb 24 17:12:46 2017 +0000
Committer: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Fri Feb 24 17:12:46 2017 +0000
----------------------------------------------------------------------
examples/pom.xml | 2 +-
examples/tasklist-blueprint/pom.xml | 2 +-
examples/tasklist-ds/pom.xml | 2 +-
examples/tasklist-model/pom.xml | 2 +-
itests/jpa-container-blueprint-testbundle/pom.xml | 2 +-
itests/jpa-container-itest-karaf/pom.xml | 2 +-
itests/jpa-container-itest/pom.xml | 2 +-
itests/jpa-container-testbundle-eclipselink/pom.xml | 2 +-
itests/jpa-container-testbundle/pom.xml | 2 +-
itests/pom.xml | 2 +-
jpa-api/pom.xml | 2 +-
jpa-blueprint/pom.xml | 2 +-
jpa-container-eclipselink-adapter/pom.xml | 2 +-
jpa-container/pom.xml | 2 +-
jpa-features/pom.xml | 2 +-
jpa-parent/pom.xml | 8 +-------
jpa-repository/pom.xml | 8 +-------
jpa-support/pom.xml | 2 +-
pom.xml | 8 ++++----
19 files changed, 22 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/0a9a175d/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 2842641..4310781 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.6.0</version>
+ <version>2.7.0-SNAPSHOT</version>
<relativePath>../jpa-parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/0a9a175d/examples/tasklist-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/tasklist-blueprint/pom.xml b/examples/tasklist-blueprint/pom.xml
index 64b4e87..1821c75 100644
--- a/examples/tasklist-blueprint/pom.xml
+++ b/examples/tasklist-blueprint/pom.xml
@@ -14,7 +14,7 @@
<parent>
<groupId>org.apache.aries.jpa.example</groupId>
<artifactId>org.apache.aries.jpa.example.parent</artifactId>
- <version>2.6.0</version>
+ <version>2.7.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.example.tasklist.blueprint</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/0a9a175d/examples/tasklist-ds/pom.xml
----------------------------------------------------------------------
diff --git a/examples/tasklist-ds/pom.xml b/examples/tasklist-ds/pom.xml
index 426a1c9..3a39216 100644
--- a/examples/tasklist-ds/pom.xml
+++ b/examples/tasklist-ds/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>org.apache.aries.jpa.example</groupId>
<artifactId>org.apache.aries.jpa.example.parent</artifactId>
- <version>2.6.0</version>
+ <version>2.7.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.example.tasklist.ds</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/0a9a175d/examples/tasklist-model/pom.xml
----------------------------------------------------------------------
diff --git a/examples/tasklist-model/pom.xml b/examples/tasklist-model/pom.xml
index b03aec0..aa7de00 100644
--- a/examples/tasklist-model/pom.xml
+++ b/examples/tasklist-model/pom.xml
@@ -12,7 +12,7 @@
<parent>
<groupId>org.apache.aries.jpa.example</groupId>
<artifactId>org.apache.aries.jpa.example.parent</artifactId>
- <version>2.6.0</version>
+ <version>2.7.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/0a9a175d/itests/jpa-container-blueprint-testbundle/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-blueprint-testbundle/pom.xml b/itests/jpa-container-blueprint-testbundle/pom.xml
index 30edff4..e615398 100644
--- a/itests/jpa-container-blueprint-testbundle/pom.xml
+++ b/itests/jpa-container-blueprint-testbundle/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.6.0</version>
+ <version>2.7.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/0a9a175d/itests/jpa-container-itest-karaf/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-itest-karaf/pom.xml b/itests/jpa-container-itest-karaf/pom.xml
index 145ca01..3b32efc 100644
--- a/itests/jpa-container-itest-karaf/pom.xml
+++ b/itests/jpa-container-itest-karaf/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.6.0</version>
+ <version>2.7.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/0a9a175d/itests/jpa-container-itest/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-itest/pom.xml b/itests/jpa-container-itest/pom.xml
index 1a52d4a..5c25de7 100644
--- a/itests/jpa-container-itest/pom.xml
+++ b/itests/jpa-container-itest/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.6.0</version>
+ <version>2.7.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/0a9a175d/itests/jpa-container-testbundle-eclipselink/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-testbundle-eclipselink/pom.xml b/itests/jpa-container-testbundle-eclipselink/pom.xml
index 6f5e7a6..6387e14 100644
--- a/itests/jpa-container-testbundle-eclipselink/pom.xml
+++ b/itests/jpa-container-testbundle-eclipselink/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.6.0</version>
+ <version>2.7.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/0a9a175d/itests/jpa-container-testbundle/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-testbundle/pom.xml b/itests/jpa-container-testbundle/pom.xml
index 5ec2fbc..1a5bc8a 100644
--- a/itests/jpa-container-testbundle/pom.xml
+++ b/itests/jpa-container-testbundle/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.6.0</version>
+ <version>2.7.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/0a9a175d/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index f7c224f..43b830a 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.6.0</version>
+ <version>2.7.0-SNAPSHOT</version>
<relativePath>../jpa-parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/0a9a175d/jpa-api/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-api/pom.xml b/jpa-api/pom.xml
index 2c79ac7..523a882 100644
--- a/jpa-api/pom.xml
+++ b/jpa-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.6.0</version>
+ <version>2.7.0-SNAPSHOT</version>
<relativePath>../jpa-parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/0a9a175d/jpa-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-blueprint/pom.xml b/jpa-blueprint/pom.xml
index f220dab..4293cc5 100644
--- a/jpa-blueprint/pom.xml
+++ b/jpa-blueprint/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.6.0</version>
+ <version>2.7.0-SNAPSHOT</version>
<relativePath>../jpa-parent</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.blueprint</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/0a9a175d/jpa-container-eclipselink-adapter/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-container-eclipselink-adapter/pom.xml b/jpa-container-eclipselink-adapter/pom.xml
index 46095c2..6d32567 100644
--- a/jpa-container-eclipselink-adapter/pom.xml
+++ b/jpa-container-eclipselink-adapter/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.6.0</version>
+ <version>2.7.0-SNAPSHOT</version>
<relativePath>../jpa-parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/0a9a175d/jpa-container/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-container/pom.xml b/jpa-container/pom.xml
index 44618d9..a6f4de1 100644
--- a/jpa-container/pom.xml
+++ b/jpa-container/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.6.0</version>
+ <version>2.7.0-SNAPSHOT</version>
<relativePath>../jpa-parent</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.container</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/0a9a175d/jpa-features/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-features/pom.xml b/jpa-features/pom.xml
index 6085c77..3d2974f 100644
--- a/jpa-features/pom.xml
+++ b/jpa-features/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.6.0</version>
+ <version>2.7.0-SNAPSHOT</version>
<relativePath>../jpa-parent</relativePath>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/0a9a175d/jpa-parent/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-parent/pom.xml b/jpa-parent/pom.xml
index cb35f16..d730b8b 100644
--- a/jpa-parent/pom.xml
+++ b/jpa-parent/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.6.0</version>
+ <version>2.7.0-SNAPSHOT</version>
<name>Apache Aries JPA parent</name>
<packaging>pom</packaging>
@@ -292,10 +292,4 @@
</build>
</profile>
</profiles>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/org.apache.aries.jpa-2.6.0/org.apache.aries.jpa.parent</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/org.apache.aries.jpa-2.6.0/org.apache.aries.jpa.parent</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/pom/tags/org.apache.aries.jpa-2.6.0/org.apache.aries.jpa.parent</url>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/0a9a175d/jpa-repository/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-repository/pom.xml b/jpa-repository/pom.xml
index 4495515..562bf6f 100644
--- a/jpa-repository/pom.xml
+++ b/jpa-repository/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.apache.aries.jpa</groupId>
<artifactId>jpa-repository</artifactId>
<name>Apache Aries JPA Repository</name>
- <version>2.6.0</version>
+ <version>2.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<bnd.version>3.1.0</bnd.version>
@@ -119,10 +119,4 @@
<version>2.1.0</version>
</dependency>
</dependencies>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.6.0/jpa-repository</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.6.0/jpa-repository</developerConnection>
- <url>scm:svn:http://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.6.0/jpa-repository</url>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/0a9a175d/jpa-support/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-support/pom.xml b/jpa-support/pom.xml
index 7ae4f87..66a5db3 100644
--- a/jpa-support/pom.xml
+++ b/jpa-support/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.6.0</version>
+ <version>2.7.0-SNAPSHOT</version>
<relativePath>../jpa-parent</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.support</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/0a9a175d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index de0c6e2..03d3633 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.6.0</version>
+ <version>2.7.0-SNAPSHOT</version>
<relativePath>jpa-parent</relativePath>
</parent>
@@ -37,9 +37,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.6.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.6.0</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/tags/org.apache.aries.jpa-2.6.0</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jpa</url>
</scm>
<modules>
[11/50] aries-jpa git commit: Disabling cdi to fix build
Posted by cs...@apache.org.
Disabling cdi to fix build
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1748878 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/305581d2
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/305581d2
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/305581d2
Branch: refs/heads/master
Commit: 305581d294ef5db9bc5b935692e4f8b5e71326e1
Parents: ac32967
Author: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Fri Jun 17 16:54:24 2016 +0000
Committer: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Fri Jun 17 16:54:24 2016 +0000
----------------------------------------------------------------------
examples/pom.xml | 2 +-
jpa-cdi/pom.xml | 2 +-
pom.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/305581d2/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 0cf3b90..055d609 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -124,7 +124,7 @@
<module>tasklist-blueprint</module>
<module>tasklist-ds</module>
<module>tasklist-model</module>
- <module>tasklist-cdi</module>
+<!-- <module>tasklist-cdi</module>-->
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/305581d2/jpa-cdi/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-cdi/pom.xml b/jpa-cdi/pom.xml
index fc69007..577d957 100644
--- a/jpa-cdi/pom.xml
+++ b/jpa-cdi/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.5.0-SNAPSHOT</version>
<relativePath>../jpa-parent</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.cdi</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/305581d2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c5fa5a9..88a2a75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
<module>jpa-container</module>
<module>jpa-support</module>
<module>jpa-blueprint</module>
- <module>jpa-cdi</module>
+<!-- <module>jpa-cdi</module>-->
<module>jpa-container-eclipselink-adapter</module>
<module>jpa-repository</module>
<module>examples</module>
[32/50] aries-jpa git commit: [ARIES-1695] Embed OSGi jpa spec
Posted by cs...@apache.org.
[ARIES-1695] Embed OSGi jpa spec
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1784296 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/0ef1f918
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/0ef1f918
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/0ef1f918
Branch: refs/heads/master
Commit: 0ef1f91856d452643c678993c16131374a2a8499
Parents: 7fc8799
Author: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Fri Feb 24 16:40:13 2017 +0000
Committer: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Fri Feb 24 16:40:13 2017 +0000
----------------------------------------------------------------------
jpa-container/osgi.bnd | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/0ef1f918/jpa-container/osgi.bnd
----------------------------------------------------------------------
diff --git a/jpa-container/osgi.bnd b/jpa-container/osgi.bnd
index 72a9139..8026e5c 100644
--- a/jpa-container/osgi.bnd
+++ b/jpa-container/osgi.bnd
@@ -1,3 +1,5 @@
+Export-Package: \
+ org.osgi.service.jpa
Import-Package: \
javax.persistence;version="[1.1,3)", \
javax.persistence.spi;version="[1.1,3)", \
[15/50] aries-jpa git commit: [ARIES-1575] Use bundle context of
persistence bundle for tracker
Posted by cs...@apache.org.
[ARIES-1575] Use bundle context of persistence bundle for tracker
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1766052 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/508754d9
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/508754d9
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/508754d9
Branch: refs/heads/master
Commit: 508754d9bd6fcbe8025cbd0e099a989f6c8dfb4e
Parents: 127990e
Author: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Fri Oct 21 15:48:30 2016 +0000
Committer: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Fri Oct 21 15:48:30 2016 +0000
----------------------------------------------------------------------
.../java/org/apache/aries/jpa/container/impl/Activator.java | 2 +-
.../aries/jpa/container/impl/PersistenceBundleTracker.java | 7 ++-----
.../aries/jpa/container/impl/PersistenceProviderTracker.java | 3 +--
3 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/508754d9/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/Activator.java
----------------------------------------------------------------------
diff --git a/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/Activator.java b/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/Activator.java
index 67c7c56..6f51d85 100644
--- a/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/Activator.java
+++ b/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/Activator.java
@@ -38,7 +38,7 @@ public class Activator implements BundleActivator {
public void start(BundleContext context) throws Exception {
registerWeavingHook(context, TransformerRegistrySingleton.get());
- PersistenceBundleTracker customizer = new PersistenceBundleTracker(context);
+ PersistenceBundleTracker customizer = new PersistenceBundleTracker();
persistenceBundleManager = new BundleTracker<Bundle>(context, Bundle.STARTING | Bundle.ACTIVE, customizer);
persistenceBundleManager.open();
}
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/508754d9/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleTracker.java
----------------------------------------------------------------------
diff --git a/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleTracker.java b/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleTracker.java
index f468cfa..6981256 100644
--- a/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleTracker.java
+++ b/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleTracker.java
@@ -27,7 +27,6 @@ import java.util.Map;
import org.apache.aries.jpa.container.parser.impl.PersistenceUnit;
import org.apache.aries.jpa.container.parser.impl.PersistenceUnitParser;
import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
import org.osgi.util.tracker.BundleTrackerCustomizer;
import org.slf4j.Logger;
@@ -40,11 +39,9 @@ import org.slf4j.LoggerFactory;
public class PersistenceBundleTracker implements BundleTrackerCustomizer<Bundle> {
private static final Logger LOGGER = LoggerFactory.getLogger(PersistenceBundleTracker.class);
private final Map<Bundle, Collection<PersistenceProviderTracker>> trackers;
- private final BundleContext containerContext;
private Map<Integer, String> typeMap;
- public PersistenceBundleTracker(BundleContext context) {
- this.containerContext = context;
+ public PersistenceBundleTracker() {
trackers = new HashMap<Bundle, Collection<PersistenceProviderTracker>>();
this.typeMap = new HashMap<Integer, String>();
this.typeMap.put(BundleEvent.INSTALLED, "INSTALLED");
@@ -102,7 +99,7 @@ public class PersistenceBundleTracker implements BundleTrackerCustomizer<Bundle>
LOGGER.info(String.format("Found persistence unit %s in bundle %s with provider %s.",
punit.getPersistenceUnitName(), bundle.getSymbolicName(),
punit.getPersistenceProviderClassName()));
- PersistenceProviderTracker tracker = new PersistenceProviderTracker(containerContext, punit);
+ PersistenceProviderTracker tracker = new PersistenceProviderTracker(bundle.getBundleContext(), punit);
tracker.open();
getTrackers(bundle).add(tracker);
}
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/508754d9/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceProviderTracker.java
----------------------------------------------------------------------
diff --git a/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceProviderTracker.java b/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceProviderTracker.java
index 91e53ff..67d46e2 100644
--- a/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceProviderTracker.java
+++ b/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceProviderTracker.java
@@ -81,8 +81,7 @@ public class PersistenceProviderTracker extends ServiceTracker<PersistenceProvid
StoredPerProvider stored = new StoredPerProvider();
LOGGER.info("Found provider for " + punit.getPersistenceUnitName() + " " + punit.getPersistenceProviderClassName());
- // This get must happen using the persistence bundle's context to avoid ARIES-1575
- PersistenceProvider provider = punit.getBundle().getBundleContext().getService(reference);
+ PersistenceProvider provider = context.getService(reference);
createAndCloseDummyEMF(provider);
[13/50] aries-jpa git commit: [ARIES-1626] Removed Provide-Capability
from pom and added in osgi.bnd file
Posted by cs...@apache.org.
[ARIES-1626] Removed Provide-Capability from pom and added in osgi.bnd file
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1764428 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/f8073783
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/f8073783
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/f8073783
Branch: refs/heads/master
Commit: f80737832b94a3e37c0cac648ba0cd0fc6f39e44
Parents: 6414efc
Author: ggerla <gg...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Wed Oct 12 10:14:22 2016 +0000
Committer: ggerla <gg...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Wed Oct 12 10:14:22 2016 +0000
----------------------------------------------------------------------
jpa-container-eclipselink-adapter/osgi.bnd | 1 +
jpa-container-eclipselink-adapter/pom.xml | 16 ----------------
2 files changed, 1 insertion(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/f8073783/jpa-container-eclipselink-adapter/osgi.bnd
----------------------------------------------------------------------
diff --git a/jpa-container-eclipselink-adapter/osgi.bnd b/jpa-container-eclipselink-adapter/osgi.bnd
index 35499a0..0e8f0ec 100644
--- a/jpa-container-eclipselink-adapter/osgi.bnd
+++ b/jpa-container-eclipselink-adapter/osgi.bnd
@@ -1,2 +1,3 @@
Export-Package: !*
Bundle-Activator: org.apache.aries.jpa.eclipselink.adapter.Activator
+Provide-Capability: osgi.service; effective:=active; objectClass=javax.persistence.spi.PersistenceProvider
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/f8073783/jpa-container-eclipselink-adapter/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-container-eclipselink-adapter/pom.xml b/jpa-container-eclipselink-adapter/pom.xml
index 6fa0f47..d0d0913 100644
--- a/jpa-container-eclipselink-adapter/pom.xml
+++ b/jpa-container-eclipselink-adapter/pom.xml
@@ -60,20 +60,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>3.0.1</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Provide-Capability>osgi.service; effective:=active; objectClass=javax.persistence.spi.PersistenceProvider</Provide-Capability>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
[31/50] aries-jpa git commit: Add line break
Posted by cs...@apache.org.
Add line break
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1784295 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/7fc8799a
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/7fc8799a
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/7fc8799a
Branch: refs/heads/master
Commit: 7fc8799a68ec899781d2899172d0fa8a78d42398
Parents: d098b5c
Author: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Fri Feb 24 16:40:09 2017 +0000
Committer: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Fri Feb 24 16:40:09 2017 +0000
----------------------------------------------------------------------
jpa-container/osgi.bnd | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/7fc8799a/jpa-container/osgi.bnd
----------------------------------------------------------------------
diff --git a/jpa-container/osgi.bnd b/jpa-container/osgi.bnd
index 859022c..72a9139 100644
--- a/jpa-container/osgi.bnd
+++ b/jpa-container/osgi.bnd
@@ -7,4 +7,5 @@ Provide-Capability: \
osgi.extender;osgi.extender=aries.jpa;version:Version="${project.version.clean}",\
osgi.service;objectClass=javax.persistence.EntityManagerFactory;effective:=active;uses:=javax.persistence,\
osgi.service;objectClass=org.osgi.service.jpa.EntityManagerFactoryBuilder;effective:=active";uses:=org.osgi.service.jpa
-Require-Capability: osgi.service;effective:=active;filter:="(objectClass=javax.persistence.spi.PersistenceProvider)"
+Require-Capability: \
+ osgi.service;effective:=active;filter:="(objectClass=javax.persistence.spi.PersistenceProvider)"
[17/50] aries-jpa git commit: [maven-release-plugin] prepare release
org.apache.aries.jpa-2.5.0
Posted by cs...@apache.org.
[maven-release-plugin] prepare release org.apache.aries.jpa-2.5.0
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1766938 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/1735f86c
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/1735f86c
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/1735f86c
Branch: refs/heads/master
Commit: 1735f86ced11fa78a5666c7c1ab23accd224d4c5
Parents: b88bc89
Author: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Fri Oct 28 07:20:54 2016 +0000
Committer: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Fri Oct 28 07:20:54 2016 +0000
----------------------------------------------------------------------
examples/pom.xml | 2 +-
examples/tasklist-blueprint/pom.xml | 2 +-
examples/tasklist-ds/pom.xml | 2 +-
examples/tasklist-model/pom.xml | 2 +-
itests/jpa-container-blueprint-testbundle/pom.xml | 2 +-
itests/jpa-container-itest-karaf/pom.xml | 2 +-
itests/jpa-container-itest/pom.xml | 2 +-
itests/jpa-container-testbundle-eclipselink/pom.xml | 2 +-
itests/jpa-container-testbundle/pom.xml | 2 +-
itests/pom.xml | 2 +-
jpa-api/pom.xml | 2 +-
jpa-blueprint/pom.xml | 2 +-
jpa-container-eclipselink-adapter/pom.xml | 2 +-
jpa-container/pom.xml | 2 +-
jpa-features/pom.xml | 2 +-
jpa-parent/pom.xml | 8 +++++++-
jpa-repository/pom.xml | 8 +++++++-
jpa-support/pom.xml | 2 +-
pom.xml | 8 ++++----
19 files changed, 34 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1735f86c/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 055d609..2c527e0 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.5.0</version>
<relativePath>../jpa-parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1735f86c/examples/tasklist-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/tasklist-blueprint/pom.xml b/examples/tasklist-blueprint/pom.xml
index fce0258..fda62aa 100644
--- a/examples/tasklist-blueprint/pom.xml
+++ b/examples/tasklist-blueprint/pom.xml
@@ -14,7 +14,7 @@
<parent>
<groupId>org.apache.aries.jpa.example</groupId>
<artifactId>org.apache.aries.jpa.example.parent</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.5.0</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.example.tasklist.blueprint</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1735f86c/examples/tasklist-ds/pom.xml
----------------------------------------------------------------------
diff --git a/examples/tasklist-ds/pom.xml b/examples/tasklist-ds/pom.xml
index 12cc798..1c053be 100644
--- a/examples/tasklist-ds/pom.xml
+++ b/examples/tasklist-ds/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>org.apache.aries.jpa.example</groupId>
<artifactId>org.apache.aries.jpa.example.parent</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.5.0</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.example.tasklist.ds</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1735f86c/examples/tasklist-model/pom.xml
----------------------------------------------------------------------
diff --git a/examples/tasklist-model/pom.xml b/examples/tasklist-model/pom.xml
index 3d43310..13b7cf1 100644
--- a/examples/tasklist-model/pom.xml
+++ b/examples/tasklist-model/pom.xml
@@ -12,7 +12,7 @@
<parent>
<groupId>org.apache.aries.jpa.example</groupId>
<artifactId>org.apache.aries.jpa.example.parent</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.5.0</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1735f86c/itests/jpa-container-blueprint-testbundle/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-blueprint-testbundle/pom.xml b/itests/jpa-container-blueprint-testbundle/pom.xml
index e8d84f6..bec1da9 100644
--- a/itests/jpa-container-blueprint-testbundle/pom.xml
+++ b/itests/jpa-container-blueprint-testbundle/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.5.0</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1735f86c/itests/jpa-container-itest-karaf/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-itest-karaf/pom.xml b/itests/jpa-container-itest-karaf/pom.xml
index 10df01a..8e4196a 100644
--- a/itests/jpa-container-itest-karaf/pom.xml
+++ b/itests/jpa-container-itest-karaf/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.5.0</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1735f86c/itests/jpa-container-itest/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-itest/pom.xml b/itests/jpa-container-itest/pom.xml
index 07ed434..65b97c9 100644
--- a/itests/jpa-container-itest/pom.xml
+++ b/itests/jpa-container-itest/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.5.0</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1735f86c/itests/jpa-container-testbundle-eclipselink/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-testbundle-eclipselink/pom.xml b/itests/jpa-container-testbundle-eclipselink/pom.xml
index 0a3e058..ac594e2 100644
--- a/itests/jpa-container-testbundle-eclipselink/pom.xml
+++ b/itests/jpa-container-testbundle-eclipselink/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.5.0</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1735f86c/itests/jpa-container-testbundle/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-testbundle/pom.xml b/itests/jpa-container-testbundle/pom.xml
index 94eb3d9..3061ca5 100644
--- a/itests/jpa-container-testbundle/pom.xml
+++ b/itests/jpa-container-testbundle/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.5.0</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1735f86c/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index 061f358..8822036 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.5.0</version>
<relativePath>../jpa-parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1735f86c/jpa-api/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-api/pom.xml b/jpa-api/pom.xml
index 4e1b307..65dcae3 100644
--- a/jpa-api/pom.xml
+++ b/jpa-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.5.0</version>
<relativePath>../jpa-parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1735f86c/jpa-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-blueprint/pom.xml b/jpa-blueprint/pom.xml
index 0b3a14a..e54479b 100644
--- a/jpa-blueprint/pom.xml
+++ b/jpa-blueprint/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.5.0</version>
<relativePath>../jpa-parent</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.blueprint</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1735f86c/jpa-container-eclipselink-adapter/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-container-eclipselink-adapter/pom.xml b/jpa-container-eclipselink-adapter/pom.xml
index d0d0913..277a058 100644
--- a/jpa-container-eclipselink-adapter/pom.xml
+++ b/jpa-container-eclipselink-adapter/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.5.0</version>
<relativePath>../jpa-parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1735f86c/jpa-container/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-container/pom.xml b/jpa-container/pom.xml
index ea7324e..a1b7173 100644
--- a/jpa-container/pom.xml
+++ b/jpa-container/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.5.0</version>
<relativePath>../jpa-parent</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.container</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1735f86c/jpa-features/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-features/pom.xml b/jpa-features/pom.xml
index 777ec71..7d82997 100644
--- a/jpa-features/pom.xml
+++ b/jpa-features/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.5.0</version>
<relativePath>../jpa-parent</relativePath>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1735f86c/jpa-parent/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-parent/pom.xml b/jpa-parent/pom.xml
index 1ea4623..a339e9a 100644
--- a/jpa-parent/pom.xml
+++ b/jpa-parent/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.5.0</version>
<name>Apache Aries JPA parent</name>
<packaging>pom</packaging>
@@ -292,4 +292,10 @@
</build>
</profile>
</profiles>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/org.apache.aries.jpa-2.5.0/org.apache.aries.jpa.parent</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/org.apache.aries.jpa-2.5.0/org.apache.aries.jpa.parent</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/pom/tags/org.apache.aries.jpa-2.5.0/org.apache.aries.jpa.parent</url>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1735f86c/jpa-repository/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-repository/pom.xml b/jpa-repository/pom.xml
index aa092d8..5d52c4b 100644
--- a/jpa-repository/pom.xml
+++ b/jpa-repository/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.apache.aries.jpa</groupId>
<artifactId>jpa-repository</artifactId>
<name>Apache Aries JPA Repository</name>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.5.0</version>
<packaging>pom</packaging>
<properties>
<bnd.version>3.1.0</bnd.version>
@@ -119,4 +119,10 @@
<version>2.1.0</version>
</dependency>
</dependencies>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.5.0/jpa-repository</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.5.0/jpa-repository</developerConnection>
+ <url>scm:svn:http://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.5.0/jpa-repository</url>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1735f86c/jpa-support/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-support/pom.xml b/jpa-support/pom.xml
index ffb1c32..d6a8c38 100644
--- a/jpa-support/pom.xml
+++ b/jpa-support/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.5.0</version>
<relativePath>../jpa-parent</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.support</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1735f86c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 88a2a75..2c3e864 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.5.0</version>
<relativePath>jpa-parent</relativePath>
</parent>
@@ -37,9 +37,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/jpa</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.5.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.5.0</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/tags/org.apache.aries.jpa-2.5.0</url>
</scm>
<modules>
[44/50] aries-jpa git commit: Reverting back to osgi jpa spec 1.0.0
for release
Posted by cs...@apache.org.
Reverting back to osgi jpa spec 1.0.0 for release
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1789073 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/a9e9c160
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/a9e9c160
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/a9e9c160
Branch: refs/heads/master
Commit: a9e9c16086d47a3c3aade650938b824b50db46f4
Parents: e353c4c
Author: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Tue Mar 28 09:52:36 2017 +0000
Committer: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Tue Mar 28 09:52:36 2017 +0000
----------------------------------------------------------------------
jpa-container/osgi.bnd | 3 ++-
jpa-container/pom.xml | 2 ++
jpa-parent/pom.xml | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/a9e9c160/jpa-container/osgi.bnd
----------------------------------------------------------------------
diff --git a/jpa-container/osgi.bnd b/jpa-container/osgi.bnd
index 1616da2..932b178 100644
--- a/jpa-container/osgi.bnd
+++ b/jpa-container/osgi.bnd
@@ -1,5 +1,6 @@
Export-Package: \
- org.osgi.service.jpa;provide:=true;-split-package:=merge-first
+ org.osgi.service.jpa
+ #;provide:=true;-split-package:=merge-first
Import-Package: \
javax.persistence;version="[1.1,3)", \
javax.persistence.spi;version="[1.1,3)", \
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/a9e9c160/jpa-container/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-container/pom.xml b/jpa-container/pom.xml
index 53bb673..699bf40 100644
--- a/jpa-container/pom.xml
+++ b/jpa-container/pom.xml
@@ -68,6 +68,7 @@
the OSGi provided APIs to Java 1.6 class compatibility.
Becuase of the way the maven-bundle-plugin works we must
extract the JAR before we translate and slurp in the API -->
+ <!--
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -110,5 +111,6 @@
</executions>
</plugin>
</plugins>
+ -->
</build>
</project>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/a9e9c160/jpa-parent/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-parent/pom.xml b/jpa-parent/pom.xml
index 6524160..e72ba88 100644
--- a/jpa-parent/pom.xml
+++ b/jpa-parent/pom.xml
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.jpa</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
[37/50] aries-jpa git commit: [ARIES-1689] added test to reproduce
the problem
Posted by cs...@apache.org.
[ARIES-1689] added test to reproduce the problem
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1785768 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/8f23eb08
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/8f23eb08
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/8f23eb08
Branch: refs/heads/master
Commit: 8f23eb080bec9f59ca266e39b9669c77271fe7ca
Parents: 07a7609
Author: ggerla <gg...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Mon Mar 6 21:19:10 2017 +0000
Committer: ggerla <gg...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Mon Mar 6 21:19:10 2017 +0000
----------------------------------------------------------------------
.../blueprint/impl/BlueprintContainerStub.java | 51 +++++
.../jpa/blueprint/impl/CoordinatorStub.java | 50 +++++
.../jpa/blueprint/impl/EntityManagerStub.java | 206 +++++++++++++++++++
.../jpa/blueprint/impl/JpaInterceptorTest.java | 70 +++++++
4 files changed, 377 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/8f23eb08/jpa-blueprint/src/test/java/org/apache/aries/jpa/blueprint/impl/BlueprintContainerStub.java
----------------------------------------------------------------------
diff --git a/jpa-blueprint/src/test/java/org/apache/aries/jpa/blueprint/impl/BlueprintContainerStub.java b/jpa-blueprint/src/test/java/org/apache/aries/jpa/blueprint/impl/BlueprintContainerStub.java
new file mode 100644
index 0000000..85c20b5
--- /dev/null
+++ b/jpa-blueprint/src/test/java/org/apache/aries/jpa/blueprint/impl/BlueprintContainerStub.java
@@ -0,0 +1,51 @@
+package org.apache.aries.jpa.blueprint.impl;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import org.osgi.service.blueprint.container.BlueprintContainer;
+import org.osgi.service.blueprint.reflect.ComponentMetadata;
+
+public class BlueprintContainerStub implements BlueprintContainer {
+
+ private Map<String, Object> instances;
+
+ public BlueprintContainerStub() {
+ instances = new HashMap<String, Object>();
+ instances.put("coordinator", new CoordinatorStub());
+ instances.put("em", new EntityManagerStub());
+ }
+
+ @Override
+ public Set<String> getComponentIds() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Object getComponentInstance(String id) {
+ if ("em".equals(id)) {
+ try {
+ Thread.sleep(3000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+ return instances.get(id);
+ }
+
+ @Override
+ public ComponentMetadata getComponentMetadata(String id) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public <T extends ComponentMetadata> Collection<T> getMetadata(Class<T> type) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/8f23eb08/jpa-blueprint/src/test/java/org/apache/aries/jpa/blueprint/impl/CoordinatorStub.java
----------------------------------------------------------------------
diff --git a/jpa-blueprint/src/test/java/org/apache/aries/jpa/blueprint/impl/CoordinatorStub.java b/jpa-blueprint/src/test/java/org/apache/aries/jpa/blueprint/impl/CoordinatorStub.java
new file mode 100644
index 0000000..fe7b40e
--- /dev/null
+++ b/jpa-blueprint/src/test/java/org/apache/aries/jpa/blueprint/impl/CoordinatorStub.java
@@ -0,0 +1,50 @@
+package org.apache.aries.jpa.blueprint.impl;
+
+import java.util.Collection;
+
+import org.osgi.service.coordinator.Coordination;
+import org.osgi.service.coordinator.Coordinator;
+import org.osgi.service.coordinator.Participant;
+
+public class CoordinatorStub implements Coordinator {
+
+ @Override
+ public Coordination create(String name, long timeMillis) {
+ return null;
+ }
+
+ @Override
+ public Coordination begin(String name, long timeMillis) {
+ return null;
+ }
+
+ @Override
+ public Coordination peek() {
+ return null;
+ }
+
+ @Override
+ public Coordination pop() {
+ return null;
+ }
+
+ @Override
+ public boolean fail(Throwable cause) {
+ return false;
+ }
+
+ @Override
+ public boolean addParticipant(Participant participant) {
+ return false;
+ }
+
+ @Override
+ public Collection<Coordination> getCoordinations() {
+ return null;
+ }
+
+ @Override
+ public Coordination getCoordination(long id) {
+ return null;
+ }
+}
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/8f23eb08/jpa-blueprint/src/test/java/org/apache/aries/jpa/blueprint/impl/EntityManagerStub.java
----------------------------------------------------------------------
diff --git a/jpa-blueprint/src/test/java/org/apache/aries/jpa/blueprint/impl/EntityManagerStub.java b/jpa-blueprint/src/test/java/org/apache/aries/jpa/blueprint/impl/EntityManagerStub.java
new file mode 100644
index 0000000..ce51a33
--- /dev/null
+++ b/jpa-blueprint/src/test/java/org/apache/aries/jpa/blueprint/impl/EntityManagerStub.java
@@ -0,0 +1,206 @@
+package org.apache.aries.jpa.blueprint.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.EntityTransaction;
+import javax.persistence.FlushModeType;
+import javax.persistence.LockModeType;
+import javax.persistence.Query;
+import javax.persistence.TypedQuery;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.metamodel.Metamodel;
+import javax.persistence.spi.PersistenceUnitTransactionType;
+
+public class EntityManagerStub implements EntityManager {
+
+ @Override
+ public void clear() {
+ }
+
+ @Override
+ public void close() {
+ }
+
+ @Override
+ public boolean contains(Object arg0) {
+ return false;
+ }
+
+ @Override
+ public Query createNamedQuery(String arg0) {
+ return null;
+ }
+
+ @Override
+ public <T> TypedQuery<T> createNamedQuery(String arg0, Class<T> arg1) {
+ return null;
+ }
+
+ @Override
+ public Query createNativeQuery(String arg0) {
+ return null;
+ }
+
+ @Override
+ public Query createNativeQuery(String arg0, Class arg1) {
+ return null;
+ }
+
+ @Override
+ public Query createNativeQuery(String arg0, String arg1) {
+ return null;
+ }
+
+ @Override
+ public Query createQuery(String arg0) {
+ return null;
+ }
+
+ @Override
+ public <T> TypedQuery<T> createQuery(CriteriaQuery<T> arg0) {
+ return null;
+ }
+
+ @Override
+ public <T> TypedQuery<T> createQuery(String arg0, Class<T> arg1) {
+ return null;
+ }
+
+ @Override
+ public void detach(Object arg0) {
+ }
+
+ @Override
+ public <T> T find(Class<T> arg0, Object arg1) {
+ return null;
+ }
+
+ @Override
+ public <T> T find(Class<T> arg0, Object arg1, Map<String, Object> arg2) {
+ return null;
+ }
+
+ @Override
+ public <T> T find(Class<T> arg0, Object arg1, LockModeType arg2) {
+ return null;
+ }
+
+ @Override
+ public <T> T find(Class<T> arg0, Object arg1, LockModeType arg2, Map<String, Object> arg3) {
+ return null;
+ }
+
+ @Override
+ public void flush() {
+ }
+
+ @Override
+ public CriteriaBuilder getCriteriaBuilder() {
+ return null;
+ }
+
+ @Override
+ public Object getDelegate() {
+ return null;
+ }
+
+ @Override
+ public EntityManagerFactory getEntityManagerFactory() {
+ return null;
+ }
+
+ @Override
+ public FlushModeType getFlushMode() {
+ return null;
+ }
+
+ @Override
+ public LockModeType getLockMode(Object arg0) {
+ return null;
+ }
+
+ @Override
+ public Metamodel getMetamodel() {
+ return null;
+ }
+
+ @Override
+ public Map<String, Object> getProperties() {
+ Map<String, Object> ret = new HashMap<String, Object>();
+ ret.put(PersistenceUnitTransactionType.class.getName(), PersistenceUnitTransactionType.JTA);
+ return ret;
+ }
+
+ @Override
+ public <T> T getReference(Class<T> arg0, Object arg1) {
+ return null;
+ }
+
+ @Override
+ public EntityTransaction getTransaction() {
+ return null;
+ }
+
+ @Override
+ public boolean isOpen() {
+ return false;
+ }
+
+ @Override
+ public void joinTransaction() {
+ }
+
+ @Override
+ public void lock(Object arg0, LockModeType arg1) {
+ }
+
+ @Override
+ public void lock(Object arg0, LockModeType arg1, Map<String, Object> arg2) {
+ }
+
+ @Override
+ public <T> T merge(T arg0) {
+ return null;
+ }
+
+ @Override
+ public void persist(Object arg0) {
+ }
+
+ @Override
+ public void refresh(Object arg0) {
+ }
+
+ @Override
+ public void refresh(Object arg0, Map<String, Object> arg1) {
+ }
+
+ @Override
+ public void refresh(Object arg0, LockModeType arg1) {
+ }
+
+ @Override
+ public void refresh(Object arg0, LockModeType arg1, Map<String, Object> arg2) {
+ }
+
+ @Override
+ public void remove(Object arg0) {
+ }
+
+ @Override
+ public void setFlushMode(FlushModeType arg0) {
+ }
+
+ @Override
+ public void setProperty(String arg0, Object arg1) {
+ }
+
+ @Override
+ public <T> T unwrap(Class<T> arg0) {
+ return null;
+ }
+}
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/8f23eb08/jpa-blueprint/src/test/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptorTest.java
----------------------------------------------------------------------
diff --git a/jpa-blueprint/src/test/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptorTest.java b/jpa-blueprint/src/test/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptorTest.java
new file mode 100644
index 0000000..43f16de
--- /dev/null
+++ b/jpa-blueprint/src/test/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptorTest.java
@@ -0,0 +1,70 @@
+package org.apache.aries.jpa.blueprint.impl;
+
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.osgi.service.blueprint.container.BlueprintContainer;
+import org.osgi.service.blueprint.reflect.ComponentMetadata;
+
+public class JpaInterceptorTest implements Runnable {
+ private JpaInterceptor interceptor;
+ private AtomicBoolean result = new AtomicBoolean(true);
+
+ @Test
+ public void testThreadSafePreCall() throws InterruptedException {
+ BlueprintContainer container = new BlueprintContainerStub();
+ interceptor = new JpaInterceptor(container, "coordinator", "em");
+
+ Thread t1 = new Thread(this);
+ Thread t2 = new Thread(this);
+
+ t1.start();
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ t2.start();
+ synchronized (result) {
+ result.wait();
+ }
+ Assert.assertTrue(result.get());
+ }
+
+ @Override
+ public void run() {
+ ComponentMetadata cm = new ComponentMetadata() {
+
+ @Override
+ public String getId() {
+ return "testMetadata";
+ }
+
+ @Override
+ public List<String> getDependsOn() {
+ return null;
+ }
+
+ @Override
+ public int getActivation() {
+ return 0;
+ }
+ };
+ Method m;
+ try {
+ m = this.getClass().getMethod("run", null);
+ interceptor.preCall(cm, m, null);
+ } catch (Throwable e) {
+ synchronized (result) {
+ result.set(false);
+ }
+ } finally {
+ synchronized (result) {
+ result.notifyAll();
+ }
+ }
+ }
+}
[43/50] aries-jpa git commit: [ARIES-1698] Define osgi jpa spec
version in parent
Posted by cs...@apache.org.
[ARIES-1698] Define osgi jpa spec version in parent
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1788962 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/e353c4c1
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/e353c4c1
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/e353c4c1
Branch: refs/heads/master
Commit: e353c4c18274721a113dc5e709f381c152bcf194
Parents: 0eacce8
Author: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Mon Mar 27 15:42:41 2017 +0000
Committer: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Mon Mar 27 15:42:41 2017 +0000
----------------------------------------------------------------------
jpa-container/pom.xml | 3 +--
jpa-parent/pom.xml | 5 +++++
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/e353c4c1/jpa-container/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-container/pom.xml b/jpa-container/pom.xml
index 85b0e6b..53bb673 100644
--- a/jpa-container/pom.xml
+++ b/jpa-container/pom.xml
@@ -44,7 +44,6 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.jpa</artifactId>
- <version>1.1.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -112,4 +111,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/e353c4c1/jpa-parent/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-parent/pom.xml b/jpa-parent/pom.xml
index d6feb7c..6524160 100644
--- a/jpa-parent/pom.xml
+++ b/jpa-parent/pom.xml
@@ -75,6 +75,11 @@
<version>1.0.0</version>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.jpa</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
<version>1.1</version>
[46/50] aries-jpa git commit: [maven-release-plugin] prepare for next
development iteration
Posted by cs...@apache.org.
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1789076 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/09680816
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/09680816
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/09680816
Branch: refs/heads/master
Commit: 096808165219931e782e095676a304bbc59bf748
Parents: 9860e84
Author: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Tue Mar 28 09:57:26 2017 +0000
Committer: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Tue Mar 28 09:57:26 2017 +0000
----------------------------------------------------------------------
examples/pom.xml | 2 +-
examples/tasklist-blueprint/pom.xml | 2 +-
examples/tasklist-ds/pom.xml | 2 +-
examples/tasklist-model/pom.xml | 2 +-
itests/jpa-container-blueprint-testbundle/pom.xml | 2 +-
itests/jpa-container-itest-karaf/pom.xml | 2 +-
itests/jpa-container-itest/pom.xml | 2 +-
itests/jpa-container-testbundle-eclipselink/pom.xml | 2 +-
itests/jpa-container-testbundle/pom.xml | 2 +-
itests/pom.xml | 2 +-
jpa-api/pom.xml | 2 +-
jpa-blueprint/pom.xml | 2 +-
jpa-container-eclipselink-adapter/pom.xml | 2 +-
jpa-container/pom.xml | 2 +-
jpa-features/pom.xml | 2 +-
jpa-parent/pom.xml | 8 +-------
jpa-repository/pom.xml | 8 +-------
jpa-support/pom.xml | 2 +-
pom.xml | 8 ++++----
19 files changed, 22 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/09680816/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 914616e..4310781 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.6.1</version>
+ <version>2.7.0-SNAPSHOT</version>
<relativePath>../jpa-parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/09680816/examples/tasklist-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/tasklist-blueprint/pom.xml b/examples/tasklist-blueprint/pom.xml
index 6efa5c0..1821c75 100644
--- a/examples/tasklist-blueprint/pom.xml
+++ b/examples/tasklist-blueprint/pom.xml
@@ -14,7 +14,7 @@
<parent>
<groupId>org.apache.aries.jpa.example</groupId>
<artifactId>org.apache.aries.jpa.example.parent</artifactId>
- <version>2.6.1</version>
+ <version>2.7.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.example.tasklist.blueprint</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/09680816/examples/tasklist-ds/pom.xml
----------------------------------------------------------------------
diff --git a/examples/tasklist-ds/pom.xml b/examples/tasklist-ds/pom.xml
index 188ccf7..3a39216 100644
--- a/examples/tasklist-ds/pom.xml
+++ b/examples/tasklist-ds/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>org.apache.aries.jpa.example</groupId>
<artifactId>org.apache.aries.jpa.example.parent</artifactId>
- <version>2.6.1</version>
+ <version>2.7.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.example.tasklist.ds</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/09680816/examples/tasklist-model/pom.xml
----------------------------------------------------------------------
diff --git a/examples/tasklist-model/pom.xml b/examples/tasklist-model/pom.xml
index 3e9240f..aa7de00 100644
--- a/examples/tasklist-model/pom.xml
+++ b/examples/tasklist-model/pom.xml
@@ -12,7 +12,7 @@
<parent>
<groupId>org.apache.aries.jpa.example</groupId>
<artifactId>org.apache.aries.jpa.example.parent</artifactId>
- <version>2.6.1</version>
+ <version>2.7.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/09680816/itests/jpa-container-blueprint-testbundle/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-blueprint-testbundle/pom.xml b/itests/jpa-container-blueprint-testbundle/pom.xml
index c4d390a..e615398 100644
--- a/itests/jpa-container-blueprint-testbundle/pom.xml
+++ b/itests/jpa-container-blueprint-testbundle/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.6.1</version>
+ <version>2.7.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/09680816/itests/jpa-container-itest-karaf/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-itest-karaf/pom.xml b/itests/jpa-container-itest-karaf/pom.xml
index 2e1f89a..3b32efc 100644
--- a/itests/jpa-container-itest-karaf/pom.xml
+++ b/itests/jpa-container-itest-karaf/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.6.1</version>
+ <version>2.7.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/09680816/itests/jpa-container-itest/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-itest/pom.xml b/itests/jpa-container-itest/pom.xml
index abbab79..5c25de7 100644
--- a/itests/jpa-container-itest/pom.xml
+++ b/itests/jpa-container-itest/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.6.1</version>
+ <version>2.7.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/09680816/itests/jpa-container-testbundle-eclipselink/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-testbundle-eclipselink/pom.xml b/itests/jpa-container-testbundle-eclipselink/pom.xml
index 72b66d0..6387e14 100644
--- a/itests/jpa-container-testbundle-eclipselink/pom.xml
+++ b/itests/jpa-container-testbundle-eclipselink/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.6.1</version>
+ <version>2.7.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/09680816/itests/jpa-container-testbundle/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-testbundle/pom.xml b/itests/jpa-container-testbundle/pom.xml
index 9368298..1a5bc8a 100644
--- a/itests/jpa-container-testbundle/pom.xml
+++ b/itests/jpa-container-testbundle/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.6.1</version>
+ <version>2.7.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/09680816/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index 2ca5632..43b830a 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.6.1</version>
+ <version>2.7.0-SNAPSHOT</version>
<relativePath>../jpa-parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/09680816/jpa-api/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-api/pom.xml b/jpa-api/pom.xml
index f93a71b..523a882 100644
--- a/jpa-api/pom.xml
+++ b/jpa-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.6.1</version>
+ <version>2.7.0-SNAPSHOT</version>
<relativePath>../jpa-parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/09680816/jpa-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-blueprint/pom.xml b/jpa-blueprint/pom.xml
index cd96e4a..4293cc5 100644
--- a/jpa-blueprint/pom.xml
+++ b/jpa-blueprint/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.6.1</version>
+ <version>2.7.0-SNAPSHOT</version>
<relativePath>../jpa-parent</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.blueprint</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/09680816/jpa-container-eclipselink-adapter/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-container-eclipselink-adapter/pom.xml b/jpa-container-eclipselink-adapter/pom.xml
index 88b65a2..6d32567 100644
--- a/jpa-container-eclipselink-adapter/pom.xml
+++ b/jpa-container-eclipselink-adapter/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.6.1</version>
+ <version>2.7.0-SNAPSHOT</version>
<relativePath>../jpa-parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/09680816/jpa-container/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-container/pom.xml b/jpa-container/pom.xml
index bba6c96..699bf40 100644
--- a/jpa-container/pom.xml
+++ b/jpa-container/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.6.1</version>
+ <version>2.7.0-SNAPSHOT</version>
<relativePath>../jpa-parent</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.container</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/09680816/jpa-features/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-features/pom.xml b/jpa-features/pom.xml
index e0d93b9..3d2974f 100644
--- a/jpa-features/pom.xml
+++ b/jpa-features/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.6.1</version>
+ <version>2.7.0-SNAPSHOT</version>
<relativePath>../jpa-parent</relativePath>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/09680816/jpa-parent/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-parent/pom.xml b/jpa-parent/pom.xml
index 75e28fb..e72ba88 100644
--- a/jpa-parent/pom.xml
+++ b/jpa-parent/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.6.1</version>
+ <version>2.7.0-SNAPSHOT</version>
<name>Apache Aries JPA parent</name>
<packaging>pom</packaging>
@@ -312,10 +312,4 @@
</build>
</profile>
</profiles>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/org.apache.aries.jpa-2.6.1/org.apache.aries.jpa.parent</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/org.apache.aries.jpa-2.6.1/org.apache.aries.jpa.parent</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/pom/tags/org.apache.aries.jpa-2.6.1/org.apache.aries.jpa.parent</url>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/09680816/jpa-repository/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-repository/pom.xml b/jpa-repository/pom.xml
index 11ef56f..562bf6f 100644
--- a/jpa-repository/pom.xml
+++ b/jpa-repository/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.apache.aries.jpa</groupId>
<artifactId>jpa-repository</artifactId>
<name>Apache Aries JPA Repository</name>
- <version>2.6.1</version>
+ <version>2.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<bnd.version>3.1.0</bnd.version>
@@ -119,10 +119,4 @@
<version>2.1.0</version>
</dependency>
</dependencies>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.6.1/jpa-repository</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.6.1/jpa-repository</developerConnection>
- <url>scm:svn:http://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.6.1/jpa-repository</url>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/09680816/jpa-support/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-support/pom.xml b/jpa-support/pom.xml
index 699b430..66a5db3 100644
--- a/jpa-support/pom.xml
+++ b/jpa-support/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.6.1</version>
+ <version>2.7.0-SNAPSHOT</version>
<relativePath>../jpa-parent</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.support</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/09680816/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c3cdaa5..03d3633 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.6.1</version>
+ <version>2.7.0-SNAPSHOT</version>
<relativePath>jpa-parent</relativePath>
</parent>
@@ -37,9 +37,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.6.1</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.6.1</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/tags/org.apache.aries.jpa-2.6.1</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jpa</url>
</scm>
<modules>
[49/50] aries-jpa git commit: Update to proxy 1.1.0
Posted by cs...@apache.org.
Update to proxy 1.1.0
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1791110 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/0421a9af
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/0421a9af
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/0421a9af
Branch: refs/heads/master
Commit: 0421a9af764609923505176ce10ae7f821dc5f3c
Parents: 76dd096
Author: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Wed Apr 12 11:27:31 2017 +0000
Committer: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Wed Apr 12 11:27:31 2017 +0000
----------------------------------------------------------------------
itests/jpa-container-itest/pom.xml | 10 ++--------
.../java/org/apache/aries/jpa/itest/AbstractJPAItest.java | 3 +--
2 files changed, 3 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/0421a9af/itests/jpa-container-itest/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-itest/pom.xml b/itests/jpa-container-itest/pom.xml
index 317b52c..15e23bc 100644
--- a/itests/jpa-container-itest/pom.xml
+++ b/itests/jpa-container-itest/pom.xml
@@ -76,14 +76,8 @@
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy.api</artifactId>
- <version>1.0.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy.impl</artifactId>
- <version>1.0.3</version>
+ <artifactId>org.apache.aries.proxy</artifactId>
+ <version>1.1.0</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/0421a9af/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java
----------------------------------------------------------------------
diff --git a/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java b/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java
index baed9ee..6fc36ae 100644
--- a/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java
+++ b/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java
@@ -189,8 +189,7 @@ public abstract class AbstractJPAItest {
mvnBundle("org.apache.felix", "org.apache.felix.configadmin"),
mvnBundle("org.apache.felix", "org.apache.felix.coordinator"),
- mvnBundle("org.apache.aries.proxy", "org.apache.aries.proxy.api"),
- mvnBundle("org.apache.aries.proxy", "org.apache.aries.proxy.impl"),
+ mvnBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
mvnBundle("org.apache.aries", "org.apache.aries.util"),
mvnBundle("org.apache.aries.jndi", "org.apache.aries.jndi.api"),
[30/50] aries-jpa git commit: [ARIES-1689] Improve performance
Posted by cs...@apache.org.
[ARIES-1689] Improve performance
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1783861 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/d098b5c3
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/d098b5c3
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/d098b5c3
Branch: refs/heads/master
Commit: d098b5c3cc2adbcc211f572e8640907e37c7edbc
Parents: a0bd814
Author: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Tue Feb 21 10:09:50 2017 +0000
Committer: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Tue Feb 21 10:09:50 2017 +0000
----------------------------------------------------------------------
.../aries/jpa/blueprint/impl/JpaInterceptor.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/d098b5c3/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptor.java
----------------------------------------------------------------------
diff --git a/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptor.java b/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptor.java
index 960e375..59a5c8e 100644
--- a/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptor.java
+++ b/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptor.java
@@ -53,10 +53,8 @@ public class JpaInterceptor implements Interceptor {
@Override
public Object preCall(ComponentMetadata cm, Method m, Object... parameters) throws Throwable {
- synchronized (this) {
- if (coordinator == null) {
- initServices();
- }
+ if (coordinator == null) {
+ initServices();
}
try {
LOG.debug("PreCall for bean {}, method {}", cm.getId(), m.getName());
@@ -72,9 +70,11 @@ public class JpaInterceptor implements Interceptor {
}
}
- private void initServices() {
- coordinator = (Coordinator)container.getComponentInstance(coordinatorId);
- em = (EntityManager)container.getComponentInstance(emId);
+ private synchronized void initServices() {
+ if (coordinator == null) {
+ coordinator = (Coordinator)container.getComponentInstance(coordinatorId);
+ em = (EntityManager)container.getComponentInstance(emId);
+ }
}
@Override
[28/50] aries-jpa git commit: [ARIES-1689] added synchronized
statement for initialization block
Posted by cs...@apache.org.
[ARIES-1689] added synchronized statement for initialization block
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1783675 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/0b82592f
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/0b82592f
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/0b82592f
Branch: refs/heads/master
Commit: 0b82592fa7960384eb1e3442950112052e7e279a
Parents: 82c41d3
Author: ggerla <gg...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Sun Feb 19 17:13:30 2017 +0000
Committer: ggerla <gg...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Sun Feb 19 17:13:30 2017 +0000
----------------------------------------------------------------------
.../apache/aries/jpa/blueprint/impl/JpaInterceptor.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/0b82592f/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptor.java
----------------------------------------------------------------------
diff --git a/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptor.java b/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptor.java
index 6a11125..960e375 100644
--- a/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptor.java
+++ b/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptor.java
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
public class JpaInterceptor implements Interceptor {
private static final Logger LOG = LoggerFactory.getLogger(JpaInterceptor.class);
- EntityManager em;
+ private EntityManager em;
private Boolean cachedIsResourceLocal;
private Coordinator coordinator;
private BlueprintContainer container;
@@ -53,8 +53,10 @@ public class JpaInterceptor implements Interceptor {
@Override
public Object preCall(ComponentMetadata cm, Method m, Object... parameters) throws Throwable {
- if (coordinator == null) {
- initServices();
+ synchronized (this) {
+ if (coordinator == null) {
+ initServices();
+ }
}
try {
LOG.debug("PreCall for bean {}, method {}", cm.getId(), m.getName());
@@ -79,7 +81,7 @@ public class JpaInterceptor implements Interceptor {
public void postCallWithException(ComponentMetadata cm, Method m, Throwable ex, Object preCallToken) {
LOG.debug("PostCallWithException for bean {}, method {}", cm.getId(), m.getName(), ex);
if (preCallToken != null) {
- ((Coordination) preCallToken).fail(ex);
+ ((Coordination)preCallToken).fail(ex);
}
}
@@ -88,7 +90,7 @@ public class JpaInterceptor implements Interceptor {
throws Exception {
LOG.debug("PostCallWithReturn for bean {}, method {}", cm.getId(), m.getName());
if (preCallToken != null) {
- ((Coordination) preCallToken).end();
+ ((Coordination)preCallToken).end();
}
}
[23/50] aries-jpa git commit: [ARIES-1649] Updated version of maven
bundle plugin,
added dependency to EclipseLink JPA bundle using Require-Capability and
changed version of EclipseLink JPA to previous one
Posted by cs...@apache.org.
[ARIES-1649] Updated version of maven bundle plugin, added dependency to EclipseLink JPA bundle using Require-Capability and changed version of EclipseLink JPA to previous one
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1777459 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/d992a021
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/d992a021
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/d992a021
Branch: refs/heads/master
Commit: d992a0214227fd3a3672ac29ff9c6ee8e1c877e3
Parents: ef62c04
Author: ggerla <gg...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Thu Jan 5 12:13:12 2017 +0000
Committer: ggerla <gg...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Thu Jan 5 12:13:12 2017 +0000
----------------------------------------------------------------------
jpa-container-eclipselink-adapter/osgi.bnd | 1 +
jpa-container-eclipselink-adapter/pom.xml | 2 +-
jpa-parent/pom.xml | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/d992a021/jpa-container-eclipselink-adapter/osgi.bnd
----------------------------------------------------------------------
diff --git a/jpa-container-eclipselink-adapter/osgi.bnd b/jpa-container-eclipselink-adapter/osgi.bnd
index 0e8f0ec..8908dbd 100644
--- a/jpa-container-eclipselink-adapter/osgi.bnd
+++ b/jpa-container-eclipselink-adapter/osgi.bnd
@@ -1,3 +1,4 @@
Export-Package: !*
Bundle-Activator: org.apache.aries.jpa.eclipselink.adapter.Activator
+Require-Capability: osgi.identity; effective:=active; filter:="(osgi.identity=org.eclipse.persistence.jpa)"
Provide-Capability: osgi.service; effective:=active; objectClass=javax.persistence.spi.PersistenceProvider
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/d992a021/jpa-container-eclipselink-adapter/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-container-eclipselink-adapter/pom.xml b/jpa-container-eclipselink-adapter/pom.xml
index 75b29fd..32ec492 100644
--- a/jpa-container-eclipselink-adapter/pom.xml
+++ b/jpa-container-eclipselink-adapter/pom.xml
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.jpa</artifactId>
- <version>2.6.4</version>
+ <version>2.4.2</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/d992a021/jpa-parent/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-parent/pom.xml b/jpa-parent/pom.xml
index 9e54ae1..3b8f216 100644
--- a/jpa-parent/pom.xml
+++ b/jpa-parent/pom.xml
@@ -183,7 +183,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>3.0.1</version>
+ <version>3.2.0</version>
<extensions>true</extensions>
<configuration>
<obrRepository>NONE</obrRepository>
[50/50] aries-jpa git commit: [ARIES-1716] Upgrade to pax-jdbc 1.1.0
Posted by cs...@apache.org.
[ARIES-1716] Upgrade to pax-jdbc 1.1.0
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1791222 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/a5df7f6c
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/a5df7f6c
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/a5df7f6c
Branch: refs/heads/master
Commit: a5df7f6c13b7c89d157e576054cf556ef55e75dc
Parents: 0421a9a
Author: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Thu Apr 13 08:48:55 2017 +0000
Committer: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Thu Apr 13 08:48:55 2017 +0000
----------------------------------------------------------------------
itests/jpa-container-itest/pom.xml | 8 +-
.../jpa/container/itest/JPAContainerTest.java | 21 +----
.../aries/jpa/itest/AbstractJPAItest.java | 82 +++++++-------------
.../config/org.ops4j.datasource-testds.cfg | 3 +
.../config/org.ops4j.datasource-testdsxa.cfg | 5 ++
.../resources/config/org.ops4j.pax.logging.cfg | 7 ++
.../src/main/resources/META-INF/persistence.xml | 10 +--
itests/pom.xml | 2 +-
8 files changed, 59 insertions(+), 79 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/a5df7f6c/itests/jpa-container-itest/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-itest/pom.xml b/itests/jpa-container-itest/pom.xml
index 15e23bc..bd7b75a 100644
--- a/itests/jpa-container-itest/pom.xml
+++ b/itests/jpa-container-itest/pom.xml
@@ -352,6 +352,12 @@
<!-- pax exam -->
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-cm</artifactId>
+ <version>${exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
<version>${exam.version}</version>
<scope>test</scope>
@@ -383,7 +389,7 @@
<dependency>
<groupId>org.ops4j.pax.tinybundles</groupId>
<artifactId>tinybundles</artifactId>
- <version>2.0.0</version>
+ <version>2.1.1</version>
<exclusions>
<exclusion>
<artifactId>org.osgi.core</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/a5df7f6c/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java
----------------------------------------------------------------------
diff --git a/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java b/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java
index 607e09e..73c12f6 100644
--- a/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java
+++ b/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java
@@ -30,7 +30,6 @@ import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Query;
import javax.persistence.TypedQuery;
-import javax.sql.DataSource;
import org.apache.aries.jpa.container.itest.entities.Car;
import org.apache.aries.jpa.itest.AbstractCarJPAITest;
@@ -167,25 +166,14 @@ public abstract class JPAContainerTest extends AbstractCarJPAITest {
@Test
public void testCarEMFBuilderExternalDSXA() throws Exception {
- DataSource ds = getService(DataSource.class,
- "(" + OSGI_JDBC_DRIVER_CLASS + "=org.apache.derby.jdbc.EmbeddedDriver-pool-xa)");
-
EntityManagerFactoryBuilder emfBuilder = getService(EntityManagerFactoryBuilder.class,
"(osgi.unit.name=" + EXTERNAL_TEST_UNIT + ")");
-
-
+
Map<String, Object> props = new HashMap<String, Object>();
props.put("javax.persistence.jtaDataSource", ds);
props.put("javax.persistence.transactionType", JTA.name());
-
//EclipseLink also needs a non-jta-datasource
- DataSourceFactory dsf = getService(DataSourceFactory.class,
- "(" + OSGI_JDBC_DRIVER_CLASS + "=org.apache.derby.jdbc.EmbeddedDriver)");
- Properties jdbcProps = new Properties();
- jdbcProps.setProperty("url", "jdbc:derby:memory:TEST1;create=true");
- props.put("javax.persistence.nonJtaDataSource", dsf.createDataSource(jdbcProps));
-
-
+ props.put("javax.persistence.nonJtaDataSource", ds);
EntityManagerFactory emf = emfBuilder.createEntityManagerFactory(props);
carLifecycleXA(ut, emf.createEntityManager());
}
@@ -195,15 +183,10 @@ public abstract class JPAContainerTest extends AbstractCarJPAITest {
EntityManagerFactoryBuilder emfBuilder = getService(EntityManagerFactoryBuilder.class,
"(osgi.unit.name=" + EXTERNAL_TEST_UNIT + ")");
-
Map<String, Object> props = new HashMap<String, Object>();
- //EclipseLink also needs a non-jta-datasource
- DataSourceFactory dsf = getService(DataSourceFactory.class,
- "(" + OSGI_JDBC_DRIVER_CLASS + "=org.apache.derby.jdbc.EmbeddedDriver)");
Properties jdbcProps = new Properties();
jdbcProps.setProperty("url", "jdbc:derby:memory:TESTNOJTA;create=true");
props.put("javax.persistence.dataSource", dsf.createDataSource(jdbcProps));
-
EntityManagerFactory emf = emfBuilder.createEntityManagerFactory(props);
carLifecycleRL(emf.createEntityManager());
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/a5df7f6c/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java
----------------------------------------------------------------------
diff --git a/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java b/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java
index 6fc36ae..42ebc2b 100644
--- a/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java
+++ b/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java
@@ -22,16 +22,15 @@ import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
import static org.ops4j.pax.exam.CoreOptions.vmOption;
import static org.ops4j.pax.exam.CoreOptions.when;
+import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.configurationFolder;
-import java.io.IOException;
-import java.util.Dictionary;
-import java.util.Hashtable;
+import java.io.File;
import javax.inject.Inject;
import javax.persistence.EntityManagerFactory;
+import javax.sql.DataSource;
import javax.transaction.UserTransaction;
-import org.junit.Before;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.CoreOptions;
import org.ops4j.pax.exam.Option;
@@ -47,18 +46,12 @@ import org.osgi.framework.Filter;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
-import org.osgi.service.cm.Configuration;
-import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.jdbc.DataSourceFactory;
import org.osgi.util.tracker.ServiceTracker;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
public abstract class AbstractJPAItest {
- private static Logger LOG = LoggerFactory.getLogger(AbstractJPAItest.class);
-
protected static final String TEST_UNIT = "test-unit";
protected static final String XA_TEST_UNIT = "xa-test-unit";
protected static final String DSF_TEST_UNIT = "dsf-test-unit";
@@ -67,18 +60,23 @@ public abstract class AbstractJPAItest {
protected static final String TEST_BUNDLE_NAME = "org.apache.aries.jpa.org.apache.aries.jpa.container.itest.bundle";
- protected static final String BLUE_CAR_PLATE = "A1AAA";
- protected static final String GREEN_CAR_PLATE = "B2BBB";
-
@Inject
protected BundleContext bundleContext;
@Inject
protected UserTransaction ut;
-
+
@Inject
- protected ConfigurationAdmin configAdmin;
- private static Configuration config;
+ @org.ops4j.pax.exam.util.Filter("(osgi.jndi.service.name=testds)")
+ protected DataSource ds;
+
+ @Inject
+ @org.ops4j.pax.exam.util.Filter("(osgi.jndi.service.name=testdsxa)")
+ protected DataSource dsXa;
+
+ @Inject
+ @org.ops4j.pax.exam.util.Filter("(osgi.jdbc.driver.class=org.apache.derby.jdbc.EmbeddedDriver)")
+ protected DataSourceFactory dsf;
/**
* TODO check calls to this. Eventually switch to EmSupplier
@@ -119,7 +117,7 @@ public abstract class AbstractJPAItest {
}
}
- public String sanitizeFilter(String filter) {
+ private String sanitizeFilter(String filter) {
return filter.startsWith("(") ? filter : "(" + filter + ")";
}
@@ -158,22 +156,26 @@ public abstract class AbstractJPAItest {
}
protected Option baseOptions() {
- String localRepo = System.getProperty("maven.repo.local");
-
- if (localRepo == null) {
- localRepo = System.getProperty("org.ops4j.pax.url.mvn.localRepository");
- }
+ String localRepo = getLocalRepo();
return composite(junitBundles(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-api", "1.7.2"),
mavenBundle("org.ops4j.pax.logging", "pax-logging-service", "1.7.2"),
- // this is how you set the default log level when using pax
- // logging (logProfile)
systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
- when(localRepo != null).useOptions(vmOption("-Dorg.ops4j.pax.url.mvn.localRepository=" + localRepo))
- //,
+ //systemProperty("pax.exam.osgi.unresolved.fail").value("true"),
+ when(localRepo != null).useOptions(vmOption("-Dorg.ops4j.pax.url.mvn.localRepository=" + localRepo)),
+ configurationFolder(new File("src/test/resources/config"))
);
}
+ private String getLocalRepo() {
+ String localRepo = System.getProperty("maven.repo.local");
+
+ if (localRepo == null) {
+ localRepo = System.getProperty("org.ops4j.pax.url.mvn.localRepository");
+ }
+ return localRepo;
+ }
+
protected Option debug() {
return vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005");
}
@@ -278,6 +280,7 @@ public abstract class AbstractJPAItest {
mvnBundle("org.apache.commons", "commons-dbcp2"), //
mvnBundle("org.ops4j.pax.jdbc", "pax-jdbc-pool-common"), //
mvnBundle("org.ops4j.pax.jdbc", "pax-jdbc-pool-dbcp2"), //
+ mvnBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jasypt"), //
mvnBundle("org.ops4j.pax.jdbc", "pax-jdbc-config")
);
}
@@ -310,31 +313,4 @@ public abstract class AbstractJPAItest {
return mvnBundle("org.apache.aries.jpa", "org.apache.aries.jpa.container.itest.bundle.eclipselink");
}
- @Before
- public void createConfigForDataSource() throws Exception {
- if (config == null) {
- createConfigForLogging();
- config = configAdmin.createFactoryConfiguration("org.ops4j.datasource", null);
- Dictionary<String, String> props = new Hashtable<String, String>();
- props.put(DataSourceFactory.OSGI_JDBC_DRIVER_CLASS, "org.apache.derby.jdbc.EmbeddedDriver-pool-xa");
- props.put(DataSourceFactory.JDBC_URL, "jdbc:derby:memory:TEST1;create=true");
- props.put("dataSourceName", "testds");
- config.update(props);
- LOG.info("Created DataSource config testds");
- }
- }
-
- public void createConfigForLogging() throws IOException {
- Configuration logConfig = configAdmin.getConfiguration("org.ops4j.pax.logging", null);
- Dictionary<String, String> props = new Hashtable<String, String>();
- props.put("log4j.rootLogger", "INFO, stdout");
- props.put("log4j.logger.org.apache.aries.transaction", "DEBUG");
- props.put("log4j.logger.org.apache.aries.transaction.parsing", "DEBUG");
- props.put("log4j.logger.org.apache.aries.jpa.blueprint.impl", "DEBUG");
- props.put("log4j.appender.stdout", "org.apache.log4j.ConsoleAppender");
- props.put("log4j.appender.stdout.layout", "org.apache.log4j.PatternLayout");
- props.put("log4j.appender.stdout.layout.ConversionPattern", "%d{ISO8601} | %-5.5p | %-16.16t | %c | %m%n");
- logConfig.update(props);
- }
-
}
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/a5df7f6c/itests/jpa-container-itest/src/test/resources/config/org.ops4j.datasource-testds.cfg
----------------------------------------------------------------------
diff --git a/itests/jpa-container-itest/src/test/resources/config/org.ops4j.datasource-testds.cfg b/itests/jpa-container-itest/src/test/resources/config/org.ops4j.datasource-testds.cfg
new file mode 100644
index 0000000..af4bce9
--- /dev/null
+++ b/itests/jpa-container-itest/src/test/resources/config/org.ops4j.datasource-testds.cfg
@@ -0,0 +1,3 @@
+osgi.jdbc.driver.class=org.apache.derby.jdbc.EmbeddedDriver
+url=jdbc:derby:memory:TEST1;create=true
+dataSourceName=testds
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/a5df7f6c/itests/jpa-container-itest/src/test/resources/config/org.ops4j.datasource-testdsxa.cfg
----------------------------------------------------------------------
diff --git a/itests/jpa-container-itest/src/test/resources/config/org.ops4j.datasource-testdsxa.cfg b/itests/jpa-container-itest/src/test/resources/config/org.ops4j.datasource-testdsxa.cfg
new file mode 100644
index 0000000..9d3b0eb
--- /dev/null
+++ b/itests/jpa-container-itest/src/test/resources/config/org.ops4j.datasource-testdsxa.cfg
@@ -0,0 +1,5 @@
+osgi.jdbc.driver.class=org.apache.derby.jdbc.EmbeddedDriver
+pool=dbcp2
+xa=true
+url=jdbc:derby:memory:TESTXA;create=true
+dataSourceName=testdsxa
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/a5df7f6c/itests/jpa-container-itest/src/test/resources/config/org.ops4j.pax.logging.cfg
----------------------------------------------------------------------
diff --git a/itests/jpa-container-itest/src/test/resources/config/org.ops4j.pax.logging.cfg b/itests/jpa-container-itest/src/test/resources/config/org.ops4j.pax.logging.cfg
new file mode 100644
index 0000000..ebbf43b
--- /dev/null
+++ b/itests/jpa-container-itest/src/test/resources/config/org.ops4j.pax.logging.cfg
@@ -0,0 +1,7 @@
+log4j.rootLogger=INFO, stdout
+#log4j.logger.org.apache.aries.transaction=DEBUG
+#log4j.logger.org.apache.aries.transaction.parsing=DEBUG
+#log4j.logger.org.apache.aries.jpa.blueprint.impl=DEBUG
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %c | %m%n
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/a5df7f6c/itests/jpa-container-testbundle/src/main/resources/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-testbundle/src/main/resources/META-INF/persistence.xml b/itests/jpa-container-testbundle/src/main/resources/META-INF/persistence.xml
index dd96ff2..6d4fd63 100644
--- a/itests/jpa-container-testbundle/src/main/resources/META-INF/persistence.xml
+++ b/itests/jpa-container-testbundle/src/main/resources/META-INF/persistence.xml
@@ -25,7 +25,7 @@
<persistence-unit name="test-unit" transaction-type="RESOURCE_LOCAL">
<description>Test persistence unit for the JPA Container and Context iTests</description>
- <non-jta-data-source>osgi:service/javax.sql.DataSource</non-jta-data-source>
+ <non-jta-data-source>osgi:service/javax.sql.DataSource/(osgi.jndi.service.name=testds)</non-jta-data-source>
<properties>
<!-- This is to avoid compile time enhancement which would conflict with hibernate -->
<property name="openjpa.RuntimeUnenhancedClasses" value="supported"/>
@@ -43,10 +43,9 @@
<persistence-unit name="xa-test-unit" transaction-type="JTA">
<description>Test persistence unit for the JPA Container advanced iTests</description>
+
+ <jta-data-source>osgi:service/javax.sql.DataSource/(osgi.jndi.service.name=testdsxa)</jta-data-source>
<properties>
- <property name="javax.persistence.jdbc.driver" value="org.apache.derby.jdbc.EmbeddedDriver-pool-xa" />
- <property name="javax.persistence.jdbc.url" value="jdbc:derby:memory:XATEST;create=true" />
-
<!-- These properties are creating the database on the fly. We are using them to avoid the tests having to create a database -->
<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)" />
<property name="openjpa.jdbc.DBDictionary" value="derby" />
@@ -76,7 +75,8 @@
<persistence-unit name="dsf-xa-test-unit" transaction-type="JTA">
<description>Test persistence unit for the JPA Container DataSourceFactory iTests</description>
<properties>
- <!-- These properties are creating the database on the fly. We are using them to avoid the tests having to create a database --> <property name="javax.persistence.jdbc.driver" value="org.apache.derby.jdbc.EmbeddedDriver-pool-xa"/>
+ <!-- These properties are creating the database on the fly. We are using them to avoid the tests having to create a database -->
+ <property name="javax.persistence.jdbc.driver" value="org.apache.derby.jdbc.EmbeddedDriver"/>
<property name="javax.persistence.jdbc.url" value="jdbc:derby:memory:DSFXATEST;create=true"/>
<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/a5df7f6c/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index c27c498..a852755 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -45,7 +45,7 @@
<serp.bundle.version>1.14.1_1</serp.bundle.version>
<eclipselink.version>2.6.0</eclipselink.version>
<openjpa.version>2.3.0</openjpa.version>
- <paxjdbc.version>0.7.0</paxjdbc.version>
+ <paxjdbc.version>1.1.0</paxjdbc.version>
</properties>
<modules>
[06/50] aries-jpa git commit: [ARIES-1569] Fix javadoc creation for
release
Posted by cs...@apache.org.
[ARIES-1569] Fix javadoc creation for release
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1747670 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/168b966d
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/168b966d
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/168b966d
Branch: refs/heads/master
Commit: 168b966dce70e2589f89cab68748069aa9cf95cf
Parents: 445bc92
Author: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Fri Jun 10 09:15:55 2016 +0000
Committer: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Fri Jun 10 09:15:55 2016 +0000
----------------------------------------------------------------------
examples/tasklist-blueprint/pom.xml | 122 +++++++++----------
.../jpa-container-blueprint-testbundle/pom.xml | 6 +
.../aries/jpa/container/impl/ManagedEMF.java | 2 +-
.../jpa/container/parser/impl/JPAHandler.java | 2 +-
.../parser/impl/PersistenceUnitParser.java | 9 +-
.../weaving/impl/TransformerRegistry.java | 13 +-
.../aries/jpa/support/osgi/impl/EMFTracker.java | 4 +-
7 files changed, 77 insertions(+), 81 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/168b966d/examples/tasklist-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/tasklist-blueprint/pom.xml b/examples/tasklist-blueprint/pom.xml
index ea47b2b..b5afd1e 100644
--- a/examples/tasklist-blueprint/pom.xml
+++ b/examples/tasklist-blueprint/pom.xml
@@ -1,67 +1,65 @@
<?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
+<!-- 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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.aries.jpa.example</groupId>
+ <artifactId>org.apache.aries.jpa.example.parent</artifactId>
+ <version>2.4.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>org.apache.aries.jpa.example.tasklist.blueprint</artifactId>
+ <name>Apache Aries JPA example tasklist blueprint</name>
+ <packaging>bundle</packaging>
- http://www.apache.org/licenses/LICENSE-2.0
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>javax.persistence</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>javax.transaction-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.interceptor</groupId>
+ <artifactId>javax.interceptor-api</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jpa.example</groupId>
+ <artifactId>org.apache.aries.jpa.example.tasklist.model</artifactId>
+ </dependency>
- 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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.aries.jpa.example</groupId>
- <artifactId>org.apache.aries.jpa.example.parent</artifactId>
- <version>2.4.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>org.apache.aries.jpa.example.tasklist.blueprint</artifactId>
- <name>Apache Aries JPA example tasklist blueprint</name>
- <packaging>bundle</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>javax.persistence</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jpa.example</groupId>
- <artifactId>org.apache.aries.jpa.example.tasklist.model</artifactId>
- </dependency>
-
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/168b966d/itests/jpa-container-blueprint-testbundle/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-blueprint-testbundle/pom.xml b/itests/jpa-container-blueprint-testbundle/pom.xml
index 2a01b7e..0820cb2 100644
--- a/itests/jpa-container-blueprint-testbundle/pom.xml
+++ b/itests/jpa-container-blueprint-testbundle/pom.xml
@@ -45,6 +45,12 @@ Also testing declarative transactions</description>
<version>1.2</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.interceptor</groupId>
+ <artifactId>javax.interceptor-api</artifactId>
+ <version>1.2</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/168b966d/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/ManagedEMF.java
----------------------------------------------------------------------
diff --git a/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/ManagedEMF.java b/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/ManagedEMF.java
index 04b8851..8e9bb54 100644
--- a/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/ManagedEMF.java
+++ b/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/ManagedEMF.java
@@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory;
/**
* Creates an EntityManagerFactory(EMF) for a persistence unit and publishes it as a service.
* Custom properties can be configured by supplying a config admin configuriation named like
- * the JPA_CONFIGURATION_PREFIX.<persistence unit name>.
+ * the JPA_CONFIGURATION_PREFIX.persistence unit name.
*/
public class ManagedEMF implements Closeable, ManagedService {
private static final Logger LOGGER = LoggerFactory.getLogger(ManagedEMF.class);
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/168b966d/jpa-container/src/main/java/org/apache/aries/jpa/container/parser/impl/JPAHandler.java
----------------------------------------------------------------------
diff --git a/jpa-container/src/main/java/org/apache/aries/jpa/container/parser/impl/JPAHandler.java b/jpa-container/src/main/java/org/apache/aries/jpa/container/parser/impl/JPAHandler.java
index 4ccd164..d2f0386 100644
--- a/jpa-container/src/main/java/org/apache/aries/jpa/container/parser/impl/JPAHandler.java
+++ b/jpa-container/src/main/java/org/apache/aries/jpa/container/parser/impl/JPAHandler.java
@@ -49,7 +49,7 @@ public class JPAHandler extends DefaultHandler {
/**
* Create a new JPA Handler for a bundle
*
- * @param bundle
+ * @param bundle to parse
*/
public JPAHandler(Bundle bundle) {
this.bundle = bundle;
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/168b966d/jpa-container/src/main/java/org/apache/aries/jpa/container/parser/impl/PersistenceUnitParser.java
----------------------------------------------------------------------
diff --git a/jpa-container/src/main/java/org/apache/aries/jpa/container/parser/impl/PersistenceUnitParser.java b/jpa-container/src/main/java/org/apache/aries/jpa/container/parser/impl/PersistenceUnitParser.java
index 6c5cf73..8f26c48 100644
--- a/jpa-container/src/main/java/org/apache/aries/jpa/container/parser/impl/PersistenceUnitParser.java
+++ b/jpa-container/src/main/java/org/apache/aries/jpa/container/parser/impl/PersistenceUnitParser.java
@@ -53,11 +53,9 @@ public class PersistenceUnitParser {
* "META-INF/persistence.xml" and the Meta-Persistence header. Note that getEntry is used to ensure we do
* not alter the state of the bundle Note also that web application bundles will never return persistence
* descriptors
- * @param context
*
* @param bundle The bundle to search
- * @param packageAdmin
- * @return
+ * @return persistence units located in the bundle
*/
public static Collection<PersistenceUnit> getPersistenceUnits(Bundle bundle) {
Collection<PersistenceUnit> punits = new ArrayList<PersistenceUnit>();
@@ -123,9 +121,8 @@ public class PersistenceUnitParser {
/**
* Locate a persistence descriptor file in a bundle based on a String name.
*
- * @param bundle
- * @param persistenceXmlFiles
- * @param jarLocation
+ * @param bundle to look in
+ * @param location location in bundle
* @throws IOException
*/
private static InputStream locateFile(Bundle bundle, String location) throws IOException {
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/168b966d/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/TransformerRegistry.java
----------------------------------------------------------------------
diff --git a/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/TransformerRegistry.java b/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/TransformerRegistry.java
index b499cc2..a3d1420 100644
--- a/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/TransformerRegistry.java
+++ b/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/TransformerRegistry.java
@@ -22,26 +22,21 @@ import javax.persistence.spi.ClassTransformer;
import org.osgi.framework.Bundle;
-/**
- * {@link ClassTransformer} instances should be registered with the
- * instance of this interface returned by {@link TransformerRegistrySingleton#getTransformerRegistry()}
- */
public interface TransformerRegistry {
/**
* Register a new transformer with the WeavingHook
*
- * @param pBundle The persistence bundle to weave
- * @param transformer The transformer to weave with
- * @param provider The provider to provide packages from
+ * @param pBundle The persistence bundle to weave
+ * @param transformer The transformer to weave with
*/
public void addTransformer(Bundle pBundle, ClassTransformer transformer);
/**
* Remove a given transformer from this weaving hook. This must be
- * @param pBundle
- * @param transformer
+ * @param pBundle The persistence bundle to unweave
+ * @param transformer The transformer to remove
*/
public void removeTransformer(Bundle pBundle, ClassTransformer transformer);
}
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/168b966d/jpa-support/src/main/java/org/apache/aries/jpa/support/osgi/impl/EMFTracker.java
----------------------------------------------------------------------
diff --git a/jpa-support/src/main/java/org/apache/aries/jpa/support/osgi/impl/EMFTracker.java b/jpa-support/src/main/java/org/apache/aries/jpa/support/osgi/impl/EMFTracker.java
index 6e8826e..6884ba5 100644
--- a/jpa-support/src/main/java/org/apache/aries/jpa/support/osgi/impl/EMFTracker.java
+++ b/jpa-support/src/main/java/org/apache/aries/jpa/support/osgi/impl/EMFTracker.java
@@ -41,7 +41,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Tracks EntityManagerFactory services and publishes a Supplier<EntityManager> for each.
+ * Tracks EntityManagerFactory services and publishes a Supplier<EntityManager> for each.
* IF the persistence unit uses JTA a TMTracker is created. If it uses RESOURCE_LOCAL as
* ResourceLocalJpaTemplate is created.
*/
@@ -88,7 +88,7 @@ public class EMFTracker extends ServiceTracker {
/**
*
- * @param emf
+ * @param emf to get type from
* @return
*/
private PersistenceUnitTransactionType getTransactionType(EntityManagerFactory emf) {
[27/50] aries-jpa git commit: Fix tck setup
Posted by cs...@apache.org.
Fix tck setup
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1780937 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/82c41d30
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/82c41d30
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/82c41d30
Branch: refs/heads/master
Commit: 82c41d301cf8cb6a714ffe5ac9c52438ac6a6fff
Parents: 730dbb4
Author: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Mon Jan 30 16:39:48 2017 +0000
Committer: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Mon Jan 30 16:39:48 2017 +0000
----------------------------------------------------------------------
itests/jpa-tck-itest/org.osgi.test.cases.jpa.bnd | 4 ++--
itests/jpa-tck-itest/pom.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/82c41d30/itests/jpa-tck-itest/org.osgi.test.cases.jpa.bnd
----------------------------------------------------------------------
diff --git a/itests/jpa-tck-itest/org.osgi.test.cases.jpa.bnd b/itests/jpa-tck-itest/org.osgi.test.cases.jpa.bnd
index 25970e2..755bd31 100644
--- a/itests/jpa-tck-itest/org.osgi.test.cases.jpa.bnd
+++ b/itests/jpa-tck-itest/org.osgi.test.cases.jpa.bnd
@@ -39,8 +39,8 @@ lib/org.eclipse.persistence.jpa-2.6.0.jar;version=file, \
lib/org.eclipse.persistence.antlr-2.6.0.jar;version=file, \
lib/org.eclipse.persistence.jpa.jpql-2.6.0.jar;version=file, \
lib/org.eclipse.persistence.asm-2.6.0.jar;version=file, \
-lib/org.apache.aries.jpa.eclipselink.adapter-2.3.0-SNAPSHOT.jar;version=file, \
-lib/org.apache.aries.jpa.container-2.3.0-SNAPSHOT.jar;version=file, \
+lib/org.apache.aries.jpa.eclipselink.adapter-2.6.0-SNAPSHOT.jar;version=file, \
+lib/org.apache.aries.jpa.container-2.6.0-SNAPSHOT.jar;version=file, \
lib/org.osgi.test.cases.jpa-5.0.0.jar;version=file
-runproperties = \
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/82c41d30/itests/jpa-tck-itest/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-tck-itest/pom.xml b/itests/jpa-tck-itest/pom.xml
index e75ca00..c864433 100644
--- a/itests/jpa-tck-itest/pom.xml
+++ b/itests/jpa-tck-itest/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.6.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
[24/50] aries-jpa git commit: Removed import package not needed
Posted by cs...@apache.org.
Removed import package not needed
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1777630 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/f45654f6
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/f45654f6
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/f45654f6
Branch: refs/heads/master
Commit: f45654f60255860bd2be4c37188c5fb613862137
Parents: d992a02
Author: ggerla <gg...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Fri Jan 6 15:38:55 2017 +0000
Committer: ggerla <gg...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Fri Jan 6 15:38:55 2017 +0000
----------------------------------------------------------------------
examples/tasklist-model/osgi.bnd | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/f45654f6/examples/tasklist-model/osgi.bnd
----------------------------------------------------------------------
diff --git a/examples/tasklist-model/osgi.bnd b/examples/tasklist-model/osgi.bnd
index dbeb3e8..e898aef 100644
--- a/examples/tasklist-model/osgi.bnd
+++ b/examples/tasklist-model/osgi.bnd
@@ -1,6 +1,2 @@
Meta-Persistence: \
META-INF/persistence.xml
-Import-Package: \
- org.hibernate.proxy, \
- javassist.util.proxy, \
- *
[14/50] aries-jpa git commit: Use dpendency true instead of an api
feature
Posted by cs...@apache.org.
Use dpendency true instead of an api feature
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1765961 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/127990ea
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/127990ea
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/127990ea
Branch: refs/heads/master
Commit: 127990eafd9a76c5b26b12115f99c1c02fb58bbb
Parents: f807378
Author: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Fri Oct 21 09:01:07 2016 +0000
Committer: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Fri Oct 21 09:01:07 2016 +0000
----------------------------------------------------------------------
.../aries/jpa/blueprint/impl/JpaNsHandler.java | 2 +-
jpa-features/src/main/feature/feature.xml | 17 ++++++-----------
jpa-repository/pom.xml | 2 ++
3 files changed, 9 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/127990ea/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaNsHandler.java
----------------------------------------------------------------------
diff --git a/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaNsHandler.java b/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaNsHandler.java
index 0c01af8..3742c3d 100644
--- a/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaNsHandler.java
+++ b/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaNsHandler.java
@@ -79,7 +79,7 @@ public class JpaNsHandler implements NamespaceHandler {
} else if (NAMESPACE_JPA_20.equals(namespace)) {
return this.getClass().getResource("/jpa20.xsd");
} else {
- throw new IllegalArgumentException("Unknown namespace for jpa: " + namespace);
+ return null;
}
}
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/127990ea/jpa-features/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/jpa-features/src/main/feature/feature.xml b/jpa-features/src/main/feature/feature.xml
index ecdeb0c..3dbdc38 100644
--- a/jpa-features/src/main/feature/feature.xml
+++ b/jpa-features/src/main/feature/feature.xml
@@ -17,19 +17,14 @@
limitations under the License.
-->
<features name="aries-jpa-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0">
- <feature name="persistence-api" description="Persistence API" version="2.0.0">
- <details>Persistence API</details>
- <bundle start-level="30">mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/1.1</bundle>
- </feature>
-
- <feature name="persistence-api" description="Persistence API" version="2.1.0">
- <details>Persistence API</details>
- <bundle start-level="30">mvn:org.eclipse.persistence/javax.persistence/2.1.0</bundle>
- </feature>
-
+
<feature name="jpa" description="OSGi Persistence Container" version="${project.version}">
<details>JPA implementation provided by Apache Aries JPA 2.x. NB: this feature doesn't provide the JPA engine, you have to install one by yourself (OpenJPA for instance)</details>
- <feature version="[2.0.0,2.2.0)">persistence-api</feature>
+ <capability>
+ osgi.service;effective:=active;objectClass=javax.persistence.spi.PersistenceProvider
+ </capability>
+
+ <bundle dependency="true">mvn:org.eclipse.persistence/javax.persistence/2.1.0</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
<bundle dependency="true">mvn:org.osgi/org.osgi.service.jdbc/1.0.0</bundle>
<bundle dependency="true" start-level="30">mvn:org.apache.felix/org.apache.felix.coordinator/1.0.2</bundle>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/127990ea/jpa-repository/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-repository/pom.xml b/jpa-repository/pom.xml
index f05ccea..aa092d8 100644
--- a/jpa-repository/pom.xml
+++ b/jpa-repository/pom.xml
@@ -48,6 +48,7 @@
</properties>
</profile>
</profiles>
+ <!--
<build>
<plugins>
<plugin>
@@ -69,6 +70,7 @@
</plugin>
</plugins>
</build>
+ -->
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
[41/50] aries-jpa git commit: Add OSGi snapshot repo to fix build
Posted by cs...@apache.org.
Add OSGi snapshot repo to fix build
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1785845 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/9df1915d
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/9df1915d
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/9df1915d
Branch: refs/heads/master
Commit: 9df1915de4b9497427c65e514dd4deaf40022624
Parents: 4960fdc
Author: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Tue Mar 7 15:01:21 2017 +0000
Committer: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Tue Mar 7 15:01:21 2017 +0000
----------------------------------------------------------------------
jpa-parent/pom.xml | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/9df1915d/jpa-parent/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-parent/pom.xml b/jpa-parent/pom.xml
index d730b8b..d6feb7c 100644
--- a/jpa-parent/pom.xml
+++ b/jpa-parent/pom.xml
@@ -234,6 +234,21 @@
</plugin>
</plugins>
</build>
+
+ <repositories>
+ <repository>
+ <id>OSGi-spec-snapshots</id>
+ <url>https://oss.sonatype.org/content/repositories/osgi/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>daily</updatePolicy>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
<profiles>
<profile>
[25/50] aries-jpa git commit: [ARIES-1631] Added management of
javax.persistence.dataSource in case of no non-JTA datasources are specified
Posted by cs...@apache.org.
[ARIES-1631] Added management of javax.persistence.dataSource in case of no non-JTA datasources are specified
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1777668 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/a667faa1
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/a667faa1
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/a667faa1
Branch: refs/heads/master
Commit: a667faa1ecf0806d7cd808c6d02a8e8216b9a7fb
Parents: f45654f
Author: ggerla <gg...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Fri Jan 6 17:47:06 2017 +0000
Committer: ggerla <gg...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Fri Jan 6 17:47:06 2017 +0000
----------------------------------------------------------------------
.../jpa/container/itest/JPAContainerTest.java | 20 ++++++++++++++++++++
.../impl/AriesEntityManagerFactoryBuilder.java | 7 +++++++
2 files changed, 27 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/a667faa1/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java
----------------------------------------------------------------------
diff --git a/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java b/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java
index ba2b622..e8a077a 100644
--- a/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java
+++ b/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java
@@ -189,4 +189,24 @@ public abstract class JPAContainerTest extends AbstractCarJPAITest {
EntityManagerFactory emf = emfBuilder.createEntityManagerFactory(props);
carLifecycleXA(ut, emf.createEntityManager());
}
+
+ @Test
+ public void testCarEMFBuilderNoNonJTADataSource() throws Exception {
+ EntityManagerFactoryBuilder emfBuilder = getService(EntityManagerFactoryBuilder.class,
+ "(osgi.unit.name=" + EXTERNAL_TEST_UNIT + ")");
+
+
+ Map<String, Object> props = new HashMap<String, Object>();
+ //EclipseLink also needs a non-jta-datasource
+ DataSourceFactory dsf = getService(DataSourceFactory.class,
+ "(" + OSGI_JDBC_DRIVER_CLASS + "=org.apache.derby.jdbc.EmbeddedDriver)");
+ Properties jdbcProps = new Properties();
+ jdbcProps.setProperty("url", "jdbc:derby:memory:TEST1;create=true");
+ props.put("javax.persistence.dataSource", dsf.createDataSource(jdbcProps));
+
+
+ EntityManagerFactory emf = emfBuilder.createEntityManagerFactory(props);
+ carLifecycleRL(emf.createEntityManager());
+ }
+
}
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/a667faa1/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/AriesEntityManagerFactoryBuilder.java
----------------------------------------------------------------------
diff --git a/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/AriesEntityManagerFactoryBuilder.java b/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/AriesEntityManagerFactoryBuilder.java
index e224acd..fecb927 100644
--- a/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/AriesEntityManagerFactoryBuilder.java
+++ b/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/AriesEntityManagerFactoryBuilder.java
@@ -37,6 +37,7 @@ import org.osgi.service.jpa.EntityManagerFactoryBuilder;
public class AriesEntityManagerFactoryBuilder implements EntityManagerFactoryBuilder {
private static final String JAVAX_PERSISTENCE_JDBC_DRIVER = "javax.persistence.jdbc.driver";
private static final String JAVAX_PERSISTENCE_JTA_DATASOURCE = "javax.persistence.jtaDataSource";
+ private static final String JAVAX_PERSISTENCE_DATASOURCE = "javax.persistence.dataSource";
private static final String JAVAX_PERSISTENCE_NON_JTA_DATASOURCE = "javax.persistence.nonJtaDataSource";
private static final String JAVAX_PERSISTENCE_TX_TYPE = "javax.persistence.transactionType";
@@ -75,6 +76,12 @@ public class AriesEntityManagerFactoryBuilder implements EntityManagerFactoryBui
if(o instanceof DataSource) {
persistenceUnit.setNonJtaDataSource((DataSource) o);
props.remove(JAVAX_PERSISTENCE_NON_JTA_DATASOURCE);
+ } else {
+ o = props.get(JAVAX_PERSISTENCE_DATASOURCE);
+ if(o != null && o instanceof DataSource) {
+ persistenceUnit.setNonJtaDataSource((DataSource) o);
+ props.remove(JAVAX_PERSISTENCE_DATASOURCE);
+ }
}
o = props.get(JAVAX_PERSISTENCE_TX_TYPE);
[26/50] aries-jpa git commit: Fixed issue about [ARIES-1631] test
Posted by cs...@apache.org.
Fixed issue about [ARIES-1631] test
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1777718 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/730dbb4f
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/730dbb4f
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/730dbb4f
Branch: refs/heads/master
Commit: 730dbb4f9182a42c44b094d0c9051317cf2f6a1b
Parents: a667faa
Author: ggerla <gg...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Fri Jan 6 21:11:12 2017 +0000
Committer: ggerla <gg...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Fri Jan 6 21:11:12 2017 +0000
----------------------------------------------------------------------
.../org/apache/aries/jpa/container/itest/JPAContainerTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/730dbb4f/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java
----------------------------------------------------------------------
diff --git a/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java b/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java
index e8a077a..607e09e 100644
--- a/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java
+++ b/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java
@@ -201,7 +201,7 @@ public abstract class JPAContainerTest extends AbstractCarJPAITest {
DataSourceFactory dsf = getService(DataSourceFactory.class,
"(" + OSGI_JDBC_DRIVER_CLASS + "=org.apache.derby.jdbc.EmbeddedDriver)");
Properties jdbcProps = new Properties();
- jdbcProps.setProperty("url", "jdbc:derby:memory:TEST1;create=true");
+ jdbcProps.setProperty("url", "jdbc:derby:memory:TESTNOJTA;create=true");
props.put("javax.persistence.dataSource", dsf.createDataSource(jdbcProps));
[18/50] aries-jpa git commit: [maven-release-plugin] prepare for next
development iteration
Posted by cs...@apache.org.
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1766940 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/1d3e36c6
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/1d3e36c6
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/1d3e36c6
Branch: refs/heads/master
Commit: 1d3e36c68b9560733602f690ddec571f2666ee59
Parents: 1735f86
Author: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Fri Oct 28 07:21:17 2016 +0000
Committer: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Fri Oct 28 07:21:17 2016 +0000
----------------------------------------------------------------------
examples/pom.xml | 2 +-
examples/tasklist-blueprint/pom.xml | 2 +-
examples/tasklist-ds/pom.xml | 2 +-
examples/tasklist-model/pom.xml | 2 +-
itests/jpa-container-blueprint-testbundle/pom.xml | 2 +-
itests/jpa-container-itest-karaf/pom.xml | 2 +-
itests/jpa-container-itest/pom.xml | 2 +-
itests/jpa-container-testbundle-eclipselink/pom.xml | 2 +-
itests/jpa-container-testbundle/pom.xml | 2 +-
itests/pom.xml | 2 +-
jpa-api/pom.xml | 2 +-
jpa-blueprint/pom.xml | 2 +-
jpa-container-eclipselink-adapter/pom.xml | 2 +-
jpa-container/pom.xml | 2 +-
jpa-features/pom.xml | 2 +-
jpa-parent/pom.xml | 8 +-------
jpa-repository/pom.xml | 8 +-------
jpa-support/pom.xml | 2 +-
pom.xml | 8 ++++----
19 files changed, 22 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1d3e36c6/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 2c527e0..6c4e0ee 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.5.0</version>
+ <version>2.6.0-SNAPSHOT</version>
<relativePath>../jpa-parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1d3e36c6/examples/tasklist-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/tasklist-blueprint/pom.xml b/examples/tasklist-blueprint/pom.xml
index fda62aa..34bc3ff 100644
--- a/examples/tasklist-blueprint/pom.xml
+++ b/examples/tasklist-blueprint/pom.xml
@@ -14,7 +14,7 @@
<parent>
<groupId>org.apache.aries.jpa.example</groupId>
<artifactId>org.apache.aries.jpa.example.parent</artifactId>
- <version>2.5.0</version>
+ <version>2.6.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.example.tasklist.blueprint</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1d3e36c6/examples/tasklist-ds/pom.xml
----------------------------------------------------------------------
diff --git a/examples/tasklist-ds/pom.xml b/examples/tasklist-ds/pom.xml
index 1c053be..768d993 100644
--- a/examples/tasklist-ds/pom.xml
+++ b/examples/tasklist-ds/pom.xml
@@ -11,7 +11,7 @@
<parent>
<groupId>org.apache.aries.jpa.example</groupId>
<artifactId>org.apache.aries.jpa.example.parent</artifactId>
- <version>2.5.0</version>
+ <version>2.6.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.example.tasklist.ds</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1d3e36c6/examples/tasklist-model/pom.xml
----------------------------------------------------------------------
diff --git a/examples/tasklist-model/pom.xml b/examples/tasklist-model/pom.xml
index 13b7cf1..ae1d126 100644
--- a/examples/tasklist-model/pom.xml
+++ b/examples/tasklist-model/pom.xml
@@ -12,7 +12,7 @@
<parent>
<groupId>org.apache.aries.jpa.example</groupId>
<artifactId>org.apache.aries.jpa.example.parent</artifactId>
- <version>2.5.0</version>
+ <version>2.6.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1d3e36c6/itests/jpa-container-blueprint-testbundle/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-blueprint-testbundle/pom.xml b/itests/jpa-container-blueprint-testbundle/pom.xml
index bec1da9..215aade 100644
--- a/itests/jpa-container-blueprint-testbundle/pom.xml
+++ b/itests/jpa-container-blueprint-testbundle/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.5.0</version>
+ <version>2.6.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1d3e36c6/itests/jpa-container-itest-karaf/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-itest-karaf/pom.xml b/itests/jpa-container-itest-karaf/pom.xml
index 8e4196a..68b3485 100644
--- a/itests/jpa-container-itest-karaf/pom.xml
+++ b/itests/jpa-container-itest-karaf/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.5.0</version>
+ <version>2.6.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1d3e36c6/itests/jpa-container-itest/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-itest/pom.xml b/itests/jpa-container-itest/pom.xml
index 65b97c9..dd5fd87 100644
--- a/itests/jpa-container-itest/pom.xml
+++ b/itests/jpa-container-itest/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.5.0</version>
+ <version>2.6.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1d3e36c6/itests/jpa-container-testbundle-eclipselink/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-testbundle-eclipselink/pom.xml b/itests/jpa-container-testbundle-eclipselink/pom.xml
index ac594e2..a4ce5ec 100644
--- a/itests/jpa-container-testbundle-eclipselink/pom.xml
+++ b/itests/jpa-container-testbundle-eclipselink/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.5.0</version>
+ <version>2.6.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1d3e36c6/itests/jpa-container-testbundle/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-testbundle/pom.xml b/itests/jpa-container-testbundle/pom.xml
index 3061ca5..8084d15 100644
--- a/itests/jpa-container-testbundle/pom.xml
+++ b/itests/jpa-container-testbundle/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa.itest</groupId>
<artifactId>org.apache.aries.jpa.itest.parent</artifactId>
- <version>2.5.0</version>
+ <version>2.6.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1d3e36c6/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index 8822036..657e7e8 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.5.0</version>
+ <version>2.6.0-SNAPSHOT</version>
<relativePath>../jpa-parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1d3e36c6/jpa-api/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-api/pom.xml b/jpa-api/pom.xml
index 65dcae3..e03c5cd 100644
--- a/jpa-api/pom.xml
+++ b/jpa-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.5.0</version>
+ <version>2.6.0-SNAPSHOT</version>
<relativePath>../jpa-parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1d3e36c6/jpa-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-blueprint/pom.xml b/jpa-blueprint/pom.xml
index e54479b..747283e 100644
--- a/jpa-blueprint/pom.xml
+++ b/jpa-blueprint/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.5.0</version>
+ <version>2.6.0-SNAPSHOT</version>
<relativePath>../jpa-parent</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.blueprint</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1d3e36c6/jpa-container-eclipselink-adapter/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-container-eclipselink-adapter/pom.xml b/jpa-container-eclipselink-adapter/pom.xml
index 277a058..75b29fd 100644
--- a/jpa-container-eclipselink-adapter/pom.xml
+++ b/jpa-container-eclipselink-adapter/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.5.0</version>
+ <version>2.6.0-SNAPSHOT</version>
<relativePath>../jpa-parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1d3e36c6/jpa-container/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-container/pom.xml b/jpa-container/pom.xml
index a1b7173..5012e1e 100644
--- a/jpa-container/pom.xml
+++ b/jpa-container/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.5.0</version>
+ <version>2.6.0-SNAPSHOT</version>
<relativePath>../jpa-parent</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.container</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1d3e36c6/jpa-features/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-features/pom.xml b/jpa-features/pom.xml
index 7d82997..78d60a8 100644
--- a/jpa-features/pom.xml
+++ b/jpa-features/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.5.0</version>
+ <version>2.6.0-SNAPSHOT</version>
<relativePath>../jpa-parent</relativePath>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1d3e36c6/jpa-parent/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-parent/pom.xml b/jpa-parent/pom.xml
index a339e9a..9e54ae1 100644
--- a/jpa-parent/pom.xml
+++ b/jpa-parent/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.5.0</version>
+ <version>2.6.0-SNAPSHOT</version>
<name>Apache Aries JPA parent</name>
<packaging>pom</packaging>
@@ -292,10 +292,4 @@
</build>
</profile>
</profiles>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/org.apache.aries.jpa-2.5.0/org.apache.aries.jpa.parent</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/org.apache.aries.jpa-2.5.0/org.apache.aries.jpa.parent</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/pom/tags/org.apache.aries.jpa-2.5.0/org.apache.aries.jpa.parent</url>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1d3e36c6/jpa-repository/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-repository/pom.xml b/jpa-repository/pom.xml
index 5d52c4b..666ce85 100644
--- a/jpa-repository/pom.xml
+++ b/jpa-repository/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.apache.aries.jpa</groupId>
<artifactId>jpa-repository</artifactId>
<name>Apache Aries JPA Repository</name>
- <version>2.5.0</version>
+ <version>2.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<bnd.version>3.1.0</bnd.version>
@@ -119,10 +119,4 @@
<version>2.1.0</version>
</dependency>
</dependencies>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.5.0/jpa-repository</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.5.0/jpa-repository</developerConnection>
- <url>scm:svn:http://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.5.0/jpa-repository</url>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1d3e36c6/jpa-support/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-support/pom.xml b/jpa-support/pom.xml
index d6a8c38..5857ab9 100644
--- a/jpa-support/pom.xml
+++ b/jpa-support/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.5.0</version>
+ <version>2.6.0-SNAPSHOT</version>
<relativePath>../jpa-parent</relativePath>
</parent>
<artifactId>org.apache.aries.jpa.support</artifactId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1d3e36c6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2c3e864..1feff7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.parent</artifactId>
- <version>2.5.0</version>
+ <version>2.6.0-SNAPSHOT</version>
<relativePath>jpa-parent</relativePath>
</parent>
@@ -37,9 +37,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.5.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/tags/org.apache.aries.jpa-2.5.0</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/tags/org.apache.aries.jpa-2.5.0</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jpa</url>
</scm>
<modules>
[42/50] aries-jpa git commit: [jpa] Ensure that the right API version
is included from the OSGi spec
Posted by cs...@apache.org.
[jpa] Ensure that the right API version is included from the OSGi spec
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1786903 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/0eacce88
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/0eacce88
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/0eacce88
Branch: refs/heads/master
Commit: 0eacce88303de68d4e5dd3d357ed81a43b0858a3
Parents: 9df1915
Author: timothyjward <ti...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Tue Mar 14 13:48:48 2017 +0000
Committer: timothyjward <ti...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Tue Mar 14 13:48:48 2017 +0000
----------------------------------------------------------------------
jpa-container/osgi.bnd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/0eacce88/jpa-container/osgi.bnd
----------------------------------------------------------------------
diff --git a/jpa-container/osgi.bnd b/jpa-container/osgi.bnd
index bb4fd81..1616da2 100644
--- a/jpa-container/osgi.bnd
+++ b/jpa-container/osgi.bnd
@@ -1,5 +1,5 @@
Export-Package: \
- org.osgi.service.jpa;provide:=true
+ org.osgi.service.jpa;provide:=true;-split-package:=merge-first
Import-Package: \
javax.persistence;version="[1.1,3)", \
javax.persistence.spi;version="[1.1,3)", \
[09/50] aries-jpa git commit: [ARIES-1558] JPA support for CDI
Posted by cs...@apache.org.
[ARIES-1558] JPA support for CDI
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1748153 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/ad5990d4
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/ad5990d4
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/ad5990d4
Branch: refs/heads/master
Commit: ad5990d4a1fcb211f0e1fe2e764770d4086e4fe2
Parents: c52145d
Author: gnodet <gn...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Mon Jun 13 09:27:47 2016 +0000
Committer: gnodet <gn...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Mon Jun 13 09:27:47 2016 +0000
----------------------------------------------------------------------
examples/pom.xml | 1 +
examples/tasklist-cdi/osgi.bnd | 4 +
examples/tasklist-cdi/pom.xml | 87 ++++++
.../tasklist/cdi/impl/TaskServiceImpl.java | 67 +++++
.../tasklist/cdi/impl/TasklistServlet.java | 104 +++++++
.../src/main/resources/META-INF/beans.xml | 0
.../tasklist/cdi/impl/TaskServiceImplTest.java | 65 +++++
.../src/test/resources/META-INF/persistence.xml | 33 +++
jpa-cdi/osgi.bnd | 11 +
jpa-cdi/pom.xml | 87 ++++++
.../aries/jpa/cdi/EntityManagerProducer.java | 52 ++++
.../org/apache/aries/jpa/cdi/JpaExtension.java | 60 ++++
.../aries/jpa/cdi/PersistenceAnnotatedType.java | 141 ++++++++++
.../aries/jpa/cdi/TransactionExtension.java | 73 +++++
.../aries/jpa/cdi/TransactionSupport.java | 44 +++
.../aries/jpa/cdi/TransactionalContext.java | 277 +++++++++++++++++++
.../aries/jpa/cdi/TransactionalInterceptor.java | 226 +++++++++++++++
.../aries/jpa/cdi/support/FilterLiteral.java | 35 +++
.../cdi/support/ForwardingAnnotatedField.java | 73 +++++
.../cdi/support/ForwardingAnnotatedType.java | 79 ++++++
.../aries/jpa/cdi/support/InjectLiteral.java | 26 ++
.../aries/jpa/cdi/support/ServiceLiteral.java | 27 ++
.../aries/jpa/cdi/support/SimpleBean.java | 101 +++++++
.../cdi/support/SyntheticAnnotatedField.java | 65 +++++
.../aries/jpa/cdi/support/UniqueIdentifier.java | 36 +++
.../cdi/support/UniqueIdentifierLitteral.java | 38 +++
jpa-cdi/src/main/resources/META-INF/beans.xml | 5 +
.../javax.enterprise.inject.spi.Extension | 2 +
jpa-parent/pom.xml | 25 ++
pom.xml | 1 +
30 files changed, 1845 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/ad5990d4/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 486338d..0cf3b90 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -124,6 +124,7 @@
<module>tasklist-blueprint</module>
<module>tasklist-ds</module>
<module>tasklist-model</module>
+ <module>tasklist-cdi</module>
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/ad5990d4/examples/tasklist-cdi/osgi.bnd
----------------------------------------------------------------------
diff --git a/examples/tasklist-cdi/osgi.bnd b/examples/tasklist-cdi/osgi.bnd
new file mode 100644
index 0000000..1c76259
--- /dev/null
+++ b/examples/tasklist-cdi/osgi.bnd
@@ -0,0 +1,4 @@
+Require-Capability: \
+ osgi.extender; filter:="(osgi.extender=pax.cdi)", \
+ org.ops4j.pax.cdi.extension; filter:="(extension=pax-cdi-extension2)", \
+ org.ops4j.pax.cdi.extension; filter:="(extension=aries-jpa-cdi)",
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/ad5990d4/examples/tasklist-cdi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/tasklist-cdi/pom.xml b/examples/tasklist-cdi/pom.xml
new file mode 100644
index 0000000..f184d1d
--- /dev/null
+++ b/examples/tasklist-cdi/pom.xml
@@ -0,0 +1,87 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.aries.jpa.example</groupId>
+ <artifactId>org.apache.aries.jpa.example.parent</artifactId>
+ <version>2.4.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>org.apache.aries.jpa.example.tasklist.cdi</artifactId>
+ <name>Apache Aries JPA example tasklist cdi</name>
+ <packaging>bundle</packaging>
+
+ <properties>
+ <baseline.skip>true</baseline.skip>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>javax.persistence</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>javax.transaction-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jpa.example</groupId>
+ <artifactId>org.apache.aries.jpa.example.tasklist.model</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ops4j.pax.cdi</groupId>
+ <artifactId>pax-cdi-api</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>1</version>
+ </dependency>
+
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <version>1.2</version>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/ad5990d4/examples/tasklist-cdi/src/main/java/org/apache/aries/jpa/example/tasklist/cdi/impl/TaskServiceImpl.java
----------------------------------------------------------------------
diff --git a/examples/tasklist-cdi/src/main/java/org/apache/aries/jpa/example/tasklist/cdi/impl/TaskServiceImpl.java b/examples/tasklist-cdi/src/main/java/org/apache/aries/jpa/example/tasklist/cdi/impl/TaskServiceImpl.java
new file mode 100644
index 0000000..cab337d
--- /dev/null
+++ b/examples/tasklist-cdi/src/main/java/org/apache/aries/jpa/example/tasklist/cdi/impl/TaskServiceImpl.java
@@ -0,0 +1,67 @@
+/*
+ * 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 WARRANTIESOR 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.aries.jpa.example.tasklist.cdi.impl;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.transaction.Transactional;
+import javax.transaction.Transactional.TxType;
+import java.util.Collection;
+
+import org.apache.aries.jpa.example.tasklist.model.Task;
+import org.apache.aries.jpa.example.tasklist.model.TaskService;
+
+@Transactional
+public class TaskServiceImpl implements TaskService {
+
+ @PersistenceContext(unitName = "tasklist")
+ EntityManager em;
+
+ @Transactional(TxType.SUPPORTS)
+ @Override
+ public Task getTask(Integer id) {
+ return em.find(Task.class, id);
+ }
+
+
+ @Override
+ public void addTask(Task task) {
+ em.persist(task);
+ em.flush();
+ }
+
+ @Transactional(TxType.SUPPORTS)
+ @Override
+ public Collection<Task> getTasks() {
+ CriteriaQuery<Task> query = em.getCriteriaBuilder().createQuery(Task.class);
+ return em.createQuery(query.select(query.from(Task.class))).getResultList();
+ }
+
+ @Override
+ public void updateTask(Task task) {
+ em.persist(task);
+ }
+
+ @Override
+ public void deleteTask(Integer id) {
+ em.remove(getTask(id));
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/ad5990d4/examples/tasklist-cdi/src/main/java/org/apache/aries/jpa/example/tasklist/cdi/impl/TasklistServlet.java
----------------------------------------------------------------------
diff --git a/examples/tasklist-cdi/src/main/java/org/apache/aries/jpa/example/tasklist/cdi/impl/TasklistServlet.java b/examples/tasklist-cdi/src/main/java/org/apache/aries/jpa/example/tasklist/cdi/impl/TasklistServlet.java
new file mode 100644
index 0000000..1f1f14e
--- /dev/null
+++ b/examples/tasklist-cdi/src/main/java/org/apache/aries/jpa/example/tasklist/cdi/impl/TasklistServlet.java
@@ -0,0 +1,104 @@
+/*
+ * 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 WARRANTIESOR 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.aries.jpa.example.tasklist.cdi.impl;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.text.SimpleDateFormat;
+import java.util.Collection;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+import javax.servlet.Servlet;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.aries.jpa.example.tasklist.model.Task;
+import org.apache.aries.jpa.example.tasklist.model.TaskService;
+import org.ops4j.pax.cdi.api2.Component;
+import org.ops4j.pax.cdi.api2.Contract;
+import org.ops4j.pax.cdi.api2.Immediate;
+import org.ops4j.pax.cdi.api2.Properties;
+import org.ops4j.pax.cdi.api2.Property;
+import org.ops4j.pax.cdi.api2.Service;
+
+@Component @Service @Immediate
+@Contract(Servlet.class)
+@Properties(@Property(name = "alias", value="/tasklist"))
+public class TasklistServlet extends HttpServlet {
+
+ private static final long serialVersionUID = 34992072289535683L;
+
+ @Inject
+ private transient TaskService taskService;
+
+ @PostConstruct
+ void initialize() {
+
+ }
+
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException,
+ IOException {
+ String add = req.getParameter("add");
+ String taskId = req.getParameter("taskId");
+ String title = req.getParameter("title");
+ PrintWriter writer = resp.getWriter(); // NOSONAR
+ if (add != null) {
+ addTask(taskId, title);
+ } else if (taskId != null && taskId.length() > 0) {
+ showTask(writer, taskId);
+ } else {
+ showTaskList(writer);
+ }
+ }
+
+ private void addTask(String taskId, String title) {
+ Task task = new Task();
+ task.setId(new Integer(taskId));
+ task.setTitle(title);
+ taskService.addTask(task );
+ }
+
+ private void showTaskList(PrintWriter writer) {
+ writer.println("<h1>Tasks</h1>");
+ Collection<Task> tasks = taskService.getTasks();
+ for (Task task : tasks) {
+ writer.println("<a href=\"?taskId=" + task.getId() + "\">" + task.getTitle() + "</a><BR/>");
+ }
+ }
+
+ private void showTask(PrintWriter writer, String taskId) {
+ SimpleDateFormat sdf = new SimpleDateFormat();
+ Task task = taskService.getTask(new Integer(taskId));
+ if (task != null) {
+ writer.println("<h1>Task " + task.getTitle() + " </h1>");
+ if (task.getDueDate() != null) {
+ writer.println("Due date: " + sdf.format(task.getDueDate()) + "<br/>");
+ }
+ writer.println(task.getDescription());
+ } else {
+ writer.println("Task with id " + taskId + " not found");
+ }
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/ad5990d4/examples/tasklist-cdi/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/examples/tasklist-cdi/src/main/resources/META-INF/beans.xml b/examples/tasklist-cdi/src/main/resources/META-INF/beans.xml
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/ad5990d4/examples/tasklist-cdi/src/test/java/org/apache/aries/jpa/example/tasklist/cdi/impl/TaskServiceImplTest.java
----------------------------------------------------------------------
diff --git a/examples/tasklist-cdi/src/test/java/org/apache/aries/jpa/example/tasklist/cdi/impl/TaskServiceImplTest.java b/examples/tasklist-cdi/src/test/java/org/apache/aries/jpa/example/tasklist/cdi/impl/TaskServiceImplTest.java
new file mode 100644
index 0000000..43a53d9
--- /dev/null
+++ b/examples/tasklist-cdi/src/test/java/org/apache/aries/jpa/example/tasklist/cdi/impl/TaskServiceImplTest.java
@@ -0,0 +1,65 @@
+/*
+ * 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 WARRANTIESOR 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.aries.jpa.example.tasklist.cdi.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+
+import org.apache.aries.jpa.example.tasklist.cdi.impl.TaskServiceImpl;
+import org.apache.aries.jpa.example.tasklist.model.Task;
+import org.apache.aries.jpa.example.tasklist.model.TaskService;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TaskServiceImplTest {
+ @Test
+ public void testPersistence() {
+ // Make sure derby.log is in target
+ System.setProperty("derby.stream.error.file", "target/derby.log");
+ TaskServiceImpl taskServiceImpl = new TaskServiceImpl();
+ EntityManagerFactory emf = createTestEMF();
+ final EntityManager em = emf.createEntityManager();
+ em.getTransaction().begin();
+ taskServiceImpl.em = em;
+
+ TaskService taskService = taskServiceImpl;
+
+ Task task = new Task();
+ task.setId(1);
+ task.setTitle("test");
+ taskService.addTask(task);
+
+ Task task2 = taskService.getTask(1);
+ Assert.assertEquals(task.getTitle(), task2.getTitle());
+ em.getTransaction().commit();
+ em.close();
+ }
+
+ private EntityManagerFactory createTestEMF() {
+ Map<String, String> properties = new HashMap<String, String>();
+ properties.put("javax.persistence.jdbc.driver", "org.apache.derby.jdbc.EmbeddedDriver");
+ properties.put("javax.persistence.jdbc.url", "jdbc:derby:memory:TEST;create=true");
+ EntityManagerFactory emf = Persistence.createEntityManagerFactory("tasklist", properties);
+ return emf;
+ }
+}
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/ad5990d4/examples/tasklist-cdi/src/test/resources/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/examples/tasklist-cdi/src/test/resources/META-INF/persistence.xml b/examples/tasklist-cdi/src/test/resources/META-INF/persistence.xml
new file mode 100644
index 0000000..84b94ec
--- /dev/null
+++ b/examples/tasklist-cdi/src/test/resources/META-INF/persistence.xml
@@ -0,0 +1,33 @@
+<?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.
+
+-->
+<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+
+ <persistence-unit name="tasklist" transaction-type="RESOURCE_LOCAL">
+ <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+ <class>org.apache.aries.jpa.example.tasklist.model.Task</class>
+ <properties>
+ <property name="hibernate.dialect" value="org.hibernate.dialect.DerbyTenSevenDialect"/>
+ <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+ </properties>
+ </persistence-unit>
+
+</persistence>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/ad5990d4/jpa-cdi/osgi.bnd
----------------------------------------------------------------------
diff --git a/jpa-cdi/osgi.bnd b/jpa-cdi/osgi.bnd
new file mode 100644
index 0000000..7b9b23f
--- /dev/null
+++ b/jpa-cdi/osgi.bnd
@@ -0,0 +1,11 @@
+Import-Package: \
+ javax.persistence*;version=2.1, \
+ *
+Provide-Capability: \
+ org.ops4j.pax.cdi.extension; extension=aries-jpa-cdi; \
+ version:Version=${version;====;${replace;${project.version};-;.}}
+Require-Capability: \
+ org.ops4j.pax.cdi.extension; filter:="(extension=pax-cdi-extension2)"
+ osgi.extender; filter:="(osgi.extender=aries.jpa)"
+
+
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/ad5990d4/jpa-cdi/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-cdi/pom.xml b/jpa-cdi/pom.xml
new file mode 100644
index 0000000..fc69007
--- /dev/null
+++ b/jpa-cdi/pom.xml
@@ -0,0 +1,87 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.aries.jpa</groupId>
+ <artifactId>org.apache.aries.jpa.parent</artifactId>
+ <version>2.4.0-SNAPSHOT</version>
+ <relativePath>../jpa-parent</relativePath>
+ </parent>
+ <artifactId>org.apache.aries.jpa.cdi</artifactId>
+ <name>Apache Aries JPA cdi</name>
+ <description>CDI integration for injecting EntityManager, EntityManagerFactory and EmSupplier.</description>
+ <packaging>bundle</packaging>
+
+ <properties>
+ <baseline.skip>true</baseline.skip>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.2_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcdi_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-interceptor_1.2_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.2_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ops4j.pax.cdi</groupId>
+ <artifactId>pax-cdi-extension2</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jpa</groupId>
+ <artifactId>org.apache.aries.jpa.api</artifactId>
+ <version>2.4.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/ad5990d4/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/EntityManagerProducer.java
----------------------------------------------------------------------
diff --git a/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/EntityManagerProducer.java b/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/EntityManagerProducer.java
new file mode 100644
index 0000000..5cdf0a5
--- /dev/null
+++ b/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/EntityManagerProducer.java
@@ -0,0 +1,52 @@
+/*
+ * 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.aries.jpa.cdi;
+
+import javax.persistence.EntityManager;
+import java.lang.reflect.Proxy;
+
+import org.apache.aries.jpa.template.JpaTemplate;
+import org.apache.aries.jpa.template.TransactionType;
+
+public class EntityManagerProducer {
+
+ public static EntityManager create(JpaTemplate template) {
+ return (EntityManager) Proxy.newProxyInstance(EntityManager.class.getClassLoader(),
+ new Class<?>[]{EntityManager.class},
+ (proxy, method, args) -> {
+ try {
+ return template.txExpr(TransactionType.Supports, em -> {
+ try {
+ return method.invoke(em, args);
+ } catch (RuntimeException e) {
+ throw e;
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ });
+ } catch (RuntimeException e) {
+ if (e.getClass() == RuntimeException.class
+ && e.getCause() != null
+ && e.getCause().toString().equals(e.getMessage())) {
+ throw e.getCause();
+ }
+ throw e;
+ }
+ });
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/ad5990d4/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/JpaExtension.java
----------------------------------------------------------------------
diff --git a/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/JpaExtension.java b/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/JpaExtension.java
new file mode 100644
index 0000000..0c2c6f6
--- /dev/null
+++ b/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/JpaExtension.java
@@ -0,0 +1,60 @@
+/*
+ * 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.aries.jpa.cdi;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.AnnotatedField;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.inject.spi.ProcessAnnotatedType;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceUnit;
+import java.util.ArrayList;
+import java.util.List;
+
+@ApplicationScoped
+public class JpaExtension implements Extension {
+
+ List<Bean<?>> beans = new ArrayList<Bean<?>>();
+
+ public <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> event, BeanManager manager) {
+ boolean hasPersistenceField = false;
+ for (AnnotatedField<? super T> field : event.getAnnotatedType().getFields()) {
+ if (field.isAnnotationPresent(PersistenceContext.class)
+ || field.isAnnotationPresent(PersistenceUnit.class)) {
+ hasPersistenceField = true;
+ break;
+ }
+ }
+ if (hasPersistenceField) {
+ PersistenceAnnotatedType<T> pat = new PersistenceAnnotatedType<T>(manager, event.getAnnotatedType());
+ beans.addAll(pat.getProducers());
+ event.setAnnotatedType(pat);
+ }
+ }
+
+ public void afterBeanDiscovery(@Observes AfterBeanDiscovery event, BeanManager manager) {
+ for (Bean<?> bean : beans) {
+ event.addBean(bean);
+ }
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/ad5990d4/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/PersistenceAnnotatedType.java
----------------------------------------------------------------------
diff --git a/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/PersistenceAnnotatedType.java b/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/PersistenceAnnotatedType.java
new file mode 100644
index 0000000..13ac947
--- /dev/null
+++ b/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/PersistenceAnnotatedType.java
@@ -0,0 +1,141 @@
+/*
+ * 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.aries.jpa.cdi;
+
+import javax.enterprise.context.Dependent;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.AnnotatedField;
+import javax.enterprise.inject.spi.AnnotatedType;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceUnit;
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.aries.jpa.cdi.support.FilterLiteral;
+import org.apache.aries.jpa.cdi.support.ForwardingAnnotatedType;
+import org.apache.aries.jpa.cdi.support.InjectLiteral;
+import org.apache.aries.jpa.cdi.support.ServiceLiteral;
+import org.apache.aries.jpa.cdi.support.SimpleBean;
+import org.apache.aries.jpa.cdi.support.SyntheticAnnotatedField;
+import org.apache.aries.jpa.cdi.support.UniqueIdentifier;
+import org.apache.aries.jpa.cdi.support.UniqueIdentifierLitteral;
+import org.apache.aries.jpa.template.JpaTemplate;
+import org.ops4j.pax.cdi.extension2.api.OsgiExtension;
+
+import static java.util.Collections.unmodifiableSet;
+
+public class PersistenceAnnotatedType<T> extends ForwardingAnnotatedType<T> {
+
+ private final BeanManager manager;
+ private final Set<AnnotatedField<? super T>> fields;
+ private final List<Bean<?>> beans = new ArrayList<>();
+
+ public PersistenceAnnotatedType(BeanManager manager, AnnotatedType<T> delegate) {
+ super(delegate);
+ this.manager = manager;
+ this.fields = new HashSet<>();
+ for (AnnotatedField<? super T> field : delegate.getFields()) {
+ if (field.isAnnotationPresent(PersistenceContext.class)) {
+ field = decorateContext(field);
+ } else if (field.isAnnotationPresent(PersistenceUnit.class)) {
+ field = decorateUnit(field);
+ }
+ this.fields.add(field);
+ }
+ }
+
+ private boolean hasUnitName(PersistenceContext pc) {
+ return !pc.unitName().isEmpty();
+ }
+
+ private boolean hasUnitName(PersistenceUnit pu) {
+ return !pu.unitName().isEmpty();
+ }
+
+ private <X> AnnotatedField<X> decorateContext(AnnotatedField<X> field) {
+ final PersistenceContext persistenceContext = field.getAnnotation(PersistenceContext.class);
+ final UniqueIdentifier identifier = UniqueIdentifierLitteral.random();
+
+ Set<Annotation> templateQualifiers = new HashSet<>();
+ templateQualifiers.add(ServiceLiteral.SERVICE);
+ if (hasUnitName(persistenceContext)) {
+ templateQualifiers.add(new FilterLiteral("(osgi.unit.name=" + persistenceContext.unitName() + ")"));
+ }
+ Bean<JpaTemplate> bean = manager.getExtension(OsgiExtension.class)
+ .globalDependency(JpaTemplate.class, templateQualifiers);
+
+ Set<Annotation> qualifiers = new HashSet<>();
+ qualifiers.add(identifier);
+ Bean<EntityManager> b = new SimpleBean<>(EntityManager.class, Dependent.class, Collections.singleton(EntityManager.class), qualifiers, () -> {
+ CreationalContext<JpaTemplate> context = manager.createCreationalContext(bean);
+ JpaTemplate template = (JpaTemplate) manager.getReference(bean, JpaTemplate.class, context);
+ return EntityManagerProducer.create(template);
+ });
+ beans.add(b);
+
+ Set<Annotation> fieldAnnotations = new HashSet<>();
+ fieldAnnotations.add(InjectLiteral.INJECT);
+ fieldAnnotations.add(identifier);
+ return new SyntheticAnnotatedField<>(field, fieldAnnotations);
+ }
+
+ private <X> AnnotatedField<X> decorateUnit(AnnotatedField<X> field) {
+ final PersistenceUnit persistenceUnit = field.getAnnotation(PersistenceUnit.class);
+ final UniqueIdentifier identifier = UniqueIdentifierLitteral.random();
+
+ Set<Annotation> templateQualifiers = new HashSet<>();
+ templateQualifiers.add(ServiceLiteral.SERVICE);
+ if (hasUnitName(persistenceUnit)) {
+ templateQualifiers.add(new FilterLiteral("(osgi.unit.name=" + persistenceUnit.unitName() + ")"));
+ }
+ Bean<EntityManagerFactory> bean = manager.getExtension(OsgiExtension.class)
+ .globalDependency(EntityManagerFactory.class, templateQualifiers);
+
+ Set<Annotation> qualifiers = new HashSet<>();
+ qualifiers.add(identifier);
+ Bean<EntityManagerFactory> b = new SimpleBean<>(EntityManagerFactory.class, Dependent.class, Collections.singleton(EntityManagerFactory.class), qualifiers, () -> {
+ CreationalContext<EntityManagerFactory> context = manager.createCreationalContext(bean);
+ return (EntityManagerFactory) manager.getReference(bean, EntityManagerFactory.class, context);
+ });
+ beans.add(b);
+
+ Set<Annotation> fieldAnnotations = new HashSet<>();
+ fieldAnnotations.add(InjectLiteral.INJECT);
+ fieldAnnotations.add(identifier);
+ return new SyntheticAnnotatedField<>(field, fieldAnnotations);
+ }
+
+ @Override
+ public Set<AnnotatedField<? super T>> getFields() {
+ return unmodifiableSet(fields);
+ }
+
+ public Collection<? extends Bean<?>> getProducers() {
+ return beans;
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/ad5990d4/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/TransactionExtension.java
----------------------------------------------------------------------
diff --git a/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/TransactionExtension.java b/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/TransactionExtension.java
new file mode 100644
index 0000000..9968488
--- /dev/null
+++ b/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/TransactionExtension.java
@@ -0,0 +1,73 @@
+/*
+ * 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.aries.jpa.cdi;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.AnnotatedMethod;
+import javax.enterprise.inject.spi.AnnotatedType;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
+import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.inject.spi.ProcessManagedBean;
+import javax.transaction.Transactional;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
+@ApplicationScoped
+public class TransactionExtension implements Extension {
+
+ private Map<Method, Transactional> transactionAttributes;
+
+ public TransactionExtension() {
+ transactionAttributes = new HashMap<>();
+ }
+
+ <X> void processBean(@Observes ProcessManagedBean<X> event) {
+ AnnotatedType<X> annotatedType = event.getAnnotatedBeanClass();
+ Transactional classTx = annotatedType.getAnnotation(Transactional.class);
+ for (AnnotatedMethod<? super X> am : annotatedType.getMethods()) {
+ Transactional methodTx = am.getAnnotation(Transactional.class);
+ if (classTx != null || methodTx != null) {
+ Method method = am.getJavaMember();
+ Transactional attrType = mergeTransactionAttributes(classTx, methodTx);
+ transactionAttributes.put(method, attrType);
+ }
+ }
+ }
+
+ void beforeBeanDiscovery(@Observes BeforeBeanDiscovery event, BeanManager manager) {
+ event.addAnnotatedType(manager.createAnnotatedType(TransactionSupport.class));
+ event.addAnnotatedType(manager.createAnnotatedType(TransactionalInterceptor.class));
+ event.addInterceptorBinding(Transactional.class);
+ }
+
+ void afterBeanDiscovered(@Observes AfterBeanDiscovery event, BeanManager beanManager) {
+ event.addContext(new TransactionalContext(beanManager));
+ }
+
+ private Transactional mergeTransactionAttributes(Transactional classAttribute, Transactional methodAttribute) {
+ return methodAttribute != null ? methodAttribute : classAttribute;
+ }
+
+ Transactional getTransactionAttribute(Method method) {
+ return transactionAttributes.get(method);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/ad5990d4/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/TransactionSupport.java
----------------------------------------------------------------------
diff --git a/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/TransactionSupport.java b/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/TransactionSupport.java
new file mode 100644
index 0000000..2acb356
--- /dev/null
+++ b/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/TransactionSupport.java
@@ -0,0 +1,44 @@
+/*
+ * 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.aries.jpa.cdi;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.transaction.TransactionManager;
+import javax.transaction.TransactionSynchronizationRegistry;
+
+import org.ops4j.pax.cdi.api2.Global;
+import org.ops4j.pax.cdi.api2.Service;
+
+@ApplicationScoped
+public class TransactionSupport {
+
+ @Inject @Global @Service
+ private TransactionManager transactionManager;
+
+ @Inject @Global @Service
+ private TransactionSynchronizationRegistry transactionSynchronizationRegistry;
+
+ public TransactionManager getTransactionManager() {
+ return transactionManager;
+ }
+
+ public TransactionSynchronizationRegistry getTransactionSynchronizationRegistry() {
+ return transactionSynchronizationRegistry;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/ad5990d4/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/TransactionalContext.java
----------------------------------------------------------------------
diff --git a/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/TransactionalContext.java b/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/TransactionalContext.java
new file mode 100644
index 0000000..ce0c031
--- /dev/null
+++ b/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/TransactionalContext.java
@@ -0,0 +1,277 @@
+/*
+ * 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.aries.jpa.cdi;
+
+import javax.enterprise.context.ContextNotActiveException;
+import javax.enterprise.context.spi.Context;
+import javax.enterprise.context.spi.Contextual;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.transaction.Status;
+import javax.transaction.Synchronization;
+import javax.transaction.SystemException;
+import javax.transaction.TransactionScoped;
+import java.lang.annotation.Annotation;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TransactionalContext implements Context {
+
+ private static final Object TRANSACTION_BEANS_KEY = TransactionalContext.class.getName() + ".TRANSACTION_BEANS";
+
+ private static final Logger log = LoggerFactory.getLogger(TransactionalContext.class);
+
+ private BeanManager beanManager;
+
+ private volatile TransactionSupport transactionSupport;
+
+ /**
+ * Creates a new transactional context.
+ *
+ * @param beanManager {@link BeanManager}.
+ */
+ TransactionalContext(BeanManager beanManager) {
+ this.beanManager = beanManager;
+ }
+
+ /**
+ * Obtains a reference to a {@link TransactionSupport} bean.
+ *
+ * @return a bean that implements {@link TransactionSupport}.
+ */
+ private TransactionSupport getTransactionSupportReference() {
+ @SuppressWarnings("unchecked")
+ Bean<TransactionSupport> bean = (Bean<TransactionSupport>) beanManager
+ .resolve(beanManager.getBeans(TransactionSupport.class));
+ if (bean == null) {
+ throw new RuntimeException("TransactionSupport was not found");
+ }
+
+ CreationalContext<TransactionSupport> ctx = beanManager.createCreationalContext(bean);
+ return (TransactionSupport) beanManager.getReference(bean,
+ TransactionSupport.class, ctx);
+ }
+
+ /**
+ * Lazily initialize the object field and gets a reference to a bean that
+ * implements {@link TransactionSupport}.
+ *
+ * @return a bean that implements {@link TransactionSupport}.
+ */
+ private TransactionSupport getTransactionSupport() {
+ if (transactionSupport == null) {
+ synchronized (this) {
+ if (transactionSupport == null) {
+ transactionSupport = getTransactionSupportReference();
+ }
+ }
+ }
+
+ return transactionSupport;
+ }
+
+ /**
+ * Registers a synchronization object for the current transaction.
+ *
+ * @param transactionSupport a {@link TransactionSupport} bean.
+ * @param instances a map that contains transaction scoped beans for the
+ * current transaction.
+ */
+ private <T> void registerSynchronization(
+ TransactionSupport transactionSupport,
+ Map<Contextual<T>, ContextualInstance<T>> instances) {
+ transactionSupport.getTransactionSynchronizationRegistry()
+ .registerInterposedSynchronization(new TransactionSynchronization<T>(instances));
+ }
+
+ /**
+ * Retrieves the map that contains transaction scoped beans for the current
+ * transaction.
+ *
+ * @param transactionSupport a bean that implements {@link TransactionSupport}.
+ * @return instances of transaction scoped beans for the current
+ * transaction.
+ */
+ private <T> Map<Contextual<T>, ContextualInstance<T>> getInstances(
+ TransactionSupport transactionSupport) {
+ @SuppressWarnings("unchecked")
+ Map<Contextual<T>, ContextualInstance<T>> instances =
+ (Map<Contextual<T>, ContextualInstance<T>>) transactionSupport.getTransactionSynchronizationRegistry()
+ .getResource(TRANSACTION_BEANS_KEY);
+ if (instances == null) {
+ instances = new HashMap<Contextual<T>, ContextualInstance<T>>();
+ transactionSupport
+ .getTransactionSynchronizationRegistry()
+ .putResource(TRANSACTION_BEANS_KEY, instances);
+
+ registerSynchronization(transactionSupport, instances);
+ }
+
+ return instances;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public <T> T get(
+ Contextual<T> contextual) {
+ return get(contextual, null);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public <T> T get(
+ Contextual<T> contextual,
+ CreationalContext<T> creationalContext) {
+ if (!isActive()) {
+ throw new ContextNotActiveException();
+ }
+
+ if (contextual == null) {
+ throw new IllegalArgumentException(
+ "No contextual specified to retrieve");
+ }
+
+ TransactionSupport transactionSupport = getTransactionSupport();
+ Map<Contextual<T>, ContextualInstance<T>> instances =
+ getInstances(transactionSupport);
+ ContextualInstance<T> contextualInstance = instances.get(contextual);
+ if (contextualInstance != null) {
+ return contextualInstance.instance;
+ } else if (creationalContext == null) {
+ return null;
+ } else {
+ T instance = contextual.create(creationalContext);
+ contextualInstance = new ContextualInstance<T>(instance,
+ creationalContext);
+ instances.put(contextual, contextualInstance);
+
+ if (log.isDebugEnabled()) {
+ log.debug("Created a new transaction scoped instance "
+ + contextualInstance);
+ }
+
+ return instance;
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Class<? extends Annotation> getScope() {
+ return TransactionScoped.class;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isActive() {
+ try {
+ return getTransactionSupport().getTransactionManager().getStatus() == Status.STATUS_ACTIVE;
+ } catch (SystemException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ /**
+ * <p>
+ * Synchronization object that destroys transaction scoped beans after the
+ * transaction ends.
+ * </p>
+ *
+ * @author Vlad Arkhipov
+ */
+ private static class TransactionSynchronization<T>
+ implements Synchronization {
+ private Map<Contextual<T>, ContextualInstance<T>> instances;
+
+ /**
+ * Creates a new synchronization.
+ *
+ * @param instances instances of transaction scoped beans for the
+ * current transaction.
+ */
+ TransactionSynchronization(
+ Map<Contextual<T>, ContextualInstance<T>> instances) {
+ this.instances = instances;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void beforeCompletion() {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void afterCompletion(
+ int status) {
+ for (Map.Entry<Contextual<T>, ContextualInstance<T>> entry : instances.entrySet()) {
+ entry.getValue().destroy(entry.getKey());
+ }
+ }
+ }
+
+ /**
+ * <p>
+ * An object that represents an instance of a bean. Contains a reference for
+ * a bean and {@link CreationalContext}.
+ * </p>
+ *
+ * @author Vlad Arkhipov
+ */
+ private static class ContextualInstance<T> {
+ private T instance;
+
+ private CreationalContext<T> creationalContext;
+
+ /**
+ * Creates a new object that represents an instance of a bean.
+ *
+ * @param instance an instance of a bean.
+ * @param creationalContext a {@link CreationalContext}.
+ */
+ public ContextualInstance(
+ T instance,
+ CreationalContext<T> creationalContext) {
+ this.instance = instance;
+ this.creationalContext = creationalContext;
+ }
+
+ /**
+ * Destroys the bean.
+ *
+ * @param contextual a {@link Contextual}.
+ */
+ void destroy(
+ Contextual<T> contextual) {
+ if (log.isDebugEnabled()) {
+ log.debug("Destroying transaction scoped bean instance "
+ + this);
+ }
+
+ contextual.destroy(instance, creationalContext);
+ creationalContext.release();
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/ad5990d4/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/TransactionalInterceptor.java
----------------------------------------------------------------------
diff --git a/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/TransactionalInterceptor.java b/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/TransactionalInterceptor.java
new file mode 100644
index 0000000..f935ca1
--- /dev/null
+++ b/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/TransactionalInterceptor.java
@@ -0,0 +1,226 @@
+/*
+ * 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.aries.jpa.cdi;
+
+import javax.annotation.Priority;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+import javax.transaction.Status;
+import javax.transaction.SystemException;
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
+import javax.transaction.Transactional;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@Transactional
+@Interceptor
+@Priority(Interceptor.Priority.PLATFORM_BEFORE + 200)
+class TransactionalInterceptor {
+
+ private static final Logger log = LoggerFactory.getLogger(TransactionalInterceptor.class);
+
+ @Inject
+ private BeanManager beanManager;
+
+ @Inject
+ private TransactionSupport transactionSupport;
+
+ @AroundInvoke
+ Object aroundInvoke(InvocationContext invocationContext) throws Exception {
+
+ TransactionManager transactionManager = transactionSupport.getTransactionManager();
+ boolean active = isTransactionActive(transactionManager);
+ TransactionExtension extension = beanManager.getExtension(TransactionExtension.class);
+ Transactional attr = extension.getTransactionAttribute(invocationContext.getMethod());
+ Boolean requiresNew = requiresNew(active, attr.value());
+
+ boolean debug = log.isDebugEnabled();
+
+ if (debug) {
+ log.debug("Invoking transactional method {}, attr = {}, active = {}, requiresNew = {}",
+ invocationContext.getMethod(), attr.value(), active, requiresNew);
+ }
+
+ // Suspend the current transaction if transaction attribute is // REQUIRES_NEW or NOT_SUPPORTED.
+ Transaction previous = null;
+ if ((requiresNew != Boolean.FALSE) && active) {
+ if (debug) {
+ log.debug("Suspending the current transaction");
+ }
+ previous = transactionManager.suspend();
+ }
+
+ try {
+ if (requiresNew == Boolean.TRUE) {
+ if (debug) {
+ log.debug("Starting a new transaction");
+ }
+ transactionManager.begin();
+ }
+
+ Object result;
+ try {
+ result = invocationContext.proceed();
+ } catch (Exception e) {
+ if (requiresNew == Boolean.FALSE) {
+ if (needsRollback(attr, e)) {
+ transactionManager.setRollbackOnly();
+ }
+ } else if (requiresNew == Boolean.TRUE) {
+ if (needsRollback(attr, e)) {
+ if (debug) {
+ log.debug("Rolling back the current transaction");
+ }
+ transactionManager.rollback();
+ } else {
+ if (debug) {
+ log.debug("Committing the current transaction");
+ }
+ transactionManager.commit();
+ }
+ }
+
+ throw e;
+ }
+
+ if (requiresNew == Boolean.TRUE) {
+ if (transactionManager.getStatus() == Status.STATUS_MARKED_ROLLBACK) {
+ if (debug) {
+ log.debug("Rolling back the current transaction");
+ }
+ transactionManager.rollback();
+ } else {
+ if (debug) {
+ log.debug("Committing the current transaction");
+ }
+ transactionManager.commit();
+ }
+ }
+
+ return result;
+ } finally {
+ // Resume the previous transaction if it was suspended.
+ if (previous != null) {
+ if (debug) {
+ log.debug("Resuming the previous transaction");
+ }
+ transactionManager.resume(previous);
+ }
+ }
+ }
+
+ /**
+ * Checks if the current transaction is active, rolled back or marked for
+ * rollback.
+ *
+ * @return {@code true} if the current transaction is active, rolled back or
+ * marked for rollback, {@code false} otherwise.
+ * @throws SystemException thrown if the transaction manager encounters an
+ * unexpected error condition
+ */
+ private boolean isTransactionActive(TransactionManager transactionManager) throws SystemException {
+ switch (transactionManager.getStatus()) {
+ case Status.STATUS_ACTIVE:
+ case Status.STATUS_MARKED_ROLLBACK:
+ case Status.STATUS_ROLLEDBACK:
+ return true;
+
+ default:
+ return false;
+ }
+ }
+
+ /**
+ * Determines whether it is necessary to begin a new transaction.
+ *
+ * @param active the status of the current transaction.
+ * @param attribute the transaction attribute of the current method.
+ * @return {@code Boolean.TRUE} if the interceptor should suspend the
+ * current transaction and invoke the method within a new
+ * transaction, {@code Boolean.FALSE} if the interceptor should
+ * invoke the method within the current transaction, {@code null} if
+ * the interceptor should suspend the current transaction and invoke
+ * the method outside of transaction.
+ */
+ private Boolean requiresNew(boolean active, Transactional.TxType attribute) {
+ switch (attribute) {
+ case MANDATORY:
+ if (active) {
+ return false;
+ } else {
+ throw new IllegalStateException("Transaction is required to perform this method");
+ }
+
+ case NEVER:
+ if (!active) {
+ return null;
+ } else {
+ throw new IllegalStateException("This method cannot be invoked within a transaction");
+ }
+
+ case NOT_SUPPORTED:
+ return null;
+
+ case REQUIRED:
+ return !active;
+
+ case REQUIRES_NEW:
+ return true;
+
+ case SUPPORTS:
+ if (active) {
+ return false;
+ } else {
+ return null;
+ }
+
+ default:
+ throw new UnsupportedOperationException("Unsupported TransactionAttribute value " + attribute);
+ }
+ }
+
+ /**
+ * Determines whether it is necessary to rollback the current transaction
+ * when the specified exception occurred during the method invocation.
+ *
+ *
+ * @param attr
+ * @param exception the exception that occurred during the method
+ * invocation.
+ * @return {@code true} if the interceptor should rollback the current
+ * transaction, {@code false} if the interceptor should commit the
+ * current transaction.
+ */
+ private boolean needsRollback(Transactional attr, Exception exception) {
+ for (Class cl : attr.dontRollbackOn()) {
+ if (cl.isInstance(exception)) {
+ return false;
+ }
+ }
+ for (Class cl : attr.rollbackOn()) {
+ if (cl.isInstance(exception)) {
+ return true;
+ }
+ }
+ return exception instanceof RuntimeException;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/ad5990d4/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/FilterLiteral.java
----------------------------------------------------------------------
diff --git a/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/FilterLiteral.java b/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/FilterLiteral.java
new file mode 100644
index 0000000..f52e1fd
--- /dev/null
+++ b/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/FilterLiteral.java
@@ -0,0 +1,35 @@
+/*
+ * 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.aries.jpa.cdi.support;
+
+import javax.enterprise.util.AnnotationLiteral;
+
+import org.ops4j.pax.cdi.api2.Filter;
+
+public final class FilterLiteral extends AnnotationLiteral<Filter> implements Filter {
+
+ private final String filter;
+
+ public FilterLiteral(String filter) {
+ this.filter = filter;
+ }
+
+ @Override
+ public String value() {
+ return filter;
+ }
+}
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/ad5990d4/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/ForwardingAnnotatedField.java
----------------------------------------------------------------------
diff --git a/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/ForwardingAnnotatedField.java b/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/ForwardingAnnotatedField.java
new file mode 100644
index 0000000..d332b58
--- /dev/null
+++ b/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/ForwardingAnnotatedField.java
@@ -0,0 +1,73 @@
+/*
+ * 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.aries.jpa.cdi.support;
+
+import javax.enterprise.inject.spi.AnnotatedField;
+import javax.enterprise.inject.spi.AnnotatedType;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.Type;
+import java.util.Set;
+
+public class ForwardingAnnotatedField<X> implements AnnotatedField<X> {
+
+ private final AnnotatedField<X> delegate;
+
+ public ForwardingAnnotatedField(AnnotatedField<X> delegate) {
+ this.delegate = delegate;
+ }
+
+ @Override
+ public Field getJavaMember() {
+ return delegate.getJavaMember();
+ }
+
+ @Override
+ public boolean isStatic() {
+ return delegate.isStatic();
+ }
+
+ @Override
+ public AnnotatedType<X> getDeclaringType() {
+ return delegate.getDeclaringType();
+ }
+
+ @Override
+ public Type getBaseType() {
+ return delegate.getBaseType();
+ }
+
+ @Override
+ public Set<Type> getTypeClosure() {
+ return delegate.getTypeClosure();
+ }
+
+ @Override
+ public <T extends Annotation> T getAnnotation(Class<T> annotationType) {
+ return delegate.getAnnotation(annotationType);
+ }
+
+ @Override
+ public Set<Annotation> getAnnotations() {
+ return delegate.getAnnotations();
+ }
+
+ @Override
+ public boolean isAnnotationPresent(Class<? extends Annotation> annotationType) {
+ return delegate.isAnnotationPresent(annotationType);
+ }
+}
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/ad5990d4/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/ForwardingAnnotatedType.java
----------------------------------------------------------------------
diff --git a/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/ForwardingAnnotatedType.java b/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/ForwardingAnnotatedType.java
new file mode 100644
index 0000000..6131852
--- /dev/null
+++ b/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/ForwardingAnnotatedType.java
@@ -0,0 +1,79 @@
+/*
+ * 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.aries.jpa.cdi.support;
+
+import javax.enterprise.inject.spi.AnnotatedConstructor;
+import javax.enterprise.inject.spi.AnnotatedField;
+import javax.enterprise.inject.spi.AnnotatedMethod;
+import javax.enterprise.inject.spi.AnnotatedType;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Set;
+
+public class ForwardingAnnotatedType<X> implements AnnotatedType<X> {
+
+ private final AnnotatedType<X> delegate;
+
+ public ForwardingAnnotatedType(AnnotatedType<X> delegate) {
+ this.delegate = delegate;
+ }
+
+ @Override
+ public Class<X> getJavaClass() {
+ return delegate.getJavaClass();
+ }
+
+ @Override
+ public Set<AnnotatedConstructor<X>> getConstructors() {
+ return delegate.getConstructors();
+ }
+
+ @Override
+ public Set<AnnotatedMethod<? super X>> getMethods() {
+ return delegate.getMethods();
+ }
+
+ @Override
+ public Set<AnnotatedField<? super X>> getFields() {
+ return delegate.getFields();
+ }
+
+ @Override
+ public Type getBaseType() {
+ return delegate.getBaseType();
+ }
+
+ @Override
+ public Set<Type> getTypeClosure() {
+ return delegate.getTypeClosure();
+ }
+
+ @Override
+ public <T extends Annotation> T getAnnotation(Class<T> annotationType) {
+ return delegate.getAnnotation(annotationType);
+ }
+
+ @Override
+ public Set<Annotation> getAnnotations() {
+ return delegate.getAnnotations();
+ }
+
+ @Override
+ public boolean isAnnotationPresent(Class<? extends Annotation> annotationType) {
+ return delegate.isAnnotationPresent(annotationType);
+ }
+}
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/ad5990d4/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/InjectLiteral.java
----------------------------------------------------------------------
diff --git a/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/InjectLiteral.java b/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/InjectLiteral.java
new file mode 100644
index 0000000..4fcf6d0
--- /dev/null
+++ b/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/InjectLiteral.java
@@ -0,0 +1,26 @@
+/*
+ * 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.aries.jpa.cdi.support;
+
+import javax.enterprise.util.AnnotationLiteral;
+import javax.inject.Inject;
+
+public final class InjectLiteral extends AnnotationLiteral<Inject> implements Inject {
+
+ public static InjectLiteral INJECT = new InjectLiteral();
+
+}
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/ad5990d4/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/ServiceLiteral.java
----------------------------------------------------------------------
diff --git a/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/ServiceLiteral.java b/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/ServiceLiteral.java
new file mode 100644
index 0000000..154c5af
--- /dev/null
+++ b/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/ServiceLiteral.java
@@ -0,0 +1,27 @@
+/*
+ * 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.aries.jpa.cdi.support;
+
+import javax.enterprise.util.AnnotationLiteral;
+
+import org.ops4j.pax.cdi.api2.Service;
+
+public final class ServiceLiteral extends AnnotationLiteral<Service> implements Service {
+
+ public static final Service SERVICE = new ServiceLiteral();
+
+}
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/ad5990d4/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/SimpleBean.java
----------------------------------------------------------------------
diff --git a/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/SimpleBean.java b/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/SimpleBean.java
new file mode 100644
index 0000000..6b302cc
--- /dev/null
+++ b/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/SimpleBean.java
@@ -0,0 +1,101 @@
+/*
+ * 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.aries.jpa.cdi.support;
+
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.InjectionPoint;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Collections;
+import java.util.Set;
+import java.util.function.Supplier;
+
+public class SimpleBean<T> implements Bean<T> {
+
+ private final Class clazz;
+ private final Class<? extends Annotation> scope;
+ private final Supplier<T> supplier;
+ private final Set<Type> types;
+ private final Set<Annotation> qualifiers;
+
+ public SimpleBean(Class clazz, Class<? extends Annotation> scope, InjectionPoint ip, Supplier<T> supplier) {
+ this(clazz, scope, Collections.singleton(ip.getType()), ip.getQualifiers(), supplier);
+ }
+
+ public SimpleBean(Class clazz, Class<? extends Annotation> scope, Set<Type> types, Set<Annotation> qualifiers, Supplier<T> supplier) {
+ this.clazz = clazz;
+ this.scope = scope;
+ this.types = Collections.unmodifiableSet(types);
+ this.qualifiers = Collections.unmodifiableSet(qualifiers);
+ this.supplier = supplier;
+ }
+
+ @Override
+ public Class<?> getBeanClass() {
+ return clazz;
+ }
+
+ @Override
+ public Set<InjectionPoint> getInjectionPoints() {
+ return Collections.emptySet();
+ }
+
+ @Override
+ public boolean isNullable() {
+ return false;
+ }
+
+ @Override
+ public Set<Type> getTypes() {
+ return types;
+ }
+
+ @Override
+ public Set<Annotation> getQualifiers() {
+ return qualifiers;
+ }
+
+ @Override
+ public Class<? extends Annotation> getScope() {
+ return scope;
+ }
+
+ @Override
+ public String getName() {
+ return null;
+ }
+
+ @Override
+ public Set<Class<? extends Annotation>> getStereotypes() {
+ return Collections.emptySet();
+ }
+
+ @Override
+ public boolean isAlternative() {
+ return false;
+ }
+
+ @Override
+ public T create(CreationalContext<T> creationalContext) {
+ return supplier.get();
+ }
+
+ @Override
+ public void destroy(T instance, CreationalContext<T> creationalContext) {
+ }
+}
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/ad5990d4/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/SyntheticAnnotatedField.java
----------------------------------------------------------------------
diff --git a/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/SyntheticAnnotatedField.java b/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/SyntheticAnnotatedField.java
new file mode 100644
index 0000000..092a008
--- /dev/null
+++ b/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/SyntheticAnnotatedField.java
@@ -0,0 +1,65 @@
+/*
+ * 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.aries.jpa.cdi.support;
+
+import javax.enterprise.inject.spi.AnnotatedField;
+import java.lang.annotation.Annotation;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+public class SyntheticAnnotatedField<X> extends ForwardingAnnotatedField<X> {
+
+ private final Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<>();
+
+ public SyntheticAnnotatedField(AnnotatedField<X> delegate) {
+ this(delegate, Collections.<Annotation>emptyList());
+ }
+
+ public SyntheticAnnotatedField(AnnotatedField<X> delegate, Iterable<? extends Annotation> annotations) {
+ super(delegate);
+ for (Annotation annotation : annotations) {
+ addAnnotation(annotation);
+ }
+ for (Annotation annotation : delegate.getAnnotations()) {
+ addAnnotation(annotation);
+ }
+ }
+
+ public void addAnnotation(Annotation annotation) {
+ this.annotations.put(annotation.annotationType(), annotation);
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public <T extends Annotation> T getAnnotation(Class<T> annotationType) {
+ return (T) annotations.get(annotationType);
+ }
+
+ @Override
+ public Set<Annotation> getAnnotations() {
+ return Collections.unmodifiableSet(new HashSet<>(annotations.values()));
+ }
+
+ @Override
+ public boolean isAnnotationPresent(Class<? extends Annotation> annotationType) {
+ return annotations.containsKey(annotationType);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/ad5990d4/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/UniqueIdentifier.java
----------------------------------------------------------------------
diff --git a/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/UniqueIdentifier.java b/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/UniqueIdentifier.java
new file mode 100644
index 0000000..399e785
--- /dev/null
+++ b/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/UniqueIdentifier.java
@@ -0,0 +1,36 @@
+/*
+ * 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.aries.jpa.cdi.support;
+
+import javax.inject.Qualifier;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Target({METHOD, FIELD, PARAMETER, TYPE})
+@Retention(RUNTIME)
+@Qualifier
+public @interface UniqueIdentifier {
+
+ String id();
+
+}
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/ad5990d4/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/UniqueIdentifierLitteral.java
----------------------------------------------------------------------
diff --git a/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/UniqueIdentifierLitteral.java b/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/UniqueIdentifierLitteral.java
new file mode 100644
index 0000000..0fb6805
--- /dev/null
+++ b/jpa-cdi/src/main/java/org/apache/aries/jpa/cdi/support/UniqueIdentifierLitteral.java
@@ -0,0 +1,38 @@
+/*
+ * 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.aries.jpa.cdi.support;
+
+import javax.enterprise.util.AnnotationLiteral;
+import java.util.UUID;
+
+public class UniqueIdentifierLitteral extends AnnotationLiteral<UniqueIdentifier> implements UniqueIdentifier {
+
+ private final String id;
+
+ public UniqueIdentifierLitteral(String id) {
+ this.id = id;
+ }
+
+ @Override
+ public String id() {
+ return id;
+ }
+
+ public static UniqueIdentifierLitteral random() {
+ return new UniqueIdentifierLitteral(UUID.randomUUID().toString());
+ }
+}
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/ad5990d4/jpa-cdi/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/jpa-cdi/src/main/resources/META-INF/beans.xml b/jpa-cdi/src/main/resources/META-INF/beans.xml
new file mode 100644
index 0000000..5a535b3
--- /dev/null
+++ b/jpa-cdi/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/ad5990d4/jpa-cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
----------------------------------------------------------------------
diff --git a/jpa-cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/jpa-cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
new file mode 100644
index 0000000..f5a449c
--- /dev/null
+++ b/jpa-cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
@@ -0,0 +1,2 @@
+org.apache.aries.jpa.cdi.TransactionExtension
+org.apache.aries.jpa.cdi.JpaExtension
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/ad5990d4/jpa-parent/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-parent/pom.xml b/jpa-parent/pom.xml
index 70574a5..1ea4623 100644
--- a/jpa-parent/pom.xml
+++ b/jpa-parent/pom.xml
@@ -95,6 +95,31 @@
<artifactId>geronimo-jta_1.1_spec</artifactId>
<version>1.1.1</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.2_spec</artifactId>
+ <version>1.0-alpha-1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcdi_1.1_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-interceptor_1.2_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.2_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
<dependency>
<groupId>org.osgi</groupId>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/ad5990d4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6a4e741..c5fa5a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,6 +48,7 @@
<module>jpa-container</module>
<module>jpa-support</module>
<module>jpa-blueprint</module>
+ <module>jpa-cdi</module>
<module>jpa-container-eclipselink-adapter</module>
<module>jpa-repository</module>
<module>examples</module>
[10/50] aries-jpa git commit: [ARIES-1575] Use the Persistence
Bundle's context to get the Persistence Provider
Posted by cs...@apache.org.
[ARIES-1575] Use the Persistence Bundle's context to get the Persistence Provider
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1748744 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/ac32967f
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/ac32967f
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/ac32967f
Branch: refs/heads/master
Commit: ac32967f1c7c33f661b55f858f3e7d53f4b3378b
Parents: ad5990d
Author: timothyjward <ti...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Thu Jun 16 15:20:52 2016 +0000
Committer: timothyjward <ti...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Thu Jun 16 15:20:52 2016 +0000
----------------------------------------------------------------------
.../aries/jpa/container/impl/PersistenceBundleTracker.java | 6 +++---
.../aries/jpa/container/impl/PersistenceProviderTracker.java | 8 +++++---
2 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/ac32967f/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleTracker.java
----------------------------------------------------------------------
diff --git a/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleTracker.java b/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleTracker.java
index b777741..f468cfa 100644
--- a/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleTracker.java
+++ b/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleTracker.java
@@ -40,11 +40,11 @@ import org.slf4j.LoggerFactory;
public class PersistenceBundleTracker implements BundleTrackerCustomizer<Bundle> {
private static final Logger LOGGER = LoggerFactory.getLogger(PersistenceBundleTracker.class);
private final Map<Bundle, Collection<PersistenceProviderTracker>> trackers;
- private final BundleContext context;
+ private final BundleContext containerContext;
private Map<Integer, String> typeMap;
public PersistenceBundleTracker(BundleContext context) {
- this.context = context;
+ this.containerContext = context;
trackers = new HashMap<Bundle, Collection<PersistenceProviderTracker>>();
this.typeMap = new HashMap<Integer, String>();
this.typeMap.put(BundleEvent.INSTALLED, "INSTALLED");
@@ -102,7 +102,7 @@ public class PersistenceBundleTracker implements BundleTrackerCustomizer<Bundle>
LOGGER.info(String.format("Found persistence unit %s in bundle %s with provider %s.",
punit.getPersistenceUnitName(), bundle.getSymbolicName(),
punit.getPersistenceProviderClassName()));
- PersistenceProviderTracker tracker = new PersistenceProviderTracker(context, punit);
+ PersistenceProviderTracker tracker = new PersistenceProviderTracker(containerContext, punit);
tracker.open();
getTrackers(bundle).add(tracker);
}
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/ac32967f/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceProviderTracker.java
----------------------------------------------------------------------
diff --git a/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceProviderTracker.java b/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceProviderTracker.java
index 787b2fd..91e53ff 100644
--- a/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceProviderTracker.java
+++ b/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceProviderTracker.java
@@ -48,8 +48,8 @@ public class PersistenceProviderTracker extends ServiceTracker<PersistenceProvid
private PersistenceUnit punit;
- public PersistenceProviderTracker(BundleContext context, PersistenceUnit punit) {
- super(context, createFilter(context, punit), null);
+ public PersistenceProviderTracker(BundleContext containerContext, PersistenceUnit punit) {
+ super(containerContext, createFilter(containerContext, punit), null);
this.punit = punit;
}
@@ -80,7 +80,9 @@ public class PersistenceProviderTracker extends ServiceTracker<PersistenceProvid
}
StoredPerProvider stored = new StoredPerProvider();
LOGGER.info("Found provider for " + punit.getPersistenceUnitName() + " " + punit.getPersistenceProviderClassName());
- PersistenceProvider provider = context.getService(reference);
+
+ // This get must happen using the persistence bundle's context to avoid ARIES-1575
+ PersistenceProvider provider = punit.getBundle().getBundleContext().getService(reference);
createAndCloseDummyEMF(provider);
[40/50] aries-jpa git commit: Revert "[ARIES-1689] Fix initialization"
Posted by cs...@apache.org.
Revert "[ARIES-1689] Fix initialization"
This was broken. Reverting to Guiseppes solution.
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1785796 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/4960fdc2
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/4960fdc2
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/4960fdc2
Branch: refs/heads/master
Commit: 4960fdc205ebd79ad740857f3d54d2232886bd4a
Parents: 3e7d639
Author: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Tue Mar 7 05:29:55 2017 +0000
Committer: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Tue Mar 7 05:29:55 2017 +0000
----------------------------------------------------------------------
.../org/apache/aries/jpa/blueprint/impl/JpaInterceptor.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/4960fdc2/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptor.java
----------------------------------------------------------------------
diff --git a/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptor.java b/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptor.java
index 93a37b1..a6d5bf2 100644
--- a/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptor.java
+++ b/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptor.java
@@ -19,7 +19,6 @@
package org.apache.aries.jpa.blueprint.impl;
import java.lang.reflect.Method;
-import java.util.concurrent.atomic.AtomicBoolean;
import javax.persistence.EntityManager;
import javax.persistence.spi.PersistenceUnitTransactionType;
@@ -40,13 +39,11 @@ public class JpaInterceptor implements Interceptor {
private BlueprintContainer container;
private String coordinatorId;
private String emId;
- private AtomicBoolean initialized;
public JpaInterceptor(BlueprintContainer container, String coordinatorId, String emId) {
this.container = container;
this.coordinatorId = coordinatorId;
this.emId = emId;
- this.initialized = new AtomicBoolean(false);
}
@Override
@@ -56,7 +53,7 @@ public class JpaInterceptor implements Interceptor {
@Override
public Object preCall(ComponentMetadata cm, Method m, Object... parameters) throws Throwable {
- if (!initialized.get()) {
+ if (coordinator == null || em == null) {
initServices();
}
try {
@@ -74,7 +71,7 @@ public class JpaInterceptor implements Interceptor {
}
private synchronized void initServices() {
- if (initialized.compareAndSet(false, true)) {
+ if (coordinator == null || em == null) {
coordinator = (Coordinator)container.getComponentInstance(coordinatorId);
em = (EntityManager)container.getComponentInstance(emId);
}
[05/50] aries-jpa git commit: [ARIES-1370] Updated to 2.3.0 version
Posted by cs...@apache.org.
[ARIES-1370] Updated to 2.3.0 version
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1746445 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/445bc92a
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/445bc92a
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/445bc92a
Branch: refs/heads/master
Commit: 445bc92a2c0d92900b149c084c5aa7dfdf469373
Parents: 3e816a5
Author: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Wed Jun 1 12:27:19 2016 +0000
Committer: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Wed Jun 1 12:27:19 2016 +0000
----------------------------------------------------------------------
examples/README.md | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/445bc92a/examples/README.md
----------------------------------------------------------------------
diff --git a/examples/README.md b/examples/README.md
index 32f48d3..0766e4b 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -15,15 +15,15 @@ feature:install scr transaction pax-jdbc-config pax-jdbc-h2 pax-jdbc-pool-dbcp2
# Closure based example. (Make sure to start karaf with JDK 8)
```
-install -s mvn:org.apache.aries.jpa.example/org.apache.aries.jpa.example.tasklist.model/2.1.0
-install -s mvn:org.apache.aries.jpa.example/org.apache.aries.jpa.example.tasklist.ds/2.1.0
+install -s mvn:org.apache.aries.jpa.example/org.apache.aries.jpa.example.tasklist.model/2.3.0
+install -s mvn:org.apache.aries.jpa.example/org.apache.aries.jpa.example.tasklist.ds/2.3.0
```
# Blueprint based example
```
-install -s mvn:org.apache.aries.jpa/org.apache.aries.jpa.blueprint/2.1.0
-install -s mvn:org.apache.aries.jpa.example/org.apache.aries.jpa.example.tasklist.model/2.1.0
-install -s mvn:org.apache.aries.jpa.example/org.apache.aries.jpa.example.tasklist.blueprint/2.1.0
+install -s mvn:org.apache.aries.jpa/org.apache.aries.jpa.blueprint/2.3.0
+install -s mvn:org.apache.aries.jpa.example/org.apache.aries.jpa.example.tasklist.model/2.3.0
+install -s mvn:org.apache.aries.jpa.example/org.apache.aries.jpa.example.tasklist.blueprint/2.3.0
```
After installing the examples you can check for the services.
[20/50] aries-jpa git commit: [ARIES-1497] Cleanup test dependencies
Posted by cs...@apache.org.
[ARIES-1497] Cleanup test dependencies
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1776966 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/f0774929
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/f0774929
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/f0774929
Branch: refs/heads/master
Commit: f07749292f1b607a9bf7c48a8139f570e2f562fb
Parents: 805e98d
Author: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Mon Jan 2 17:19:48 2017 +0000
Committer: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Mon Jan 2 17:19:48 2017 +0000
----------------------------------------------------------------------
itests/jpa-container-itest/pom.xml | 54 +++++----------------------------
itests/pom.xml | 3 +-
2 files changed, 9 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/f0774929/itests/jpa-container-itest/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-itest/pom.xml b/itests/jpa-container-itest/pom.xml
index dd5fd87..1f4beed 100644
--- a/itests/jpa-container-itest/pom.xml
+++ b/itests/jpa-container-itest/pom.xml
@@ -34,6 +34,13 @@
<dependencies>
<dependency>
+ <groupId>org.apache.aries.jpa</groupId>
+ <artifactId>jpa-repository</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
<groupId>org.eclipse.tycho</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>3.10.100.v20150529-1857</version>
@@ -60,6 +67,7 @@
<version>1.8.4</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
@@ -96,38 +104,6 @@
<scope>test</scope>
</dependency>
- <!-- Dependencies to aries jpa modules -->
- <dependency>
- <artifactId>org.apache.aries.jpa.api</artifactId>
- <groupId>org.apache.aries.jpa</groupId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jpa</groupId>
- <artifactId>org.apache.aries.jpa.container</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jpa</groupId>
- <artifactId>org.apache.aries.jpa.support</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jpa</groupId>
- <artifactId>org.apache.aries.jpa.blueprint</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jpa</groupId>
- <artifactId>org.apache.aries.jpa.eclipselink.adapter</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
<!-- Openjpa -->
<!-- Aries jndi is only needed for openjpa -->
<dependency>
@@ -313,21 +289,11 @@
<!-- JTA 1.2 -->
<dependency>
- <groupId>javax.interceptor</groupId>
- <artifactId>javax.interceptor-api</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.javax-inject</artifactId>
<version>1_2</version>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>javax.el-api</artifactId>
- <version>3.0.0</version>
- </dependency>
- <dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<version>1.2</version>
@@ -366,10 +332,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.jdbc</artifactId>
- </dependency>
- <dependency>
<groupId>org.ops4j.pax.jdbc</groupId>
<artifactId>pax-jdbc-derby</artifactId>
<version>${paxjdbc.version}</version>
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/f0774929/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index 43176ef..cffe121 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -36,9 +36,8 @@
<properties>
<paxlogging.version>1.7.3</paxlogging.version>
<exam.version>4.9.1</exam.version>
- <url.version>1.6.0</url.version>
+ <url.version>2.5.2</url.version>
<hibernate42.version>4.2.15.Final</hibernate42.version>
- <hibernate43.version>4.4.9</hibernate43.version>
<ant.bundle.version>1.8.2_2</ant.bundle.version>
<antlr.bundle.version>2.7.7_5</antlr.bundle.version>
<dom4j.bundle.version>1.6.1_5</dom4j.bundle.version>
[16/50] aries-jpa git commit: [ARIES-1615] Handle PreparedStatement
to avoid NPE
Posted by cs...@apache.org.
[ARIES-1615] Handle PreparedStatement to avoid NPE
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1766695 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/b88bc890
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/b88bc890
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/b88bc890
Branch: refs/heads/master
Commit: b88bc890441decd52c759c8523189e97616ae116
Parents: 508754d
Author: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Wed Oct 26 16:11:47 2016 +0000
Committer: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Wed Oct 26 16:11:47 2016 +0000
----------------------------------------------------------------------
.../aries/jpa/container/weaving/impl/DummyDataSource.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/b88bc890/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/DummyDataSource.java
----------------------------------------------------------------------
diff --git a/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/DummyDataSource.java b/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/DummyDataSource.java
index 6e5fa43..cac5635 100644
--- a/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/DummyDataSource.java
+++ b/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/DummyDataSource.java
@@ -24,9 +24,11 @@ import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
+import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.SQLFeatureNotSupportedException;
+import java.sql.Statement;
import javax.sql.DataSource;
@@ -62,6 +64,9 @@ public final class DummyDataSource implements DataSource {
if (type == ResultSet.class) {
return createProxy(classLoader, ResultSet.class);
}
+ if (type == Statement.class) {
+ return createProxy(classLoader, PreparedStatement.class);
+ }
return null;
}
[48/50] aries-jpa git commit: Update to pax exam 4.10.0
Posted by cs...@apache.org.
Update to pax exam 4.10.0
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1790963 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/76dd096f
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/76dd096f
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/76dd096f
Branch: refs/heads/master
Commit: 76dd096f535ddefe74d527b6d0ee9d9c0a3c0f0d
Parents: 1da6b15
Author: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Tue Apr 11 12:17:47 2017 +0000
Committer: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Tue Apr 11 12:17:47 2017 +0000
----------------------------------------------------------------------
itests/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/76dd096f/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index d177243..c27c498 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -35,7 +35,7 @@
<properties>
<paxlogging.version>1.7.3</paxlogging.version>
- <exam.version>4.9.1</exam.version>
+ <exam.version>4.10.0</exam.version>
<equinox.version>3.11.3</equinox.version>
<url.version>2.5.2</url.version>
<hibernate42.version>4.2.15.Final</hibernate42.version>
[47/50] aries-jpa git commit: Upgrade to equinox 3.11.3
Posted by cs...@apache.org.
Upgrade to equinox 3.11.3
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1790961 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/1da6b159
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/1da6b159
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/1da6b159
Branch: refs/heads/master
Commit: 1da6b159eb380e864012b3478588762ac674db20
Parents: 0968081
Author: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Tue Apr 11 12:02:40 2017 +0000
Committer: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Tue Apr 11 12:02:40 2017 +0000
----------------------------------------------------------------------
itests/jpa-container-itest/pom.xml | 4 ++--
itests/pom.xml | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1da6b159/itests/jpa-container-itest/pom.xml
----------------------------------------------------------------------
diff --git a/itests/jpa-container-itest/pom.xml b/itests/jpa-container-itest/pom.xml
index 5c25de7..317b52c 100644
--- a/itests/jpa-container-itest/pom.xml
+++ b/itests/jpa-container-itest/pom.xml
@@ -41,9 +41,9 @@
</dependency>
<dependency>
- <groupId>org.eclipse.tycho</groupId>
+ <groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
- <version>3.10.100.v20150529-1857</version>
+ <version>${equinox.version}</version>
</dependency>
<!-- <dependency> -->
<!-- <groupId>org.apache.felix</groupId> -->
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/1da6b159/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index 43b830a..d177243 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -36,6 +36,7 @@
<properties>
<paxlogging.version>1.7.3</paxlogging.version>
<exam.version>4.9.1</exam.version>
+ <equinox.version>3.11.3</equinox.version>
<url.version>2.5.2</url.version>
<hibernate42.version>4.2.15.Final</hibernate42.version>
<ant.bundle.version>1.8.2_2</ant.bundle.version>
[21/50] aries-jpa git commit: [ARIES-1497] properly handle
RollbackException
Posted by cs...@apache.org.
[ARIES-1497] properly handle RollbackException
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1777105 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/aries-jpa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jpa/commit/d5bbe7b0
Tree: http://git-wip-us.apache.org/repos/asf/aries-jpa/tree/d5bbe7b0
Diff: http://git-wip-us.apache.org/repos/asf/aries-jpa/diff/d5bbe7b0
Branch: refs/heads/master
Commit: d5bbe7b08aeefdd3472f060febf359d878a88a73
Parents: f077492
Author: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Tue Jan 3 10:21:48 2017 +0000
Committer: cschneider <cs...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Tue Jan 3 10:21:48 2017 +0000
----------------------------------------------------------------------
.../aries/jpa/support/impl/XAJpaTemplate.java | 18 +++-
.../support/xa/impl/TransactionAttribute.java | 4 +-
.../jpa/support/impl/XAJpaTemplateTest.java | 91 ++++++++++++++++++++
3 files changed, 109 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/d5bbe7b0/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/XAJpaTemplate.java
----------------------------------------------------------------------
diff --git a/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/XAJpaTemplate.java b/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/XAJpaTemplate.java
index f8f984e..e17637d 100644
--- a/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/XAJpaTemplate.java
+++ b/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/XAJpaTemplate.java
@@ -19,6 +19,7 @@
package org.apache.aries.jpa.support.impl;
import javax.persistence.EntityManager;
+import javax.transaction.RollbackException;
import javax.transaction.Status;
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
@@ -61,6 +62,9 @@ public class XAJpaTemplate extends AbstractJpaTemplate {
R result = (R)code.apply(em);
safeFinish(tranToken, ta, coord);
return result;
+ } catch (RollbackException ex) {
+ safeRollback(tranToken, ta, coord, ex);
+ throw wrapThrowable(ex, "RollbackException is propagating");
} catch (Exception ex) {
safeRollback(tranToken, ta, coord, ex);
throw wrapThrowable(ex, "Exception occured in transactional code");
@@ -76,9 +80,12 @@ public class XAJpaTemplate extends AbstractJpaTemplate {
}
}
- private void safeFinish(TransactionToken tranToken, TransactionAttribute ta, Coordination coord) {
+ private void safeFinish(TransactionToken tranToken, TransactionAttribute ta, Coordination coord) throws RollbackException {
try {
ta.finish(tm, tranToken);
+ } catch (RollbackException e) {
+ // just rethrow these as they indicate a very special case
+ throw e;
} catch (Exception e) {
// We are throwing an exception, so we don't error it out
LOGGER.debug("Exception during finish of transaction", e);
@@ -88,9 +95,11 @@ public class XAJpaTemplate extends AbstractJpaTemplate {
}
private void safeRollback(TransactionToken token, TransactionAttribute ta, Coordination coord, Throwable ex) {
+ LOGGER.warn("Beginning rollback logic due to exception", ex);
try {
Transaction tran = token.getActiveTransaction();
if (tran != null && shouldRollback(ex)) {
+ LOGGER.info("Rolling back TX due to exception", ex);
tran.setRollbackOnly();
}
} catch (Exception e) {
@@ -98,7 +107,12 @@ public class XAJpaTemplate extends AbstractJpaTemplate {
// need to log it
LOGGER.warn("Exception during transaction rollback", e);
}
- safeFinish(token, ta, coord);
+
+ try {
+ safeFinish(token, ta, coord);
+ } catch (RollbackException e) {
+ LOGGER.warn("RollbackException during safeFinish attempt for already running safeRollback", e);
+ }
}
private static boolean shouldRollback(Throwable ex) {
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/d5bbe7b0/jpa-support/src/main/java/org/apache/aries/jpa/support/xa/impl/TransactionAttribute.java
----------------------------------------------------------------------
diff --git a/jpa-support/src/main/java/org/apache/aries/jpa/support/xa/impl/TransactionAttribute.java b/jpa-support/src/main/java/org/apache/aries/jpa/support/xa/impl/TransactionAttribute.java
index cb61e5a..ceea963 100644
--- a/jpa-support/src/main/java/org/apache/aries/jpa/support/xa/impl/TransactionAttribute.java
+++ b/jpa-support/src/main/java/org/apache/aries/jpa/support/xa/impl/TransactionAttribute.java
@@ -101,7 +101,7 @@ public enum TransactionAttribute {
if (tranToken.isCompletionAllowed()) {
if (man.getStatus() == Status.STATUS_MARKED_ROLLBACK) {
man.rollback();
- } else {
+ } else if (man.getStatus() != Status.STATUS_NO_TRANSACTION) {
man.commit();
}
}
@@ -144,7 +144,7 @@ public enum TransactionAttribute {
if (tranToken.isCompletionAllowed()) {
if (man.getStatus() == Status.STATUS_MARKED_ROLLBACK) {
man.rollback();
- } else {
+ } else if (man.getStatus() != Status.STATUS_NO_TRANSACTION) {
man.commit();
}
}
http://git-wip-us.apache.org/repos/asf/aries-jpa/blob/d5bbe7b0/jpa-support/src/test/java/org/apache/aries/jpa/support/impl/XAJpaTemplateTest.java
----------------------------------------------------------------------
diff --git a/jpa-support/src/test/java/org/apache/aries/jpa/support/impl/XAJpaTemplateTest.java b/jpa-support/src/test/java/org/apache/aries/jpa/support/impl/XAJpaTemplateTest.java
new file mode 100644
index 0000000..1a9ddb5
--- /dev/null
+++ b/jpa-support/src/test/java/org/apache/aries/jpa/support/impl/XAJpaTemplateTest.java
@@ -0,0 +1,91 @@
+package org.apache.aries.jpa.support.impl;
+
+import static org.mockito.Mockito.*;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.OptimisticLockException;
+import javax.transaction.HeuristicMixedException;
+import javax.transaction.HeuristicRollbackException;
+import javax.transaction.RollbackException;
+import javax.transaction.Status;
+import javax.transaction.SystemException;
+import javax.transaction.TransactionManager;
+
+import org.apache.aries.jpa.impl.DummyCoordinator;
+import org.apache.aries.jpa.template.EmConsumer;
+import org.apache.aries.jpa.template.TransactionType;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class XAJpaTemplateTest
+{
+ private static EntityManagerFactory mockEmf() {
+ EntityManagerFactory emf = mock(EntityManagerFactory.class);
+ EntityManager em = mock(EntityManager.class);
+ when(emf.createEntityManager()).thenReturn(em);
+ return emf;
+ }
+
+ private EntityManagerFactory emf;
+ private DummyCoordinator coordinator;
+ private EMSupplierImpl emSupplier;
+
+ @Before
+ public void setup() throws IllegalStateException, SecurityException, HeuristicMixedException,
+ HeuristicRollbackException, RollbackException, SystemException {
+ this.emf = mockEmf();
+ this.coordinator = new DummyCoordinator();
+ this.emSupplier = new EMSupplierImpl("myunit", emf, coordinator);
+
+ }
+
+ @After
+ public void cleanup() {
+ this.emSupplier.close();
+ }
+
+ private TransactionManager mockTm() {
+ TransactionManager tm = mock(TransactionManager.class);
+ return tm;
+ }
+
+ @Test
+ public void test_RollbackExceptionHandling_rollbackiscalledonmarkedrollback() throws Exception {
+ TransactionManager tm = mockTm();
+ when(tm.getStatus()).thenReturn(Status.STATUS_NO_TRANSACTION,
+ Status.STATUS_MARKED_ROLLBACK);
+ XAJpaTemplate tx = new XAJpaTemplate(emSupplier, tm, coordinator);
+ tx.tx(TransactionType.Required, new EmConsumer() {
+ public void accept(EntityManager em) {
+ em.persist(new Object());
+ }
+ });
+ verify(tm, times(3)).getStatus();
+ verify(tm, never()).commit();
+ verify(tm, times(1)).rollback();
+ }
+
+ @Test
+ public void test_RollbackExceptionHandling_rollbackafterthrown()
+ throws Exception {
+ TransactionManager tm = mockTm();
+ when(tm.getStatus()).thenReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE, Status.STATUS_MARKED_ROLLBACK);
+ doThrow(new RollbackException().initCause(new OptimisticLockException())).when(tm).commit();
+ XAJpaTemplate tx = new XAJpaTemplate(emSupplier, tm, coordinator);
+ try {
+ tx.tx(TransactionType.Required, new EmConsumer() {
+ public void accept(EntityManager em) {
+ em.persist(new Object());
+ }
+ });
+ } catch (RuntimeException e) {
+ // this is ok
+ }
+ verify(tm, times(5)).getStatus();
+ verify(tm, times(1)).commit();
+ verify(tm, times(1)).rollback();
+ }
+
+}