aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject svn commit: r1697029 [1/2] - in /aries/trunk/jpa: ./ examples/ examples/tasklist-blueprint/ examples/tasklist-blueprint/src/main/java/org/apache/aries/jpa/example/tasklist/blueprint/impl/ examples/tasklist-blueprint/src/main/resources/OSGI-INF/blueprin...
Date Fri, 21 Aug 2015 17:03:27 GMT
Author: cschneider
Date: Fri Aug 21 17:03:25 2015
New Revision: 1697029

URL: http://svn.apache.org/r1697029
Log:
[ARIES-1386] Use bnd file to describe OSGi config and use bnd baselining, fix rat issues

Added:
    aries/trunk/jpa/examples/tasklist-blueprint/.gitignore
    aries/trunk/jpa/examples/tasklist-blueprint/osgi.bnd
      - copied, changed from r1697028, aries/trunk/jpa/jpa-blueprint/osgi.bnd
    aries/trunk/jpa/examples/tasklist-ds/.gitignore
    aries/trunk/jpa/examples/tasklist-ds/osgi.bnd
    aries/trunk/jpa/examples/tasklist-model/.gitignore
    aries/trunk/jpa/examples/tasklist-model/osgi.bnd
    aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/osgi.bnd
    aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/.gitignore
    aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/osgi.bnd
    aries/trunk/jpa/itests/jpa-container-testbundle/osgi.bnd
    aries/trunk/jpa/jpa-api/osgi.bnd
    aries/trunk/jpa/jpa-container-eclipselink-adapter/.gitignore
    aries/trunk/jpa/jpa-container-eclipselink-adapter/osgi.bnd
    aries/trunk/jpa/jpa-container/osgi.bnd
    aries/trunk/jpa/jpa-support/LICENSE
    aries/trunk/jpa/jpa-support/NOTICE
    aries/trunk/jpa/jpa-support/osgi.bnd
Modified:
    aries/trunk/jpa/examples/pom.xml
    aries/trunk/jpa/examples/tasklist-blueprint/pom.xml
    aries/trunk/jpa/examples/tasklist-blueprint/src/main/java/org/apache/aries/jpa/example/tasklist/blueprint/impl/TasklistServlet.java
    aries/trunk/jpa/examples/tasklist-blueprint/src/main/resources/OSGI-INF/blueprint/context.xml
    aries/trunk/jpa/examples/tasklist-blueprint/src/test/java/org/apache/aries/jpa/tasklist/blueprint/impl/TaskServiceImplTest.java
    aries/trunk/jpa/examples/tasklist-blueprint/src/test/resources/META-INF/persistence.xml
    aries/trunk/jpa/examples/tasklist-ds/pom.xml
    aries/trunk/jpa/examples/tasklist-ds/src/main/java/org/apache/aries/jpa/example/tasklist/ds/impl/TasklistServlet.java
    aries/trunk/jpa/examples/tasklist-ds/src/test/resources/META-INF/persistence.xml
    aries/trunk/jpa/examples/tasklist-model/pom.xml
    aries/trunk/jpa/examples/tasklist-model/src/main/resources/META-INF/persistence.xml
    aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/.gitignore
    aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/pom.xml
    aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/container/itest/bundle/blueprint/impl/AbstractCarServiceImpl.java
    aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/resources/OSGI-INF/blueprint/config.xml
    aries/trunk/jpa/itests/jpa-container-itest/pom.xml
    aries/trunk/jpa/itests/jpa-container-itest/src/test/resources/persistence.xml
    aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/pom.xml
    aries/trunk/jpa/itests/jpa-container-testbundle/pom.xml
    aries/trunk/jpa/itests/jpa-tck-itest/runtests
    aries/trunk/jpa/itests/pom.xml
    aries/trunk/jpa/jpa-api/pom.xml
    aries/trunk/jpa/jpa-blueprint/osgi.bnd
    aries/trunk/jpa/jpa-blueprint/pom.xml
    aries/trunk/jpa/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaAnnotatedMemberHandler.java
    aries/trunk/jpa/jpa-container-eclipselink-adapter/pom.xml
    aries/trunk/jpa/jpa-container-eclipselink-adapter/src/main/java/org/apache/aries/jpa/eclipselink/adapter/Activator.java
    aries/trunk/jpa/jpa-container-eclipselink-adapter/src/main/java/org/apache/aries/jpa/eclipselink/adapter/EclipseLinkProviderService.java
    aries/trunk/jpa/jpa-container/pom.xml
    aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/DummyDataSource.java
    aries/trunk/jpa/jpa-features/pom.xml
    aries/trunk/jpa/jpa-parent/pom.xml
    aries/trunk/jpa/jpa-support/pom.xml
    aries/trunk/jpa/pom.xml

Modified: aries/trunk/jpa/examples/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/pom.xml?rev=1697029&r1=1697028&r2=1697029&view=diff
==============================================================================
--- aries/trunk/jpa/examples/pom.xml (original)
+++ aries/trunk/jpa/examples/pom.xml Fri Aug 21 17:03:25 2015
@@ -1,4 +1,22 @@
 <?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>

Added: aries/trunk/jpa/examples/tasklist-blueprint/.gitignore
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-blueprint/.gitignore?rev=1697029&view=auto
==============================================================================
--- aries/trunk/jpa/examples/tasklist-blueprint/.gitignore (added)
+++ aries/trunk/jpa/examples/tasklist-blueprint/.gitignore Fri Aug 21 17:03:25 2015
@@ -0,0 +1 @@
+/target/

Copied: aries/trunk/jpa/examples/tasklist-blueprint/osgi.bnd (from r1697028, aries/trunk/jpa/jpa-blueprint/osgi.bnd)
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-blueprint/osgi.bnd?p2=aries/trunk/jpa/examples/tasklist-blueprint/osgi.bnd&p1=aries/trunk/jpa/jpa-blueprint/osgi.bnd&r1=1697028&r2=1697029&rev=1697029&view=diff
==============================================================================
    (empty)

Modified: aries/trunk/jpa/examples/tasklist-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-blueprint/pom.xml?rev=1697029&r1=1697028&r2=1697029&view=diff
==============================================================================
--- aries/trunk/jpa/examples/tasklist-blueprint/pom.xml (original)
+++ aries/trunk/jpa/examples/tasklist-blueprint/pom.xml Fri Aug 21 17:03:25 2015
@@ -1,3 +1,22 @@
+<?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>
@@ -12,8 +31,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.hibernate.javax.persistence</groupId>
-            <artifactId>hibernate-jpa-2.1-api</artifactId>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>javax.persistence</artifactId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
@@ -70,18 +89,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.5.4</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>
\ No newline at end of file

Modified: aries/trunk/jpa/examples/tasklist-blueprint/src/main/java/org/apache/aries/jpa/example/tasklist/blueprint/impl/TasklistServlet.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-blueprint/src/main/java/org/apache/aries/jpa/example/tasklist/blueprint/impl/TasklistServlet.java?rev=1697029&r1=1697028&r2=1697029&view=diff
==============================================================================
--- aries/trunk/jpa/examples/tasklist-blueprint/src/main/java/org/apache/aries/jpa/example/tasklist/blueprint/impl/TasklistServlet.java (original)
+++ aries/trunk/jpa/examples/tasklist-blueprint/src/main/java/org/apache/aries/jpa/example/tasklist/blueprint/impl/TasklistServlet.java Fri Aug 21 17:03:25 2015
@@ -1,3 +1,21 @@
+/*
+ * 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.blueprint.impl;
 
 import java.io.IOException;

Modified: aries/trunk/jpa/examples/tasklist-blueprint/src/main/resources/OSGI-INF/blueprint/context.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-blueprint/src/main/resources/OSGI-INF/blueprint/context.xml?rev=1697029&r1=1697028&r2=1697029&view=diff
==============================================================================
--- aries/trunk/jpa/examples/tasklist-blueprint/src/main/resources/OSGI-INF/blueprint/context.xml (original)
+++ aries/trunk/jpa/examples/tasklist-blueprint/src/main/resources/OSGI-INF/blueprint/context.xml Fri Aug 21 17:03:25 2015
@@ -1,14 +1,22 @@
 <?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. -->
+<!--
+
+    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.
+
+-->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
 	xmlns:jpa="http://aries.apache.org/xmlns/jpan/v1.0.0"
 	xmlns:tx="http://aries.apache.org/xmlns/transactions/v1.2.0"

Modified: aries/trunk/jpa/examples/tasklist-blueprint/src/test/java/org/apache/aries/jpa/tasklist/blueprint/impl/TaskServiceImplTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-blueprint/src/test/java/org/apache/aries/jpa/tasklist/blueprint/impl/TaskServiceImplTest.java?rev=1697029&r1=1697028&r2=1697029&view=diff
==============================================================================
--- aries/trunk/jpa/examples/tasklist-blueprint/src/test/java/org/apache/aries/jpa/tasklist/blueprint/impl/TaskServiceImplTest.java (original)
+++ aries/trunk/jpa/examples/tasklist-blueprint/src/test/java/org/apache/aries/jpa/tasklist/blueprint/impl/TaskServiceImplTest.java Fri Aug 21 17:03:25 2015
@@ -56,7 +56,7 @@ public class TaskServiceImplTest {
     private EntityManagerFactory createTestEMF() {
         Map<String, String> properties = new HashMap<>();
         properties.put("javax.persistence.jdbc.driver", "org.apache.derby.jdbc.EmbeddedDriver");
-        properties.put("javax.persistence.jdbc.url", "jdbc:derby:target/test;create=true");
+        properties.put("javax.persistence.jdbc.url", "jdbc:derby:memory:TEST;create=true");
         EntityManagerFactory emf = Persistence.createEntityManagerFactory("tasklist", properties);
         return emf;
     }

Modified: aries/trunk/jpa/examples/tasklist-blueprint/src/test/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-blueprint/src/test/resources/META-INF/persistence.xml?rev=1697029&r1=1697028&r2=1697029&view=diff
==============================================================================
--- aries/trunk/jpa/examples/tasklist-blueprint/src/test/resources/META-INF/persistence.xml (original)
+++ aries/trunk/jpa/examples/tasklist-blueprint/src/test/resources/META-INF/persistence.xml Fri Aug 21 17:03:25 2015
@@ -1,4 +1,22 @@
 <?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">

Added: aries/trunk/jpa/examples/tasklist-ds/.gitignore
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-ds/.gitignore?rev=1697029&view=auto
==============================================================================
--- aries/trunk/jpa/examples/tasklist-ds/.gitignore (added)
+++ aries/trunk/jpa/examples/tasklist-ds/.gitignore Fri Aug 21 17:03:25 2015
@@ -0,0 +1 @@
+/target/

Added: aries/trunk/jpa/examples/tasklist-ds/osgi.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-ds/osgi.bnd?rev=1697029&view=auto
==============================================================================
--- aries/trunk/jpa/examples/tasklist-ds/osgi.bnd (added)
+++ aries/trunk/jpa/examples/tasklist-ds/osgi.bnd Fri Aug 21 17:03:25 2015
@@ -0,0 +1 @@
+_dsannotations: *

Modified: aries/trunk/jpa/examples/tasklist-ds/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-ds/pom.xml?rev=1697029&r1=1697028&r2=1697029&view=diff
==============================================================================
--- aries/trunk/jpa/examples/tasklist-ds/pom.xml (original)
+++ aries/trunk/jpa/examples/tasklist-ds/pom.xml Fri Aug 21 17:03:25 2015
@@ -1,3 +1,22 @@
+<?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>
 
@@ -13,8 +32,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.hibernate.javax.persistence</groupId>
-            <artifactId>hibernate-jpa-2.1-api</artifactId>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>javax.persistence</artifactId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
@@ -71,20 +90,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.5.4</version>
-                <extensions>true</extensions>
-                <inherited>true</inherited>
-                <configuration>
-                    <instructions>
-                        <_dsannotations>*</_dsannotations>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

Modified: aries/trunk/jpa/examples/tasklist-ds/src/main/java/org/apache/aries/jpa/example/tasklist/ds/impl/TasklistServlet.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-ds/src/main/java/org/apache/aries/jpa/example/tasklist/ds/impl/TasklistServlet.java?rev=1697029&r1=1697028&r2=1697029&view=diff
==============================================================================
--- aries/trunk/jpa/examples/tasklist-ds/src/main/java/org/apache/aries/jpa/example/tasklist/ds/impl/TasklistServlet.java (original)
+++ aries/trunk/jpa/examples/tasklist-ds/src/main/java/org/apache/aries/jpa/example/tasklist/ds/impl/TasklistServlet.java Fri Aug 21 17:03:25 2015
@@ -1,3 +1,21 @@
+/*
+ * 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.ds.impl;
 
 import java.io.IOException;

Modified: aries/trunk/jpa/examples/tasklist-ds/src/test/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-ds/src/test/resources/META-INF/persistence.xml?rev=1697029&r1=1697028&r2=1697029&view=diff
==============================================================================
--- aries/trunk/jpa/examples/tasklist-ds/src/test/resources/META-INF/persistence.xml (original)
+++ aries/trunk/jpa/examples/tasklist-ds/src/test/resources/META-INF/persistence.xml Fri Aug 21 17:03:25 2015
@@ -1,4 +1,22 @@
 <?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">

Added: aries/trunk/jpa/examples/tasklist-model/.gitignore
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-model/.gitignore?rev=1697029&view=auto
==============================================================================
--- aries/trunk/jpa/examples/tasklist-model/.gitignore (added)
+++ aries/trunk/jpa/examples/tasklist-model/.gitignore Fri Aug 21 17:03:25 2015
@@ -0,0 +1 @@
+/target/

Added: aries/trunk/jpa/examples/tasklist-model/osgi.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-model/osgi.bnd?rev=1697029&view=auto
==============================================================================
--- aries/trunk/jpa/examples/tasklist-model/osgi.bnd (added)
+++ aries/trunk/jpa/examples/tasklist-model/osgi.bnd Fri Aug 21 17:03:25 2015
@@ -0,0 +1,5 @@
+Meta-Persistence: \
+    META-INF/persistence.xml
+Dynamic-Import-Package: \
+    org.hibernate.proxy, \
+    javassist.util.proxy

Modified: aries/trunk/jpa/examples/tasklist-model/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-model/pom.xml?rev=1697029&r1=1697028&r2=1697029&view=diff
==============================================================================
--- aries/trunk/jpa/examples/tasklist-model/pom.xml (original)
+++ aries/trunk/jpa/examples/tasklist-model/pom.xml Fri Aug 21 17:03:25 2015
@@ -1,4 +1,22 @@
 <?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>
@@ -16,27 +34,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.hibernate.javax.persistence</groupId>
-            <artifactId>hibernate-jpa-2.1-api</artifactId>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>javax.persistence</artifactId>
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.5.4</version>
-                <extensions>true</extensions>
-                <inherited>true</inherited>
-                <configuration>
-                    <instructions>
-                        <Meta-Persistence>META-INF/persistence.xml</Meta-Persistence>
-                        <!-- Needed for runtime enhancement when using hibernate -->
-                        <Dynamic-Import-Package>*, org.hibernate.proxy, javassist.util.proxy</Dynamic-Import-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

Modified: aries/trunk/jpa/examples/tasklist-model/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-model/src/main/resources/META-INF/persistence.xml?rev=1697029&r1=1697028&r2=1697029&view=diff
==============================================================================
--- aries/trunk/jpa/examples/tasklist-model/src/main/resources/META-INF/persistence.xml (original)
+++ aries/trunk/jpa/examples/tasklist-model/src/main/resources/META-INF/persistence.xml Fri Aug 21 17:03:25 2015
@@ -1,4 +1,22 @@
 <?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">

Modified: aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/.gitignore
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/.gitignore?rev=1697029&r1=1697028&r2=1697029&view=diff
==============================================================================
--- aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/.gitignore (original)
+++ aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/.gitignore Fri Aug 21 17:03:25 2015
@@ -1 +1,2 @@
 /target
+/target/

Added: aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/osgi.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/osgi.bnd?rev=1697029&view=auto
==============================================================================
--- aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/osgi.bnd (added)
+++ aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/osgi.bnd Fri Aug 21 17:03:25 2015
@@ -0,0 +1,5 @@
+Import-Package: \
+    javax.persistence;version="[1.1,3)", \
+    javax.persistence.spi;version="[1.1,3)", \
+    *
+    
\ No newline at end of file

Modified: aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/pom.xml?rev=1697029&r1=1697028&r2=1697029&view=diff
==============================================================================
--- aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/pom.xml (original)
+++ aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/pom.xml Fri Aug 21 17:03:25 2015
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
@@ -13,6 +31,8 @@
     <artifactId>org.apache.aries.jpa.container.itest.bundle.blueprint</artifactId>
     <packaging>bundle</packaging>
     <name>Apache Aries JPA test bundle blueprint integration</name>
+    <description>Testing blueprint integration with EntityManager, EntityManagerFactory and EmSupplier injection.
+Also testing declarative transactions</description>
 
     <dependencies>
         <dependency>
@@ -26,9 +46,9 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.hibernate.javax.persistence</groupId>
-            <artifactId>hibernate-jpa-2.0-api</artifactId>
-            <version>1.0.1.Final</version>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.jpa</groupId>
@@ -42,20 +62,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <description>Testing blueprint integration with EntityManager, EntityManagerFactory and EmSupplier injection.
-Also testing declarative transactions</description>
 </project>

Modified: aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/container/itest/bundle/blueprint/impl/AbstractCarServiceImpl.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/container/itest/bundle/blueprint/impl/AbstractCarServiceImpl.java?rev=1697029&r1=1697028&r2=1697029&view=diff
==============================================================================
--- aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/container/itest/bundle/blueprint/impl/AbstractCarServiceImpl.java (original)
+++ aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/container/itest/bundle/blueprint/impl/AbstractCarServiceImpl.java Fri Aug 21 17:03:25 2015
@@ -1,3 +1,18 @@
+/*  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.container.itest.bundle.blueprint.impl;
 
 import javax.persistence.EntityManager;

Modified: aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/resources/OSGI-INF/blueprint/config.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/resources/OSGI-INF/blueprint/config.xml?rev=1697029&r1=1697028&r2=1697029&view=diff
==============================================================================
--- aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/resources/OSGI-INF/blueprint/config.xml (original)
+++ aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/resources/OSGI-INF/blueprint/config.xml Fri Aug 21 17:03:25 2015
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ 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.
+-->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
     xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0"
     xmlns:jpa="http://aries.apache.org/xmlns/jpan/v1.0.0"

Modified: aries/trunk/jpa/itests/jpa-container-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-itest/pom.xml?rev=1697029&r1=1697028&r2=1697029&view=diff
==============================================================================
--- aries/trunk/jpa/itests/jpa-container-itest/pom.xml (original)
+++ aries/trunk/jpa/itests/jpa-container-itest/pom.xml Fri Aug 21 17:03:25 2015
@@ -34,24 +34,24 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.eclipse</groupId>
+            <groupId>org.eclipse.tycho</groupId>
             <artifactId>org.eclipse.osgi</artifactId>
-            <version>3.8.0.v20120529-1548</version>
+            <version>3.10.100.v20150529-1857</version>
         </dependency>
+<!--         <dependency> -->
+<!--             <groupId>org.apache.felix</groupId> -->
+<!--             <artifactId>org.apache.felix.framework</artifactId> -->
+<!--             <version>5.0.1</version> -->
+<!--         </dependency> -->
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.enterprise</artifactId>
-            <version>5.0.0</version>
-        </dependency>
+
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.coordinator</artifactId>
-            <version>1.0.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -93,13 +93,6 @@
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.core</artifactId>
-            <version>1.4.3</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_2.0_spec</artifactId>
-            <version>1.1</version>
             <scope>test</scope>
         </dependency>
         
@@ -128,7 +121,27 @@
             <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>
+            <groupId>org.apache.aries.jndi</groupId>
+            <artifactId>org.apache.aries.jndi.api</artifactId>
+            <version>1.0.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.jndi</groupId>
+            <artifactId>org.apache.aries.jndi.core</artifactId>
+            <version>1.0.0</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.5_spec</artifactId>
@@ -155,7 +168,6 @@
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>javax.persistence</artifactId>
-            <version>2.1.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -292,6 +304,12 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.aries.jpa</groupId>
+            <artifactId>org.apache.aries.jpa.container.itest.bundle.eclipselink</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
 
         <!--  JTA 1.2 -->
         <dependency>
@@ -320,10 +338,11 @@
             <version>1.2</version>
         </dependency>
 
+        <!--  Aries Transaction -->
         <dependency>
             <groupId>org.apache.aries.transaction</groupId>
             <artifactId>org.apache.aries.transaction.manager</artifactId>
-            <version>1.3.1-SNAPSHOT</version>
+            <version>1.3.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -332,30 +351,8 @@
             <version>1.1.1</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.aries.jndi</groupId>
-            <artifactId>org.apache.aries.jndi.api</artifactId>
-            <version>1.0.0</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.jndi</groupId>
-            <artifactId>org.apache.aries.jndi.core</artifactId>
-            <version>1.0.0</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>
-        <dependency>
-            <groupId>org.apache.aries.jpa</groupId>
-            <artifactId>org.apache.aries.jpa.container.itest.bundle.eclipselink</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
+
+
         <dependency>
             <groupId>org.apache.aries.jndi</groupId>
             <artifactId>org.apache.aries.jndi.url</artifactId>
@@ -399,10 +396,6 @@
 
         <!-- pax exam -->
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam</artifactId>
             <version>${exam.version}</version>
@@ -443,11 +436,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

Modified: aries/trunk/jpa/itests/jpa-container-itest/src/test/resources/persistence.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-itest/src/test/resources/persistence.xml?rev=1697029&r1=1697028&r2=1697029&view=diff
==============================================================================
--- aries/trunk/jpa/itests/jpa-container-itest/src/test/resources/persistence.xml (original)
+++ aries/trunk/jpa/itests/jpa-container-itest/src/test/resources/persistence.xml Fri Aug 21 17:03:25 2015
@@ -1,4 +1,22 @@
 <?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 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_1_0.xsd"

Added: aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/.gitignore
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/.gitignore?rev=1697029&view=auto
==============================================================================
--- aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/.gitignore (added)
+++ aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/.gitignore Fri Aug 21 17:03:25 2015
@@ -0,0 +1 @@
+/target/

Added: aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/osgi.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/osgi.bnd?rev=1697029&view=auto
==============================================================================
--- aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/osgi.bnd (added)
+++ aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/osgi.bnd Fri Aug 21 17:03:25 2015
@@ -0,0 +1,5 @@
+Import-Package: \
+    javax.persistence;version="[1.1,3)", \
+    javax.persistence.spi;version="[1.1,3)", \
+    *
+Meta-Persistence: META-INF/persistence.xml

Modified: aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/pom.xml?rev=1697029&r1=1697028&r2=1697029&view=diff
==============================================================================
--- aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/pom.xml (original)
+++ aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/pom.xml Fri Aug 21 17:03:25 2015
@@ -32,21 +32,7 @@
     <artifactId>org.apache.aries.jpa.container.itest.bundle.eclipselink</artifactId>
     <packaging>bundle</packaging>
     <name>Apache Aries JPA test bundle Eclipselink</name>
-
-    <properties>
-        <!-- Export package versions are maintained in packageinfo files -->
-        <aries.osgi.export.pkg>
-            org.apache.aries.jpa.container.itest*
-        </aries.osgi.export.pkg>
-        <aries.osgi.import>
-            javax.persistence*;version="[1.1,3.0)",
-            *
-        </aries.osgi.import>
-        <aries.osgi.private.pkg />
-        <aries.osgi.symbolic.name>${project.artifactId}</aries.osgi.symbolic.name>
-        <!-- Only test bundle -->
-        <aries.skip.version.check>true</aries.skip.version.check>
-    </properties>
+    <description>For testing static weaving and scripts for database setup with EclipseLink</description>
 
     <dependencies>
         <dependency>
@@ -57,22 +43,12 @@
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>javax.persistence</artifactId>
-            <version>2.1.0</version>
         </dependency>
     </dependencies>
 
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Meta-Persistence>META-INF/persistence.xml</Meta-Persistence>
-                    </instructions>
-                </configuration>
-            </plugin>
-            <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
@@ -93,5 +69,4 @@
         </plugins>
     </build>
 
-    <description>For testing static weaving and scripts for database setup with EclipseLink</description>
 </project>

Added: aries/trunk/jpa/itests/jpa-container-testbundle/osgi.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-testbundle/osgi.bnd?rev=1697029&view=auto
==============================================================================
--- aries/trunk/jpa/itests/jpa-container-testbundle/osgi.bnd (added)
+++ aries/trunk/jpa/itests/jpa-container-testbundle/osgi.bnd Fri Aug 21 17:03:25 2015
@@ -0,0 +1,11 @@
+Import-Package: \
+    org.hibernate.proxy;resolution:=optional, \
+    javassist.util.proxy;resolution:=optional, \
+    javax.persistence;version="[1.1,3)", \
+    javax.persistence.spi;version="[1.1,3)", \
+    *
+DynamicImport-Package: \
+    org.hibernate.proxy, \
+    javassist.util.proxy
+Meta-Persistence: \
+    META-INF/persistence.xml

Modified: aries/trunk/jpa/itests/jpa-container-testbundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-testbundle/pom.xml?rev=1697029&r1=1697028&r2=1697029&view=diff
==============================================================================
--- aries/trunk/jpa/itests/jpa-container-testbundle/pom.xml (original)
+++ aries/trunk/jpa/itests/jpa-container-testbundle/pom.xml Fri Aug 21 17:03:25 2015
@@ -33,50 +33,13 @@
     <packaging>bundle</packaging>
     <name>Apache Aries JPA test bundle container</name>
 
-    <properties>
-        <!-- As this is only a test bundle we skip the check -->
-        <aries.skip.version.check>true</aries.skip.version.check>
-    
-        <!-- Export package versions are maintained in packageinfo files -->
-        <aries.osgi.export.pkg>
-            org.apache.aries.jpa.container.itest.entities
-        </aries.osgi.export.pkg>
-        <aries.osgi.import>
-            javax.persistence;version="[1.0.0,3.0.0)",
-            org.hibernate.proxy;resolution:=optional,
-            javassist.util.proxy;resolution:=optional,
-            *
-        </aries.osgi.import>
-        <aries.osgi.private.pkg />
-        <aries.osgi.symbolic.name>${project.groupId}.${project.artifactId}</aries.osgi.symbolic.name>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jpa_2.0_spec</artifactId>
-            <version>1.1</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <!-- Dynamic import to for hibernate enhancement 
-                            to make sure it also works in eclipselink -->
-                        <DynamicImport-Package>org.hibernate.proxy,
-                            javassist.util.proxy</DynamicImport-Package>
-                        <Meta-Persistence>META-INF/persistence.xml</Meta-Persistence>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
     <description>For simple tests with DataSource, DataSourceFactory</description>
 </project>

Modified: aries/trunk/jpa/itests/jpa-tck-itest/runtests
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-tck-itest/runtests?rev=1697029&r1=1697028&r2=1697029&view=diff
==============================================================================
--- aries/trunk/jpa/itests/jpa-tck-itest/runtests (original)
+++ aries/trunk/jpa/itests/jpa-tck-itest/runtests Fri Aug 21 17:03:25 2015
@@ -1,3 +1,20 @@
+# 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.
+
 cp org.osgi.test.cases.jpa.bnd target
 cd target
 java -jar lib/bnd-2.4.0.jar runtests --title osgi.ct

Modified: aries/trunk/jpa/itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/pom.xml?rev=1697029&r1=1697028&r2=1697029&view=diff
==============================================================================
--- aries/trunk/jpa/itests/pom.xml (original)
+++ aries/trunk/jpa/itests/pom.xml Fri Aug 21 17:03:25 2015
@@ -1,4 +1,22 @@
 <?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>
@@ -16,8 +34,7 @@
     </parent>
     
     <properties>
-        <aries.skip.version.check>true</aries.skip.version.check>
-	<paxlogging.version>1.7.3</paxlogging.version>
+        <paxlogging.version>1.7.3</paxlogging.version>
         <exam.version>4.5.0</exam.version>
         <url.version>1.6.0</url.version>
         <hibernate42.version>4.2.15.Final</hibernate42.version>

Added: aries/trunk/jpa/jpa-api/osgi.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-api/osgi.bnd?rev=1697029&view=auto
==============================================================================
--- aries/trunk/jpa/jpa-api/osgi.bnd (added)
+++ aries/trunk/jpa/jpa-api/osgi.bnd Fri Aug 21 17:03:25 2015
@@ -0,0 +1,4 @@
+Import-Package: \
+    javax.persistence;version="[1.1,3)", \
+    javax.persistence.spi;version="[1.1,3)", \
+    *

Modified: aries/trunk/jpa/jpa-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-api/pom.xml?rev=1697029&r1=1697028&r2=1697029&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-api/pom.xml (original)
+++ aries/trunk/jpa/jpa-api/pom.xml Fri Aug 21 17:03:25 2015
@@ -32,16 +32,6 @@
     <packaging>bundle</packaging>
     <name>Apache Aries JPA Container API</name>
 
-    <properties>
-        <!-- Export package versions are maintained in packageinfo files -->
-        <aries.osgi.export.pkg>
-            org.apache.aries.jpa.supplier,
-            org.apache.aries.jpa.template
-        </aries.osgi.export.pkg>
-        <aries.osgi.private.pkg />
-        <lastReleaseVersion>1.0.0</lastReleaseVersion>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>
@@ -49,28 +39,10 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.hibernate.javax.persistence</groupId>
-            <artifactId>hibernate-jpa-2.0-api</artifactId>
-            <version>1.0.1.Final</version>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.aries.versioning</groupId>
-                <artifactId>org.apache.aries.versioning.plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>default-verify</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>version-check</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>

Modified: aries/trunk/jpa/jpa-blueprint/osgi.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-blueprint/osgi.bnd?rev=1697029&r1=1697028&r2=1697029&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-blueprint/osgi.bnd (original)
+++ aries/trunk/jpa/jpa-blueprint/osgi.bnd Fri Aug 21 17:03:25 2015
@@ -0,0 +1,5 @@
+Import-Package: \
+    javax.persistence;version="[1.1,3)", \
+    javax.persistence.spi;version="[1.1,3)", \
+    *
+Bundle-Activator: org.apache.aries.jpa.blueprint.impl.Activator

Modified: aries/trunk/jpa/jpa-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-blueprint/pom.xml?rev=1697029&r1=1697028&r2=1697029&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-blueprint/pom.xml (original)
+++ aries/trunk/jpa/jpa-blueprint/pom.xml Fri Aug 21 17:03:25 2015
@@ -1,3 +1,22 @@
+<?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>
@@ -8,12 +27,9 @@
     </parent>
     <artifactId>org.apache.aries.jpa.blueprint</artifactId>
     <name>Apache Aries JPA blueprint</name>
+    <description>Blueprint integration for injecting EntityManager, EntityManagerFactory and EmSupplier.</description>
     <packaging>bundle</packaging>
-    
-    <properties>
-        <aries.skip.version.check>true</aries.skip.version.check>
-    </properties>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.apache.aries.jpa</groupId>
@@ -21,9 +37,9 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.hibernate.javax.persistence</groupId>
-            <artifactId>hibernate-jpa-2.0-api</artifactId>
-            <version>1.0.1.Final</version>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -50,11 +66,10 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-Activator>org.apache.aries.jpa.blueprint.impl.Activator</Bundle-Activator>
+                        <Bundle-Activator>${classes;IMPLEMENTS;org.osgi.framework.BundleActivator}</Bundle-Activator>
                     </instructions>
                 </configuration>
             </plugin>
         </plugins>
     </build>
-    <description>Blueprint integration for injecting EntityManager, EntityManagerFactory and EmSupplier.</description>
 </project>

Modified: aries/trunk/jpa/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaAnnotatedMemberHandler.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaAnnotatedMemberHandler.java?rev=1697029&r1=1697028&r2=1697029&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaAnnotatedMemberHandler.java (original)
+++ aries/trunk/jpa/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaAnnotatedMemberHandler.java Fri Aug 21 17:03:25 2015
@@ -1,3 +1,21 @@
+/**
+ * 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.blueprint.impl;
 
 import java.lang.reflect.AccessibleObject;

Added: aries/trunk/jpa/jpa-container-eclipselink-adapter/.gitignore
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-eclipselink-adapter/.gitignore?rev=1697029&view=auto
==============================================================================
--- aries/trunk/jpa/jpa-container-eclipselink-adapter/.gitignore (added)
+++ aries/trunk/jpa/jpa-container-eclipselink-adapter/.gitignore Fri Aug 21 17:03:25 2015
@@ -0,0 +1 @@
+/target/

Added: aries/trunk/jpa/jpa-container-eclipselink-adapter/osgi.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-eclipselink-adapter/osgi.bnd?rev=1697029&view=auto
==============================================================================
--- aries/trunk/jpa/jpa-container-eclipselink-adapter/osgi.bnd (added)
+++ aries/trunk/jpa/jpa-container-eclipselink-adapter/osgi.bnd Fri Aug 21 17:03:25 2015
@@ -0,0 +1,2 @@
+Export-Package: !*
+Bundle-Activator: org.apache.aries.jpa.eclipselink.adapter.Activator

Modified: aries/trunk/jpa/jpa-container-eclipselink-adapter/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-eclipselink-adapter/pom.xml?rev=1697029&r1=1697028&r2=1697029&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-eclipselink-adapter/pom.xml (original)
+++ aries/trunk/jpa/jpa-container-eclipselink-adapter/pom.xml Fri Aug 21 17:03:25 2015
@@ -33,33 +33,6 @@
     <packaging>bundle</packaging>
     <name>Apache Aries JPA Container adapter for EclipseLink</name>
 
-    <properties>
-        <aries.osgi.export.pkg>
-        	org.apache.aries.jpa.eclipselink.adapter,
-        	org.apache.aries.jpa.eclipselink.adapter.platform
-        </aries.osgi.export.pkg>
-        <aries.osgi.import.pkg>
-			javax.persistence*;version="[2.1,3.0)",
-			org.eclipse.persistence.jpa;resolution:=optional,
-			org.eclipse.persistence.internal.weaving;resolution:=optional,
-			org.eclipse.persistence.internal.descriptors;resolution:=optional,
-			org.eclipse.persistence.queries;resolution:=optional,
-			org.eclipse.persistence.descriptors.changetracking;resolution:=optional,
-			org.eclipse.persistence.internal.identitymaps;resolution:=optional,
-			org.eclipse.persistence.sessions;resolution:=optional,
-			org.eclipse.persistence.internal.jpa.rs.metadata.model;resolution:=optional,
-			org.eclipse.persistence.indirection;resolution:=optional,
-			org.eclipse.persistence.jpa.jpql;resolution:=optional,
-			org.eclipse.persistence.jpa.jpql.parser;resolution:=optional,
-			org.eclipse.persistence.platform.server;resolution:=optional,
-            *
-        </aries.osgi.import.pkg>
-        <aries.osgi.failok>true</aries.osgi.failok>
-        <aries.osgi.activator>org.apache.aries.jpa.eclipselink.adapter.Activator</aries.osgi.activator>
-        <!-- First version -->
-        <aries.skip.version.check>true</aries.skip.version.check>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>
@@ -72,19 +45,12 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>javax.persistence</artifactId>
-            <version>2.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jta_1.1_spec</artifactId>
-            <version>1.1.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -98,23 +64,5 @@
             <version>2.5.2</version>
         </dependency>
     </dependencies>
-  
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.aries.versioning</groupId>
-                <artifactId>org.apache.aries.versioning.plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>default-verify</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>version-check</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 
 </project>

Modified: aries/trunk/jpa/jpa-container-eclipselink-adapter/src/main/java/org/apache/aries/jpa/eclipselink/adapter/Activator.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-eclipselink-adapter/src/main/java/org/apache/aries/jpa/eclipselink/adapter/Activator.java?rev=1697029&r1=1697028&r2=1697029&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-eclipselink-adapter/src/main/java/org/apache/aries/jpa/eclipselink/adapter/Activator.java (original)
+++ aries/trunk/jpa/jpa-container-eclipselink-adapter/src/main/java/org/apache/aries/jpa/eclipselink/adapter/Activator.java Fri Aug 21 17:03:25 2015
@@ -32,6 +32,7 @@ import org.osgi.framework.wiring.BundleW
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Dictionary;
 import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.List;
@@ -109,16 +110,16 @@ public class Activator implements Bundle
             if (!!!registeredProviders.containsKey(b)) {
                 logger.debug("Adding new EclipseLink provider for bundle {}", b);
                 
-                ServiceFactory<?> factory = new EclipseLinkProviderService(b);
+                ServiceFactory<PersistenceProvider> factory = new EclipseLinkProviderService(b);
                 
-                Hashtable<String, Object> props = new Hashtable<String, Object>();
+                Dictionary<String, Object> props = new Hashtable<String, Object>();
                 props.put("org.apache.aries.jpa.container.weaving.packages", getJPAPackages(b));
                 props.put("javax.persistence.provider", ECLIPSELINK_JPA_PROVIDER_CLASS_NAME);
                             
-                ServiceRegistration reg = context.registerService(
+                ServiceRegistration<?> reg = context.registerService(
                         PersistenceProvider.class.getName(), factory, props);
                 
-                ServiceRegistration old = registeredProviders.putIfAbsent(b, reg);
+                ServiceRegistration<?> old = registeredProviders.putIfAbsent(b, reg);
                 if (old != null) {
                     reg.unregister();
                 }

Modified: aries/trunk/jpa/jpa-container-eclipselink-adapter/src/main/java/org/apache/aries/jpa/eclipselink/adapter/EclipseLinkProviderService.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-eclipselink-adapter/src/main/java/org/apache/aries/jpa/eclipselink/adapter/EclipseLinkProviderService.java?rev=1697029&r1=1697028&r2=1697029&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-eclipselink-adapter/src/main/java/org/apache/aries/jpa/eclipselink/adapter/EclipseLinkProviderService.java (original)
+++ aries/trunk/jpa/jpa-container-eclipselink-adapter/src/main/java/org/apache/aries/jpa/eclipselink/adapter/EclipseLinkProviderService.java Fri Aug 21 17:03:25 2015
@@ -38,7 +38,7 @@ import javax.persistence.spi.ProviderUti
  * we can go in at entity manager creation time and set the eclipselink target-server to be {@link OSGiTSServer}.
  */
 @SuppressWarnings({"rawtypes", "unchecked"})
-public class EclipseLinkProviderService implements ServiceFactory {
+public class EclipseLinkProviderService implements ServiceFactory<PersistenceProvider> {
   private static final Logger logger = LoggerFactory.getLogger(Activator.class);
   
   private final Bundle eclipseLinkJpaBundle;
@@ -48,7 +48,7 @@ public class EclipseLinkProviderService
   }
   
   @Override
-  public Object getService(Bundle bundle, ServiceRegistration registration) {
+  public PersistenceProvider getService(Bundle bundle, ServiceRegistration registration) {
     logger.debug("Requested EclipseLink Provider service");
     
     try {
@@ -88,5 +88,5 @@ public class EclipseLinkProviderService
     }
   }
 
-  public void ungetService(Bundle bundle, ServiceRegistration registration, Object service) {}
+  public void ungetService(Bundle bundle, ServiceRegistration registration, PersistenceProvider service) {}
 }
\ No newline at end of file

Added: aries/trunk/jpa/jpa-container/osgi.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/osgi.bnd?rev=1697029&view=auto
==============================================================================
--- aries/trunk/jpa/jpa-container/osgi.bnd (added)
+++ aries/trunk/jpa/jpa-container/osgi.bnd Fri Aug 21 17:03:25 2015
@@ -0,0 +1,9 @@
+Export-Package: \
+    org.osgi.service.jdbc, \
+    org.osgi.service.jpa
+Import-Package: \
+    javax.persistence;version="[1.1,3)", \
+    javax.persistence.spi;version="[1.1,3)", \
+    *
+Bundle-Activator: org.apache.aries.jpa.container.impl.Activator
+

Modified: aries/trunk/jpa/jpa-container/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/pom.xml?rev=1697029&r1=1697028&r2=1697029&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container/pom.xml (original)
+++ aries/trunk/jpa/jpa-container/pom.xml Fri Aug 21 17:03:25 2015
@@ -30,31 +30,21 @@
     <description>Implements the OSGi JPA Container from the enterprise spec. Provider a EntityManagerFactory and EntityManagerFactoryBuilder service</description>
     <packaging>bundle</packaging>
     
-    <properties>
-        <aries.skip.version.check>true</aries.skip.version.check>
-        <aries.osgi.export>
-            org.osgi.service.jdbc,
-            org.osgi.service.jpa
-        </aries.osgi.export>
-        <aries.osgi.activator>
-            org.apache.aries.jpa.container.impl.Activator
-        </aries.osgi.activator>
-    </properties>
-    
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.hibernate.javax.persistence</groupId>
-            <artifactId>hibernate-jpa-2.0-api</artifactId>
-            <version>1.0.1.Final</version>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
-
 </project>
\ No newline at end of file

Modified: aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/DummyDataSource.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/DummyDataSource.java?rev=1697029&r1=1697028&r2=1697029&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/DummyDataSource.java (original)
+++ aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/DummyDataSource.java Fri Aug 21 17:03:25 2015
@@ -1,3 +1,21 @@
+/*
+ * 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.container.weaving.impl;
 
 import java.io.PrintWriter;

Modified: aries/trunk/jpa/jpa-features/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-features/pom.xml?rev=1697029&r1=1697028&r2=1697029&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-features/pom.xml (original)
+++ aries/trunk/jpa/jpa-features/pom.xml Fri Aug 21 17:03:25 2015
@@ -104,6 +104,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.9.1</version>
                 <executions>
                     <execution>
                         <id>attach-artifacts</id>

Modified: aries/trunk/jpa/jpa-parent/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-parent/pom.xml?rev=1697029&r1=1697028&r2=1697029&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-parent/pom.xml (original)
+++ aries/trunk/jpa/jpa-parent/pom.xml Fri Aug 21 17:03:25 2015
@@ -1,10 +1,30 @@
-<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">
+<?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</groupId>
-        <artifactId>parent</artifactId>
-        <version>2.0.1</version>
-        <relativePath>../../parent</relativePath>
+        <groupId>org.apache</groupId>
+        <artifactId>apache</artifactId>
+        <version>14</version>
+        <relativePath />
     </parent>
 
     <groupId>org.apache.aries.jpa</groupId>
@@ -14,12 +34,19 @@
     <name>Apache Aries JPA parent</name>
     <packaging>pom</packaging>
     
+    <properties>
+        <baseline>2.1.0</baseline>
+        <baseline.skip>false</baseline.skip>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <version>1.7.10</version>
         </dependency>
+
+        <!-- Test dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -32,6 +59,7 @@
             <version>1.8.2</version>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-jdk14</artifactId>
@@ -43,15 +71,27 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jpa_2.0_spec</artifactId>
+                <version>1.1</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
                 <groupId>org.hibernate.javax.persistence</groupId>
-                <artifactId>hibernate-jpa-2.1-api</artifactId>
-                <version>1.0.0.Final</version>
+                <artifactId>hibernate-jpa-2.0-api</artifactId>
+                <version>1.0.1.Final</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.persistence</groupId>
+                <artifactId>javax.persistence</artifactId>
+                <version>2.1.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jta_1.1_spec</artifactId>
                 <version>1.1.1</version>
             </dependency>
+
             <dependency>
                 <groupId>org.osgi</groupId>
                 <artifactId>org.osgi.core</artifactId>
@@ -62,6 +102,7 @@
                 <artifactId>org.osgi.compendium</artifactId>
                 <version>4.3.1</version>
             </dependency>
+
             <dependency>
                 <groupId>org.apache.aries.blueprint</groupId>
                 <artifactId>org.apache.aries.blueprint.core</artifactId>
@@ -69,10 +110,36 @@
                 <scope>provided</scope>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.coordinator</artifactId>
+                <version>1.0.0</version>
+                <scope>test</scope>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>2.5.2</version>
+                    <configuration>
+                        <autoVersionSubmodules>true</autoVersionSubmodules>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <configuration>
+                        <encoding>UTF-8</encoding>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -82,6 +149,103 @@
                     <target>1.7</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>2.5.3</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <_include>osgi.bnd</_include>
+                    </instructions>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>baseline</id>
+                        <goals>
+                            <goal>baseline</goal>
+                        </goals>
+                        <configuration>
+                            <comparisonVersion>${baseline}</comparisonVersion>
+                            <skip>${baseline.skip}</skip>
+                            <failOnError>true</failOnError>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>ianal-maven-plugin</artifactId>
+                <version>1.0-alpha-1</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>verify-legal-files</goal>
+                        </goals>
+                        <configuration>
+                            <strict>false</strict>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
+
+    <profiles>
+        <profile>
+            <id>rat</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.rat</groupId>
+                        <artifactId>apache-rat-plugin</artifactId>
+                        <version>0.6</version>
+                        <executions>
+                            <execution>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>check</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <reportFile>${project.build.directory}/${project.build.finalName}.rat</reportFile>
+                            <excludeSubProjects>true</excludeSubProjects>
+                            <excludes>
+                                <exclude>**/target/**/*</exclude>
+                                <exclude>**/appended-resources/**/*</exclude>
+                                <exclude>**/dependency-reduced-pom.xml</exclude>
+                                <exclude>**/velocity.log</exclude>
+                                <exclude>**/DEPENDENCIES</exclude>
+                                <!-- exclude IntelliJ IDEA generated files -->
+                                <exclude>**/*.iml</exclude>
+                                <exclude>**/*.ipr</exclude>
+                                <exclude>**/*.iws</exclude>
+                                <exclude>**/.idea/**/*</exclude>
+                                <!-- exclude Eclipse IDE generated files -->
+                                <exclude>**/.project</exclude>
+                                <exclude>**/.classpath</exclude>
+                                <exclude>**/.settings/**</exclude>
+                                <exclude>**/eclipse-classes/**/*</exclude>
+                                <!-- manifest files don't support comments so don't contain the ASL2.0 header -->
+                                <exclude>**/APPLICATION.MF</exclude>
+                                <exclude>**/MANIFEST.MF</exclude>
+                                <exclude>**/*.MF</exclude>
+                                <!--RAT doesn't seem to recognize MIT style licenses -->
+                                <exclude>manual/src/styles/print.css</exclude>
+                                <!-- RAT doesn't recognize BSD license in transaction-manager logger -->
+                                <exclude>**/objectweb/howl/log/Logger.java</exclude>
+                                <exclude>.gitignore</exclude>
+                                <exclude>osgi.bnd</exclude>
+                                <exclude>README.md</exclude>
+                                <exclude>*.cfg</exclude>
+                                <exclude>derby.log</exclude>
+                                <exclude>**/*.sql</exclude>
+                            </excludes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>



Mime
View raw message