Author: timothyjward
Date: Wed Oct 5 16:11:40 2011
New Revision: 1179289
URL: http://svn.apache.org/viewvc?rev=1179289&view=rev
Log:
ARIES-754: Update JPA itests to use core blueprint bundles
Modified:
aries/trunk/blueprint/blueprint-core/pom.xml
aries/trunk/jpa/jpa-container-itest/pom.xml
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/JPAInjectionTest.java
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerDataSourceFactoryTest.java
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/EclipseLinkStartupTest.java
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/quiesce/itest/QuiesceJPATest.java
Modified: aries/trunk/blueprint/blueprint-core/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/pom.xml?rev=1179289&r1=1179288&r2=1179289&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-core/pom.xml Wed Oct 5 16:11:40 2011
@@ -47,10 +47,12 @@
<!-- Export package versions are maintained in packageinfo files -->
<aries.osgi.export.pkg>
!org.apache.aries.blueprint.annotation*,
- org.apache.aries.blueprint*
+ org.apache.aries.blueprint*,
+ org.osgi.service.blueprint;version=1.0.0
</aries.osgi.export.pkg>
<aries.osgi.import>
- !org.apache.aries.blueprint*,
+ !org.osgi.service.blueprint,
+ !org.apache.aries.blueprint*,
org.apache.aries.util.tracker;resolution:=optional,
org.osgi.service.event*;resolution:=optional,
org.osgi.service.framework;resolution:=optional,
Modified: aries/trunk/jpa/jpa-container-itest/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest/pom.xml?rev=1179289&r1=1179288&r2=1179289&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-itest/pom.xml (original)
+++ aries/trunk/jpa/jpa-container-itest/pom.xml Wed Oct 5 16:11:40 2011
@@ -114,7 +114,13 @@
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint</artifactId>
+ <artifactId>org.apache.aries.blueprint.api</artifactId>
+ <version>0.3.2-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.core</artifactId>
<version>0.3.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified:
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/JPAInjectionTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/JPAInjectionTest.java?rev=1179289&r1=1179288&r2=1179289&view=diff
==============================================================================
---
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/JPAInjectionTest.java
(original)
+++
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/JPAInjectionTest.java
Wed Oct 5 16:11:40 2011
@@ -56,7 +56,8 @@ public class JPAInjectionTest extends Ab
// Bundles
mavenBundle("org.osgi", "org.osgi.compendium"),
mavenBundle("org.apache.aries", "org.apache.aries.util"),
- mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint"),
+ mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.api"),
+ mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.core"),
mavenBundle("asm", "asm-all"),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.api"),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.impl"),
Modified:
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerDataSourceFactoryTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerDataSourceFactoryTest.java?rev=1179289&r1=1179288&r2=1179289&view=diff
==============================================================================
---
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerDataSourceFactoryTest.java
(original)
+++
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerDataSourceFactoryTest.java
Wed Oct 5 16:11:40 2011
@@ -190,7 +190,8 @@ public class JPAContainerDataSourceFacto
mavenBundle("commons-collections", "commons-collections"),
mavenBundle("commons-pool", "commons-pool"),
mavenBundle("org.apache.aries", "org.apache.aries.util"),
- mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint"),
+ mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.api"),
+ mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.core"),
mavenBundle("asm", "asm-all"),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.api"),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.impl"),
Modified:
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java?rev=1179289&r1=1179288&r2=1179289&view=diff
==============================================================================
---
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java
(original)
+++
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java
Wed Oct 5 16:11:40 2011
@@ -63,7 +63,8 @@ public class JPAContainerTest extends Ab
mavenBundle("commons-collections", "commons-collections"),
mavenBundle("commons-pool", "commons-pool"),
mavenBundle("org.apache.aries", "org.apache.aries.util"),
- mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint"),
+ mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.api"),
+ mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.core"),
mavenBundle("asm", "asm-all"),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.api"),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.impl"),
Modified:
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/EclipseLinkStartupTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/EclipseLinkStartupTest.java?rev=1179289&r1=1179288&r2=1179289&view=diff
==============================================================================
---
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/EclipseLinkStartupTest.java
(original)
+++
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/EclipseLinkStartupTest.java
Wed Oct 5 16:11:40 2011
@@ -56,7 +56,8 @@ public class EclipseLinkStartupTest exte
mavenBundle("org.apache.aries", "org.apache.aries.util"),
// Adding blueprint to the runtime is a hack to placate the
// maven bundle plugin.
- mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint"),
+ mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.api"),
+ mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.core"),
mavenBundle("asm", "asm-all"),
mavenBundle("org.apache.aries.proxy",
"org.apache.aries.proxy.api"),
mavenBundle("org.apache.aries.proxy",
"org.apache.aries.proxy.impl"),
Modified:
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java?rev=1179289&r1=1179288&r2=1179289&view=diff
==============================================================================
---
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java
(original)
+++
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java
Wed Oct 5 16:11:40 2011
@@ -414,7 +414,8 @@ public abstract class JPAContextTest ext
mavenBundle("org.osgi", "org.osgi.compendium"),
mavenBundle("org.apache.aries", "org.apache.aries.util"),
// Adding blueprint to the runtime is a hack to placate the maven
bundle plugin.
- mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint"),
+ mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.api"),
+ mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.core"),
mavenBundle("asm", "asm-all"),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.api"),
mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.impl"),
Modified:
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/quiesce/itest/QuiesceJPATest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/quiesce/itest/QuiesceJPATest.java?rev=1179289&r1=1179288&r2=1179289&view=diff
==============================================================================
---
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/quiesce/itest/QuiesceJPATest.java
(original)
+++
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/quiesce/itest/QuiesceJPATest.java
Wed Oct 5 16:11:40 2011
@@ -627,7 +627,8 @@ public class QuiesceJPATest extends Abst
mavenBundle("org.apache.derby", "derby"),
mavenBundle("org.apache.aries.quiesce",
"org.apache.aries.quiesce.api"),
mavenBundle("org.apache.aries", "org.apache.aries.util"),
- mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint"),
+ mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.api"),
+ mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.core"),
mavenBundle("org.apache.geronimo.specs", "geronimo-jpa_2.0_spec"),
mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.api"),
mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.container"),
