You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by jb...@apache.org on 2011/01/10 22:03:26 UTC
svn commit: r1057359 [3/6] - in /aries/sandbox/jbohn/interceptor-proto: ./
application/ application/application-api/
application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/
application/application-bundle/ applic...
Modified: aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java (original)
+++ aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java Mon Jan 10 21:03:14 2011
@@ -125,6 +125,8 @@ public class BlueprintContainerBTCustomi
// Bundles
mavenBundle("org.apache.aries", "org.apache.aries.util"),
+ mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
+ mavenBundle("asm", "asm-all"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"),
// don't install the blueprint sample here as it will be installed onto the same framework as the blueprint core bundle
//mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.sample").noStart(),
Modified: aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java (original)
+++ aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java Mon Jan 10 21:03:14 2011
@@ -96,6 +96,8 @@ public class BlueprintContainerTest exte
// Bundles
mavenBundle("org.apache.aries", "org.apache.aries.util"),
+ mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
+ mavenBundle("asm", "asm-all"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.sample").noStart(),
mavenBundle("org.osgi", "org.osgi.compendium"),
Modified: aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiBundleWithAsmTest.java
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiBundleWithAsmTest.java?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiBundleWithAsmTest.java (original)
+++ aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiBundleWithAsmTest.java Mon Jan 10 21:03:14 2011
@@ -50,7 +50,8 @@ public class MultiBundleWithAsmTest exte
// Bundles
mavenBundle("org.apache.aries", "org.apache.aries.util"),
- mavenBundle("asm","asm-all"),
+ mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
+ mavenBundle("asm", "asm-all"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.testbundlea").noStart(),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.testbundleb").noStart(),
Modified: aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java (original)
+++ aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java Mon Jan 10 21:03:14 2011
@@ -111,6 +111,8 @@ public class QuiesceBlueprintTest extend
mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.api"),
mavenBundle("org.apache.aries", "org.apache.aries.util"),
+ mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
+ mavenBundle("asm", "asm-all"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.testbundlea").noStart(),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.testbundleb").noStart(),
@@ -118,7 +120,7 @@ public class QuiesceBlueprintTest extend
//mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.cm"),
mavenBundle("org.osgi", "org.osgi.compendium"),
- //new VMOption( "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000" ),
+// new VMOption( "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000" ),
equinox().version("3.5.0"));
options = updateOptions(options);
@@ -181,7 +183,7 @@ public class QuiesceBlueprintTest extend
List<Bundle> bundles = new ArrayList<Bundle>();
bundles.add(bundle);
- Thread t = new Thread(new TestBeanClient((TestBean)obj, 1500));
+ Thread t = new Thread(new TestBeanClient((TestBean)obj, 2000));
t.start();
System.out.println("Thread Started");
Modified: aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java (original)
+++ aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java Mon Jan 10 21:03:14 2011
@@ -179,6 +179,8 @@ public class TestConfigAdmin extends Abs
// Bundles
mavenBundle("org.apache.aries", "org.apache.aries.util"),
+ mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
+ mavenBundle("asm", "asm-all"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.sample").noStart(),
mavenBundle("org.osgi","org.osgi.compendium"),
Modified: aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java (original)
+++ aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java Mon Jan 10 21:03:14 2011
@@ -141,6 +141,8 @@ public class TestReferences extends Abst
// Bundles
mavenBundle("org.apache.aries", "org.apache.aries.util"),
+ mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
+ mavenBundle("asm", "asm-all"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.sample"),
mavenBundle("org.osgi", "org.osgi.compendium"),
Modified: aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java (original)
+++ aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java Mon Jan 10 21:03:14 2011
@@ -83,6 +83,8 @@ public class TestRegistrationListener ex
// Bundles
mavenBundle("org.apache.aries", "org.apache.aries.util"),
+ mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
+ mavenBundle("asm", "asm-all"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.sample"),
mavenBundle("org.osgi", "org.osgi.compendium"),
Modified: aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-sample-annotation/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-sample-annotation/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-sample-annotation/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-sample-annotation/pom.xml Mon Jan 10 21:03:14 2011
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.blueprint.sample-annotation</artifactId>
Modified: aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-sample/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-sample/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-sample/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-sample/pom.xml Mon Jan 10 21:03:14 2011
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.blueprint.sample</artifactId>
Modified: aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-testbundlea/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-testbundlea/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-testbundlea/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-testbundlea/pom.xml Mon Jan 10 21:03:14 2011
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.blueprint.testbundlea</artifactId>
Modified: aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-testbundleb/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-testbundleb/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-testbundleb/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-testbundleb/pom.xml Mon Jan 10 21:03:14 2011
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.blueprint.testbundleb</artifactId>
Modified: aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-testquiescebundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-testquiescebundle/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-testquiescebundle/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-testquiescebundle/pom.xml Mon Jan 10 21:03:14 2011
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.blueprint.testquiescebundle</artifactId>
Modified: aries/sandbox/jbohn/interceptor-proto/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/blueprint/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/blueprint/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/blueprint/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
<relativePath>../parent/default-parent/java5-parent/pom.xml</relativePath>
</parent>
@@ -29,7 +29,7 @@
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint</artifactId>
<name>Apache Aries Blueprint</name>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
<packaging>pom</packaging>
<description>
@@ -105,7 +105,7 @@
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</dependency>
<!-- TODO: We need felix 2.0.0 which is not supported by pax exam yet,
so tests are only enabled on equinox for now
@@ -142,29 +142,29 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.testquiescebundle</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
<type>bundle</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.quiesce</groupId>
<artifactId>org.apache.aries.quiesce.api</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.api</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: aries/sandbox/jbohn/interceptor-proto/eba-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/eba-maven-plugin/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/eba-maven-plugin/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/eba-maven-plugin/pom.xml Mon Jan 10 21:03:14 2011
@@ -25,12 +25,12 @@ under the License.
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
<relativePath>../parent/default-parent/java5-parent/pom.xml</relativePath>
</parent>
<artifactId>eba-maven-plugin</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Aries Maven EBA Plugin</name>
Modified: aries/sandbox/jbohn/interceptor-proto/jmx/jmx-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/jmx/jmx-api/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/jmx/jmx-api/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/jmx/jmx-api/pom.xml Mon Jan 10 21:03:14 2011
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>jmx</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.jmx.api</artifactId>
Modified: aries/sandbox/jbohn/interceptor-proto/jmx/jmx-blueprint-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/jmx/jmx-blueprint-api/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/jmx/jmx-blueprint-api/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/jmx/jmx-blueprint-api/pom.xml Mon Jan 10 21:03:14 2011
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>jmx</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.jmx.blueprint.api</artifactId>
Modified: aries/sandbox/jbohn/interceptor-proto/jmx/jmx-blueprint-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/jmx/jmx-blueprint-bundle/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/jmx/jmx-blueprint-bundle/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/jmx/jmx-blueprint-bundle/pom.xml Mon Jan 10 21:03:14 2011
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>jmx</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.jmx.blueprint</artifactId>
Modified: aries/sandbox/jbohn/interceptor-proto/jmx/jmx-blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/jmx/jmx-blueprint-core/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/jmx/jmx-blueprint-core/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/jmx/jmx-blueprint-core/pom.xml Mon Jan 10 21:03:14 2011
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>jmx</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.jmx.blueprint.core</artifactId>
Modified: aries/sandbox/jbohn/interceptor-proto/jmx/jmx-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/jmx/jmx-bundle/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/jmx/jmx-bundle/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/jmx/jmx-bundle/pom.xml Mon Jan 10 21:03:14 2011
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>jmx</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.jmx</artifactId>
@@ -43,7 +43,7 @@
org.apache.aries.jmx.codec;version="${project.version}"
</aries.osgi.export>
<aries.osgi.import>
- !org.apache.aries*,
+ !org.apache.aries.jmx*,
!org.osgi.service.framework,
!org.eclipse*,
org.osgi.framework;version="1.5.0",
@@ -61,7 +61,6 @@
*
</aries.osgi.import>
<aries.osgi.private.pkg>
- org.apache.aries.util*,
org.apache.aries.jmx*
</aries.osgi.private.pkg>
<aries.osgi.import.service>
Modified: aries/sandbox/jbohn/interceptor-proto/jmx/jmx-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/jmx/jmx-core/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/jmx/jmx-core/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/jmx/jmx-core/pom.xml Mon Jan 10 21:03:14 2011
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>jmx</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.jmx.core</artifactId>
Modified: aries/sandbox/jbohn/interceptor-proto/jmx/jmx-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/jmx/jmx-itests/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/jmx/jmx-itests/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/jmx/jmx-itests/pom.xml Mon Jan 10 21:03:14 2011
@@ -19,12 +19,12 @@
<parent>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>jmx</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.itests</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Apache Aries JMX integration tests</name>
<description>
@@ -63,6 +63,16 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-all</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
<scope>test</scope>
Modified: aries/sandbox/jbohn/interceptor-proto/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java (original)
+++ aries/sandbox/jbohn/interceptor-proto/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java Mon Jan 10 21:03:14 2011
@@ -60,6 +60,8 @@ public class BlueprintMBeanTest extends
mavenBundle("org.ops4j.pax.logging", "pax-logging-api"),
mavenBundle("org.ops4j.pax.logging", "pax-logging-service"),
mavenBundle("org.apache.aries", "org.apache.aries.util"),
+ mavenBundle("asm", "asm-all"),
+ mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.sample"),
mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx.blueprint"),
Modified: aries/sandbox/jbohn/interceptor-proto/jmx/jmx-whiteboard/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/jmx/jmx-whiteboard/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/jmx/jmx-whiteboard/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/jmx/jmx-whiteboard/pom.xml Mon Jan 10 21:03:14 2011
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>jmx</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.jmx.whiteboard</artifactId>
Modified: aries/sandbox/jbohn/interceptor-proto/jmx/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/jmx/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/jmx/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/jmx/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
<relativePath>../parent/default-parent/java5-parent/pom.xml</relativePath>
</parent>
@@ -29,7 +29,7 @@
<groupId>org.apache.aries.jmx</groupId>
<artifactId>jmx</artifactId>
<name>Apache Aries JMX</name>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -46,49 +46,59 @@
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.api</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.blueprint.api</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.blueprint.core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.blueprint</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<!-- external dependencies -->
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-all</artifactId>
+ <version>3.2</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.sample</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified: aries/sandbox/jbohn/interceptor-proto/jndi/jndi-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/jndi/jndi-api/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/jndi/jndi-api/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/jndi/jndi-api/pom.xml Mon Jan 10 21:03:14 2011
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>jndi</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.jndi.api</artifactId>
Modified: aries/sandbox/jbohn/interceptor-proto/jndi/jndi-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/jndi/jndi-bundle/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/jndi/jndi-bundle/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/jndi/jndi-bundle/pom.xml Mon Jan 10 21:03:14 2011
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>jndi</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.jndi</artifactId>
@@ -57,10 +57,10 @@
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.url</artifactId>
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.rmi</artifactId>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.api</artifactId>
Modified: aries/sandbox/jbohn/interceptor-proto/jndi/jndi-bundle/src/main/java/org/apache/aries/jndi/priv/Activator.java
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/jndi/jndi-bundle/src/main/java/org/apache/aries/jndi/priv/Activator.java?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/jndi/jndi-bundle/src/main/java/org/apache/aries/jndi/priv/Activator.java (original)
+++ aries/sandbox/jbohn/interceptor-proto/jndi/jndi-bundle/src/main/java/org/apache/aries/jndi/priv/Activator.java Mon Jan 10 21:03:14 2011
@@ -28,8 +28,8 @@ public class Activator implements Bundle
public Activator() {
this.activators = new BundleActivator[]{
new org.apache.aries.jndi.startup.Activator(),
- new org.apache.aries.jndi.url.Activator(),
- new org.apache.aries.jndi.rmi.Activator()
+ new org.apache.aries.jndi.url.Activator()
+ // new org.apache.aries.jndi.rmi.Activator()
};
}
Modified: aries/sandbox/jbohn/interceptor-proto/jndi/jndi-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/jndi/jndi-core/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/jndi/jndi-core/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/jndi/jndi-core/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>jndi</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.jndi.core</artifactId>
Modified: aries/sandbox/jbohn/interceptor-proto/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ContextProvider.java
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ContextProvider.java?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ContextProvider.java (original)
+++ aries/sandbox/jbohn/interceptor-proto/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ContextProvider.java Mon Jan 10 21:03:14 2011
@@ -32,14 +32,4 @@ public class ContextProvider {
public Context getContext() {
return context;
}
-
- @Override
- public void finalize()
- {
- try {
- close();
- } catch (NamingException e) {
- // we are just being nice here, so we ignore this if it happens.
- }
- }
}
\ No newline at end of file
Modified: aries/sandbox/jbohn/interceptor-proto/jndi/jndi-legacy-support/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/jndi/jndi-legacy-support/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/jndi/jndi-legacy-support/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/jndi/jndi-legacy-support/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>jndi</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.jndi.legacy.support</artifactId>
Modified: aries/sandbox/jbohn/interceptor-proto/jndi/jndi-rmi/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/jndi/jndi-rmi/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/jndi/jndi-rmi/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/jndi/jndi-rmi/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>jndi</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.jndi.rmi</artifactId>
Propchange: aries/sandbox/jbohn/interceptor-proto/jndi/jndi-url-itest/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jan 10 21:03:14 2011
@@ -0,0 +1,4 @@
+.settings
+target
+.classpath
+.project
Propchange: aries/sandbox/jbohn/interceptor-proto/jndi/jndi-url-itest-biz/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jan 10 21:03:14 2011
@@ -0,0 +1,4 @@
+.project
+.classpath
+target
+.settings
Propchange: aries/sandbox/jbohn/interceptor-proto/jndi/jndi-url-itest-web/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jan 10 21:03:14 2011
@@ -0,0 +1,4 @@
+.settings
+target
+.classpath
+.project
Modified: aries/sandbox/jbohn/interceptor-proto/jndi/jndi-url/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/jndi/jndi-url/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/jndi/jndi-url/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/jndi/jndi-url/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>jndi</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.jndi.url</artifactId>
Modified: aries/sandbox/jbohn/interceptor-proto/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/Activator.java
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/Activator.java?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/Activator.java (original)
+++ aries/sandbox/jbohn/interceptor-proto/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/Activator.java Mon Jan 10 21:03:14 2011
@@ -43,6 +43,20 @@ public class Activator implements Bundle
ctx = context;
proxyManager = new SingleServiceTracker<ProxyManager>(context, ProxyManager.class, this);
proxyManager.open();
+ // Blueprint URL scheme requires access to the BlueprintContainer service.
+ // We have an optional import
+ // on org.osgi.service.blueprint.container: only register the blueprint:comp/URL
+ // scheme if it's present
+ try {
+ ctx.getBundle().loadClass("org.osgi.service.blueprint.container.BlueprintContainer");
+ Hashtable<Object, Object> blueprintURlSchemeProps = new Hashtable<Object, Object>();
+ blueprintURlSchemeProps.put(JNDIConstants.JNDI_URLSCHEME, new String[] { "blueprint" });
+ blueprintUrlReg = ctx.registerService(ObjectFactory.class.getName(),
+ new BlueprintURLContextServiceFactory(), blueprintURlSchemeProps);
+ } catch (ClassNotFoundException cnfe) {
+ // The blueprint packages aren't available, so do nothing. That's fine.
+ cnfe.printStackTrace();
+ }
}
@Override
@@ -60,20 +74,6 @@ public class Activator implements Bundle
osgiUrlprops.put(JNDIConstants.JNDI_URLSCHEME, new String[] { "osgi", "aries" });
osgiUrlReg = ctx.registerService(ObjectFactory.class.getName(),
new OsgiURLContextServiceFactory(), osgiUrlprops);
-
- // Blueprint URL scheme requires access to the BlueprintContainer service.
- // We have an optional import
- // on org.osgi.service.blueprint.container: only register the blueprint:comp/URL
- // scheme if it's present
- try {
- ctx.getBundle().loadClass("org.osgi.service.blueprint.container.BlueprintContainer");
- Hashtable<Object, Object> blueprintURlSchemeProps = new Hashtable<Object, Object>();
- blueprintURlSchemeProps.put(JNDIConstants.JNDI_URLSCHEME, new String[] { "blueprint" });
- blueprintUrlReg = ctx.registerService(ObjectFactory.class.getName(),
- new BlueprintURLContextServiceFactory(), blueprintURlSchemeProps);
- } catch (ClassNotFoundException cnfe) {
- // The blueprint packages aren't available, so do nothing. That's fine.
- }
}
@Override
@@ -81,8 +81,6 @@ public class Activator implements Bundle
{
if (osgiUrlReg != null) osgiUrlReg.unregister();
osgiUrlReg = null;
- if (blueprintUrlReg != null) blueprintUrlReg.unregister();
- blueprintUrlReg = null;
}
@Override
Modified: aries/sandbox/jbohn/interceptor-proto/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/BlueprintURLContext.java
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/BlueprintURLContext.java?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/BlueprintURLContext.java (original)
+++ aries/sandbox/jbohn/interceptor-proto/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/BlueprintURLContext.java Mon Jan 10 21:03:14 2011
@@ -25,6 +25,11 @@ import java.util.Iterator;
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Set;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import javax.naming.Binding;
import javax.naming.Context;
@@ -42,19 +47,20 @@ import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
import org.osgi.service.blueprint.container.BlueprintContainer;
import org.osgi.service.blueprint.container.NoSuchComponentException;
+import org.osgi.util.tracker.ServiceTracker;
+import org.osgi.util.tracker.ServiceTrackerCustomizer;
-public class BlueprintURLContext implements Context {
+public class BlueprintURLContext implements Context
+{
private static final String BLUEPRINT_NAMESPACE = "blueprint:comp/";
private Bundle _callersBundle;
private Map<String, Object> _env;
private NameParser _parser = new BlueprintNameParser();
- private BlueprintContainer _blueprintContainer;
private BlueprintName _parentName;
// listBindings wants a NamingEnumeration<Binding>
// list wants a NamingEnumeration<NameClassPair>
// Both are very similar. As per ServiceRegistryListContext we delegate to a closure to do the final processing
-
private interface ComponentProcessor<T> {
T get (Binding b);
}
@@ -65,18 +71,24 @@ public class BlueprintURLContext impleme
private int position = 0;
private ComponentProcessor<T> processor;
- public BlueprintComponentNamingEnumeration (BlueprintContainer bpc, ComponentProcessor<T> p)
+ public BlueprintComponentNamingEnumeration (Bundle callersBundle, ComponentProcessor<T> p) throws ServiceUnavailableException
{
- @SuppressWarnings("unchecked")
- Set<String> componentIds = bpc.getComponentIds();
- blueprintIdToComponentBindings = new Binding[componentIds.size()];
- Iterator<String> idIterator= componentIds.iterator();
- for (int i=0; i < blueprintIdToComponentBindings.length; i++) {
- String id = idIterator.next();
- Object o = bpc.getComponentInstance(id);
- blueprintIdToComponentBindings[i] = new Binding (id, o);
+ ServiceReference blueprintContainerRef = getBlueprintContainerRef(callersBundle);
+ try {
+ BlueprintContainer blueprintContainer = (BlueprintContainer) callersBundle.getBundleContext().getService(blueprintContainerRef);
+ @SuppressWarnings("unchecked")
+ Set<String> componentIds = blueprintContainer.getComponentIds();
+ blueprintIdToComponentBindings = new Binding[componentIds.size()];
+ Iterator<String> idIterator= componentIds.iterator();
+ for (int i=0; i < blueprintIdToComponentBindings.length; i++) {
+ String id = idIterator.next();
+ Object o = blueprintContainer.getComponentInstance(id);
+ blueprintIdToComponentBindings[i] = new Binding (id, o);
+ }
+ processor = p;
+ } finally {
+ callersBundle.getBundleContext().ungetService(blueprintContainerRef);
}
- processor = p;
}
@@ -117,27 +129,23 @@ public class BlueprintURLContext impleme
}
@SuppressWarnings("unchecked")
- public BlueprintURLContext(Bundle callersBundle, Hashtable<?, ?> env) throws ServiceUnavailableException
+ public BlueprintURLContext(Bundle callersBundle, Hashtable<?, ?> env)
{
_callersBundle = callersBundle;
_env = new HashMap<String, Object>();
_env.putAll((Map<? extends String, ? extends Object>) env);
_parentName = null;
- ServiceReference bpContainerRef = getBlueprintContainerRef(_callersBundle);
- if (bpContainerRef != null) {
- _blueprintContainer = (BlueprintContainer) _callersBundle.getBundleContext().getService(bpContainerRef);
- } else {
- throw new ServiceUnavailableException ();
- }
}
- private BlueprintURLContext (Bundle callersBundle, BlueprintName parentName, Map<String, Object> env,
- BlueprintContainer bpc) {
+ private BlueprintURLContext (Bundle callersBundle, BlueprintName parentName, Map<String, Object> env) {
_callersBundle = callersBundle;
_parentName = parentName;
_env = env;
- _blueprintContainer = bpc;
-
+ }
+
+ @Override
+ protected void finalize() throws NamingException {
+ close();
}
@Override
@@ -163,7 +171,7 @@ public class BlueprintURLContext impleme
public void close() throws NamingException
{
_env = null;
- }
+ }
@Override
public Name composeName(Name name, Name prefix) throws NamingException
@@ -247,7 +255,7 @@ public class BlueprintURLContext impleme
@Override
public NamingEnumeration<NameClassPair> list(String s) throws NamingException
{
- NamingEnumeration<NameClassPair> result = new BlueprintComponentNamingEnumeration<NameClassPair>(_blueprintContainer, new ComponentProcessor<NameClassPair>() {
+ NamingEnumeration<NameClassPair> result = new BlueprintComponentNamingEnumeration<NameClassPair>(_callersBundle, new ComponentProcessor<NameClassPair>() {
@Override
public NameClassPair get(Binding b)
{
@@ -268,7 +276,7 @@ public class BlueprintURLContext impleme
public NamingEnumeration<Binding> listBindings(String name)
throws NamingException
{
- NamingEnumeration<Binding> result = new BlueprintComponentNamingEnumeration<Binding>(_blueprintContainer, new ComponentProcessor<Binding>() {
+ NamingEnumeration<Binding> result = new BlueprintComponentNamingEnumeration<Binding>(_callersBundle, new ComponentProcessor<Binding>() {
@Override
public Binding get(Binding b)
{
@@ -279,39 +287,36 @@ public class BlueprintURLContext impleme
}
@Override
- public Object lookup(Name name) throws NamingException
+ public Object lookup(Name name) throws NamingException, ServiceUnavailableException
{
- BlueprintName bpName;
- if (name instanceof BlueprintName) {
- bpName = (BlueprintName) name;
- } else if (_parentName != null) {
- bpName = new BlueprintName (_parentName.toString() + "/" + name.toString());
- } else {
- bpName = (BlueprintName) _parser.parse(name.toString());
- }
-
+ ServiceReference blueprintContainerRef = getBlueprintContainerRef(_callersBundle);
Object result;
- if (bpName.hasComponent()) {
- String componentId = bpName.getComponentId();
- ServiceReference bpContainerRef = getBlueprintContainerRef(_callersBundle);
- BlueprintContainer bpc;
- if (bpContainerRef != null) {
- bpc = (BlueprintContainer) _callersBundle.getBundleContext().getService(bpContainerRef);
- } else {
- throw new NamingException();
+ try {
+ BlueprintContainer blueprintContainer = (BlueprintContainer)
+ _callersBundle.getBundleContext().getService(blueprintContainerRef);
+ BlueprintName bpName;
+ if (name instanceof BlueprintName) {
+ bpName = (BlueprintName) name;
+ } else if (_parentName != null) {
+ bpName = new BlueprintName(_parentName.toString() + "/" + name.toString());
+ } else {
+ bpName = (BlueprintName) _parser.parse(name.toString());
}
-
- try {
- result = bpc.getComponentInstance(componentId);
- } catch (NoSuchComponentException nsce) {
- throw new NameNotFoundException (nsce.getMessage());
- } finally {
- _callersBundle.getBundleContext().ungetService(bpContainerRef);
- }
- } else {
- result = new BlueprintURLContext (_callersBundle, bpName, _env, _blueprintContainer);
- }
- return result;
+
+ if (bpName.hasComponent()) {
+ String componentId = bpName.getComponentId();
+ try {
+ result = blueprintContainer.getComponentInstance(componentId);
+ } catch (NoSuchComponentException nsce) {
+ throw new NameNotFoundException(nsce.getMessage());
+ }
+ } else {
+ result = new BlueprintURLContext(_callersBundle, bpName, _env);
+ }
+ } finally {
+ _callersBundle.getBundleContext().ungetService(blueprintContainerRef);
+ }
+ return result;
}
@Override
@@ -378,23 +383,139 @@ public class BlueprintURLContext impleme
throw new OperationNotSupportedException();
}
- private ServiceReference getBlueprintContainerRef(Bundle b)
+ /**
+ * Look for a BluepintContainer service in a given bundle
+ * @param b Bundle to look in
+ * @return BlueprintContainer service, or null if none available
+ */
+ private static ServiceReference findBPCRef (Bundle b)
{
ServiceReference[] refs = b.getRegisteredServices();
ServiceReference result = null;
- outer: for (ServiceReference r : refs) {
- String[] objectClasses = (String[]) r.getProperty(Constants.OBJECTCLASS);
- for (String objectClass : objectClasses) {
- if (objectClass.equals(BlueprintContainer.class.getName())) {
- // Arguably we could put an r.isAssignableTo(jndi-url-bundle, BlueprintContainer.class.getName())
- // check here. But if you've got multiple, class-space inconsistent instances of blueprint in
- // your environment, you've almost certainly got other problems.
- result = r;
- break outer;
+ if (refs != null) {
+ outer: for (ServiceReference r : refs) {
+ String[] objectClasses = (String[]) r.getProperty(Constants.OBJECTCLASS);
+ for (String objectClass : objectClasses) {
+ if (objectClass.equals(BlueprintContainer.class.getName())) {
+ // Arguably we could put an r.isAssignableTo(jndi-url-bundle, BlueprintContainer.class.getName())
+ // check here. But if you've got multiple, class-space inconsistent instances of blueprint in
+ // your environment, you've almost certainly got other problems.
+ result = r;
+ break outer;
+ }
}
}
}
return result;
}
+
+ /**
+ * Obtain a BlueprintContainerService for the given bundle. If the service isn't there, wait for up
+ * to the blueprint.graceperiod defined for that bundle for one to be published.
+ * @param b The Bundle to look in
+ * @return BlueprintContainerService instance for that bundle
+ * @throws ServiceUnavailableException If no BlueprinContainerService found
+ */
+ private static ServiceReference getBlueprintContainerRef(Bundle b) throws ServiceUnavailableException
+ {
+ ServiceReference result = findBPCRef(b);
+ if (result == null) {
+ Semaphore s = new Semaphore(0);
+ AtomicReference<ServiceReference> bpcRef = new AtomicReference<ServiceReference>();
+ ServiceTracker st = new ServiceTracker (b.getBundleContext(), BlueprintContainer.class.getName(),
+ new BlueprintContainerServiceTrackerCustomizer (b, s, bpcRef));
+ st.open();
+
+ // Make another check for the BlueprintContainer service in case it came up just before our tracker engaged
+ int graceperiod = getGracePeriod(b);
+ result = findBPCRef(b);
+ if (result == null && graceperiod >= 0) {
+ if (graceperiod == 0) { // Wait for an unlimited period
+ try {
+ s.acquire();
+ } catch (InterruptedException ix) {}
+ } else {
+ try {
+ s.tryAcquire(graceperiod, TimeUnit.MILLISECONDS);
+ } catch (InterruptedException ix) {}
+ }
+ }
+ result = bpcRef.get();
+ st.close();
+ }
+ if (result == null) {
+ throw new ServiceUnavailableException ("The BlueprintContainer service for bundle: " + b.getSymbolicName() + '_' + b.getVersion() + " not be located");
+ }
+ return result;
+ }
+
+ static final Pattern graceP = Pattern.compile(".*;\\s*blueprint.graceperiod\\s*:=\\s*\"?([A-Za-z]+).*");
+ static final Pattern timeoutP = Pattern.compile(".*;\\s*blueprint.timeout\\s*:=\\s*\"?([0-9]+).*");
+
+ /**
+ * Determine the blueprint.timeout set for a given bundle
+ * @param b The bundle to inspect
+ * @return -1 if blueprint.graceperiod is false, otherwise the value of blueprint.timeout,
+ * or 300000 if blueprint.graceperiod is true and no value is given for
+ * blueprint.timeout.
+ */
+ public static int getGracePeriod (Bundle b) {
+ int result = 300000; // Blueprint default
+ boolean gracePeriodSet = true; // Blueprint default
+ String bundleSymbolicName = (String)b.getHeaders().get(Constants.BUNDLE_SYMBOLICNAME);
+
+ // I'd like to use ManifestHeaderProcessor here but as of December 15th 2010 it lives
+ // application-utils, and I don't want to make that a dependency of jndi-url
+
+ Matcher m = graceP.matcher(bundleSymbolicName);
+ if (m.matches()) {
+ String gracePeriod = m.group(1);
+ gracePeriodSet = !gracePeriod.equalsIgnoreCase("false"); // See OSGi Enterprise spec 4.2 section 121.3.2.1 step 6
+ }
+ if (!gracePeriodSet) {
+ result = -1;
+ } else {
+ m = timeoutP.matcher(bundleSymbolicName);
+ if (m.matches()) {
+ String timeout = m.group(1);
+ try {
+ result = Integer.valueOf(timeout);
+ } catch (NumberFormatException nfx) {
+ // Noop: result stays at its default value
+ }
+ }
+ }
+ return result;
+ }
+
+ private static class BlueprintContainerServiceTrackerCustomizer implements ServiceTrackerCustomizer
+ {
+ Bundle bundleToFindBPCServiceIn = null;
+ Semaphore semaphore;
+ AtomicReference<ServiceReference> atomicRef = null;
+ public BlueprintContainerServiceTrackerCustomizer (Bundle b, Semaphore s, AtomicReference<ServiceReference> aref) {
+ bundleToFindBPCServiceIn = b;
+ semaphore = s;
+ atomicRef = aref;
+ }
+
+ @Override
+ public Object addingService(ServiceReference reference)
+ {
+ Object result = null;
+ if (bundleToFindBPCServiceIn.equals(reference.getBundle())) {
+ atomicRef.set(reference);
+ semaphore.release();
+ result = reference.getBundle().getBundleContext().getService(reference);
+ }
+ return result;
+ }
+
+ @Override
+ public void modifiedService(ServiceReference reference, Object service) {}
+
+ @Override
+ public void removedService(ServiceReference reference, Object service) {}
+ }
}
Modified: aries/sandbox/jbohn/interceptor-proto/jndi/jndi-url/src/test/java/org/apache/aries/jndi/url/BlueprintURLContextTest.java
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/jndi/jndi-url/src/test/java/org/apache/aries/jndi/url/BlueprintURLContextTest.java?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/jndi/jndi-url/src/test/java/org/apache/aries/jndi/url/BlueprintURLContextTest.java (original)
+++ aries/sandbox/jbohn/interceptor-proto/jndi/jndi-url/src/test/java/org/apache/aries/jndi/url/BlueprintURLContextTest.java Mon Jan 10 21:03:14 2011
@@ -46,6 +46,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
import org.osgi.service.blueprint.container.BlueprintContainer;
import org.osgi.service.blueprint.container.NoSuchComponentException;
@@ -215,4 +216,39 @@ public class BlueprintURLContextTest {
assertEquals ("Not all expected components were found", expectedCompIds.size(), 0);
}
+ @Test
+ public void testBlueprintTimeoutExtractionBothSpecified() {
+ Bundle b = bundleMock ("bundle.name;x=y;p:=q;blueprint.graceperiod:=true;blueprint.timeout:=10000;a=b;c:=d");
+ int timeout = BlueprintURLContext.getGracePeriod(b);
+ assertEquals ("graceperiod wrong", 10000, timeout);
+ }
+
+ @Test
+ public void testGracePeriodFalseHandled() throws Exception {
+ Bundle b = bundleMock ("bundle.name;x=y;p:=q;blueprint.graceperiod:=false;blueprint.timeout:=10000;a=b;c:=d");
+ int timeout = BlueprintURLContext.getGracePeriod(b);
+ assertEquals ("graceperiod wrong", -1, timeout);
+
+ b = bundleMock ("bundle.name;x=y;p:=q;blueprint.graceperiod:=false;a=b;c:=d");
+ timeout = BlueprintURLContext.getGracePeriod(b);
+ assertEquals ("graceperiod wrong", -1, timeout);
+ }
+
+ @Test
+ public void testDefaultsReturnedByDefault() throws Exception {
+ Bundle b = bundleMock("bundle.name;x=y;p:=q;blueprint.graceperiod:=true;a=b;c:=d");
+ int timeout = BlueprintURLContext.getGracePeriod(b);
+ assertEquals ("graceperiod wrong", 300000, timeout);
+
+ b = bundleMock ("bundle.name;x=y;p:=q;a=b;c:=d");
+ timeout = BlueprintURLContext.getGracePeriod(b);
+ assertEquals ("graceperiod wrong", 300000, timeout);
+ }
+
+ Bundle bundleMock (String bundleSymbolicNameHeader) {
+ Hashtable<String, String> props = new Hashtable<String, String>();
+ props.put(Constants.BUNDLE_SYMBOLICNAME, bundleSymbolicNameHeader);
+ Bundle result = Skeleton.newMock(new BundleMock("aBundle", props), Bundle.class);
+ return result;
+ }
}
Modified: aries/sandbox/jbohn/interceptor-proto/jndi/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/jndi/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/jndi/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/jndi/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
<relativePath>../parent/default-parent/java5-parent/pom.xml</relativePath>
</parent>
@@ -29,7 +29,7 @@
<groupId>org.apache.aries.jndi</groupId>
<artifactId>jndi</artifactId>
<name>Apache Aries JNDI</name>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
<packaging>pom</packaging>
<description>
@@ -41,7 +41,11 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/aries/trunk/jndi</developerConnection>
<url>http://svn.apache.org/viewvc/incubator/aries/trunk/jndi</url>
</scm>
-
+
+ <properties>
+ <ariesBlueprintVersion>0.3-SNAPSHOT</ariesBlueprintVersion>
+ </properties>
+
<dependencyManagement>
<dependencies>
<!-- internal dependencies -->
@@ -70,22 +74,72 @@
<artifactId>org.apache.aries.jndi</artifactId>
<version>${version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.aries.jndi</groupId>
+ <artifactId>org.apache.aries.jndi.url.itest.web</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jndi</groupId>
+ <artifactId>org.apache.aries.jndi.url.itest.biz</artifactId>
+ <version>${version}</version>
+ </dependency>
<!-- external dependencies -->
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.api</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-all</artifactId>
+ <version>3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
+ <version>2.1_3_4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.web</groupId>
+ <artifactId>pax-web-extender-war</artifactId>
+ <version>0.7.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.web</groupId>
+ <artifactId>pax-web-jetty-bundle</artifactId>
+ <version>0.7.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.fileinstall</artifactId>
+ <version>2.0.8</version>
+ </dependency>
+
+ <!-- other aries subproject dependency management -->
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>blueprint</artifactId>
+ <version>${ariesBlueprintVersion}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
</dependencies>
</dependencyManagement>
@@ -104,6 +158,9 @@
<module>jndi-rmi</module>
<module>jndi-bundle</module>
<module>jndi-legacy-support</module>
+ <module>jndi-url-itest-biz</module>
+ <module>jndi-url-itest-web</module>
+ <module>jndi-url-itest</module>
</modules>
</project>
Modified: aries/sandbox/jbohn/interceptor-proto/jpa/jpa-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/jpa/jpa-api/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/jpa/jpa-api/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/jpa/jpa-api/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
<parent>
<artifactId>jpa</artifactId>
<groupId>org.apache.aries.jpa</groupId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.aries.jpa.api</artifactId>
Modified: aries/sandbox/jbohn/interceptor-proto/jpa/jpa-blueprint-aries/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/jpa/jpa-blueprint-aries/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/jpa/jpa-blueprint-aries/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/jpa/jpa-blueprint-aries/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
<parent>
<artifactId>jpa</artifactId>
<groupId>org.apache.aries.jpa</groupId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<name>Aries JPA Container blueprint integration for Aries blueprint</name>
<modelVersion>4.0.0</modelVersion>
Modified: aries/sandbox/jbohn/interceptor-proto/jpa/jpa-blueprint-testbundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/jpa/jpa-blueprint-testbundle/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/jpa/jpa-blueprint-testbundle/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/jpa/jpa-blueprint-testbundle/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
<parent>
<artifactId>jpa</artifactId>
<groupId>org.apache.aries.jpa</groupId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.aries.jpa.blueprint.itest.bundle</artifactId>
Modified: aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container-context/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container-context/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container-context/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container-context/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
<parent>
<artifactId>jpa</artifactId>
<groupId>org.apache.aries.jpa</groupId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.aries.jpa.container.context</artifactId>
Modified: aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/transaction/impl/JTAEntityManager.java
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/transaction/impl/JTAEntityManager.java?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/transaction/impl/JTAEntityManager.java (original)
+++ aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/transaction/impl/JTAEntityManager.java Mon Jan 10 21:03:14 2011
@@ -134,38 +134,80 @@ public class JTAEntityManager implements
public boolean contains(Object arg0)
{
- return getPersistenceContext(false).contains(arg0);
+ EntityManager em = getPersistenceContext(false);
+ try {
+ return em.contains(arg0);
+ } finally {
+ if(em == detachedManager)
+ em.clear();
+ }
}
public Query createNamedQuery(String arg0)
{
- return getPersistenceContext(false).createNamedQuery(arg0);
+ EntityManager em = getPersistenceContext(false);
+ try {
+ return em.createNamedQuery(arg0);
+ } finally {
+ if(em == detachedManager)
+ em.clear();
+ }
}
public Query createNativeQuery(String arg0)
{
- return getPersistenceContext(false).createNativeQuery(arg0);
+ EntityManager em = getPersistenceContext(false);
+ try {
+ return em.createNativeQuery(arg0);
+ } finally {
+ if(em == detachedManager)
+ em.clear();
+ }
}
@SuppressWarnings("unchecked")
public Query createNativeQuery(String arg0, Class arg1)
{
- return getPersistenceContext(false).createNativeQuery(arg0, arg1);
+ EntityManager em = getPersistenceContext(false);
+ try {
+ return em.createNativeQuery(arg0, arg1);
+ } finally {
+ if(em == detachedManager)
+ em.clear();
+ }
}
public Query createNativeQuery(String arg0, String arg1)
{
- return getPersistenceContext(false).createNativeQuery(arg0, arg1);
+ EntityManager em = getPersistenceContext(false);
+ try {
+ return em.createNativeQuery(arg0, arg1);
+ } finally {
+ if(em == detachedManager)
+ em.clear();
+ }
}
public Query createQuery(String arg0)
{
- return getPersistenceContext(false).createQuery(arg0);
+ EntityManager em = getPersistenceContext(false);
+ try {
+ return em.createQuery(arg0);
+ } finally {
+ if(em == detachedManager)
+ em.clear();
+ }
}
public <T> T find(Class<T> arg0, Object arg1)
{
- return getPersistenceContext(false).find(arg0, arg1);
+ EntityManager em = getPersistenceContext(false);
+ try {
+ return em.find(arg0, arg1);
+ } finally {
+ if(em == detachedManager)
+ em.clear();
+ }
}
/**
@@ -188,7 +230,13 @@ public class JTAEntityManager implements
public <T> T getReference(Class<T> arg0, Object arg1)
{
- return getPersistenceContext(false).getReference(arg0, arg1);
+ EntityManager em = getPersistenceContext(false);
+ try {
+ return em.getReference(arg0, arg1);
+ } finally {
+ if(em == detachedManager)
+ em.clear();
+ }
}
public EntityTransaction getTransaction()
@@ -248,32 +296,66 @@ public class JTAEntityManager implements
public void setFlushMode(FlushModeType arg0)
{
- getPersistenceContext(false).setFlushMode(arg0);
+ EntityManager em = getPersistenceContext(false);
+ try {
+ em.setFlushMode(arg0);
+ } finally {
+ if(em == detachedManager)
+ em.clear();
+ }
}
public <T> TypedQuery<T> createNamedQuery(String arg0, Class<T> arg1)
{
- return getPersistenceContext(false).createNamedQuery(arg0, arg1);
+ EntityManager em = getPersistenceContext(false);
+ try {
+ return em.createNamedQuery(arg0, arg1);
+ } finally {
+ if(em == detachedManager)
+ em.clear();
+ }
}
public <T> TypedQuery<T> createQuery(CriteriaQuery<T> arg0)
{
- return getPersistenceContext(false).createQuery(arg0);
+ EntityManager em = getPersistenceContext(false);
+ try {
+ return em.createQuery(arg0);
+ } finally {
+ if(em == detachedManager)
+ em.clear();
+ }
}
public <T> TypedQuery<T> createQuery(String arg0, Class<T> arg1)
{
- return getPersistenceContext(false).createQuery(arg0, arg1);
+ EntityManager em = getPersistenceContext(false);
+ try {
+ return em.createQuery(arg0, arg1);
+ } finally {
+ if(em == detachedManager)
+ em.clear();
+ }
}
public void detach(Object arg0)
{
- getPersistenceContext(false).detach(arg0);
+ EntityManager em = getPersistenceContext(false);
+ //The detatched manager auto-detaches everything, so only
+ //detach from a "real" entity manager
+ if(em != detachedManager)
+ em.detach(arg0);
}
public <T> T find(Class<T> arg0, Object arg1, Map<String, Object> arg2)
{
- return getPersistenceContext(false).find(arg0, arg1, arg2);
+ EntityManager em = getPersistenceContext(false);
+ try {
+ return em.find(arg0, arg1, arg2);
+ } finally {
+ if(em == detachedManager)
+ em.clear();
+ }
}
/**
@@ -281,7 +363,13 @@ public class JTAEntityManager implements
*/
public <T> T find(Class<T> arg0, Object arg1, LockModeType arg2)
{
- return getPersistenceContext(arg2 != LockModeType.NONE).find(arg0, arg1, arg2);
+ EntityManager em = getPersistenceContext(arg2 != LockModeType.NONE);
+ try {
+ return em.find(arg0, arg1, arg2);
+ } finally {
+ if(em == detachedManager)
+ em.clear();
+ }
}
/**
@@ -289,7 +377,13 @@ public class JTAEntityManager implements
*/
public <T> T find(Class<T> arg0, Object arg1, LockModeType arg2, Map<String, Object> arg3)
{
- return getPersistenceContext(arg2 != LockModeType.NONE).find(arg0, arg1, arg2, arg3);
+ EntityManager em = getPersistenceContext(arg2 != LockModeType.NONE);
+ try {
+ return em.find(arg0, arg1, arg2, arg3);
+ } finally {
+ if(em == detachedManager)
+ em.clear();
+ }
}
public CriteriaBuilder getCriteriaBuilder()
@@ -354,11 +448,23 @@ public class JTAEntityManager implements
public void setProperty(String arg0, Object arg1)
{
- getPersistenceContext(false).setProperty(arg0, arg1);
+ EntityManager em = getPersistenceContext(false);
+ try {
+ em.setProperty(arg0, arg1);
+ } finally {
+ if(em == detachedManager)
+ em.clear();
+ }
}
public <T> T unwrap(Class<T> arg0)
{
- return getPersistenceContext(false).unwrap(arg0);
+ EntityManager em = getPersistenceContext(false);
+ try {
+ return em.unwrap(arg0);
+ } finally {
+ if(em == detachedManager)
+ em.clear();
+ }
}
}
Modified: aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container-itest/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container-itest/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container-itest/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
<parent>
<artifactId>jpa</artifactId>
<groupId>org.apache.aries.jpa</groupId>
- <version>0.3-incubating-SNAPSHOT</version>
+ <version>0.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.aries.jpa.container.itest</artifactId>
@@ -80,6 +80,16 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-all</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
<scope>test</scope>
@@ -196,6 +206,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.aries.transaction</groupId>
+ <artifactId>org.apache.aries.transaction.wrappers</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.api</artifactId>
<scope>test</scope>
Modified: aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/JPAInjectionTest.java
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/JPAInjectionTest.java?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/JPAInjectionTest.java (original)
+++ aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/JPAInjectionTest.java Mon Jan 10 21:03:14 2011
@@ -87,6 +87,8 @@ public class JPAInjectionTest {
mavenBundle("org.osgi", "org.osgi.compendium"),
mavenBundle("org.apache.aries", "org.apache.aries.util"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"),
+ mavenBundle("asm", "asm-all"),
+ mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
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"),
Modified: aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java (original)
+++ aries/sandbox/jbohn/interceptor-proto/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java Mon Jan 10 21:03:14 2011
@@ -15,11 +15,13 @@
*/
package org.apache.aries.jpa.container.itest;
+import static org.ops4j.pax.exam.CoreOptions.bootDelegationPackages;
import static org.ops4j.pax.exam.CoreOptions.equinox;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;
import static org.ops4j.pax.exam.OptionUtils.combine;
+import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
import javax.persistence.EntityManagerFactory;
@@ -73,7 +75,8 @@ public class JPAContainerTest {
@org.ops4j.pax.exam.junit.Configuration
public static Option[] configuration() {
Option[] options = options(
- bootDelegation(),
+ bootDelegationPackages("javax.transaction", "javax.transaction.*"),
+ vmOption("-Dorg.osgi.framework.system.packages=javax.accessibility,javax.activation,javax.activity,javax.annotation,javax.annotation.processing,javax.crypto,javax.crypto.interfaces,javax.crypto.spec,javax.imageio,javax.imageio.event,javax.imageio.metadata,javax.imageio.plugins.bmp,javax.imageio.plugins.jpeg,javax.imageio.spi,javax.imageio.stream,javax.jws,javax.jws.soap,javax.lang.model,javax.lang.model.element,javax.lang.model.type,javax.lang.model.util,javax.management,javax.management.loading,javax.management.modelmbean,javax.management.monitor,javax.management.openmbean,javax.management.relation,javax.management.remote,javax.management.remote.rmi,javax.management.timer,javax.naming,javax.naming.directory,javax.naming.event,javax.naming.ldap,javax.naming.spi,javax.net,javax.net.ssl,javax.print,javax.print.attribute,javax.print.attribute.standard,javax.print.event,javax.rmi,javax.rmi.CORBA,javax.rmi.ssl,javax.script,javax.security.auth,javax.security.auth.callback,
javax.security.auth.kerberos,javax.security.auth.login,javax.security.auth.spi,javax.security.auth.x500,javax.security.cert,javax.security.sasl,javax.sound.midi,javax.sound.midi.spi,javax.sound.sampled,javax.sound.sampled.spi,javax.sql,javax.sql.rowset,javax.sql.rowset.serial,javax.sql.rowset.spi,javax.swing,javax.swing.border,javax.swing.colorchooser,javax.swing.event,javax.swing.filechooser,javax.swing.plaf,javax.swing.plaf.basic,javax.swing.plaf.metal,javax.swing.plaf.multi,javax.swing.plaf.synth,javax.swing.table,javax.swing.text,javax.swing.text.html,javax.swing.text.html.parser,javax.swing.text.rtf,javax.swing.tree,javax.swing.undo,javax.tools,javax.xml,javax.xml.bind,javax.xml.bind.annotation,javax.xml.bind.annotation.adapters,javax.xml.bind.attachment,javax.xml.bind.helpers,javax.xml.bind.util,javax.xml.crypto,javax.xml.crypto.dom,javax.xml.crypto.dsig,javax.xml.crypto.dsig.dom,javax.xml.crypto.dsig.keyinfo,javax.xml.crypto.dsig.spec,javax.xml.datatype,javax.xml.name
space,javax.xml.parsers,javax.xml.soap,javax.xml.stream,javax.xml.stream.events,javax.xml.stream.util,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.sax,javax.xml.transform.stax,javax.xml.transform.stream,javax.xml.validation,javax.xml.ws,javax.xml.ws.handler,javax.xml.ws.handler.soap,javax.xml.ws.http,javax.xml.ws.soap,javax.xml.ws.spi,javax.xml.xpath,org.ietf.jgss,org.omg.CORBA,org.omg.CORBA.DynAnyPackage,org.omg.CORBA.ORBPackage,org.omg.CORBA.TypeCodePackage,org.omg.CORBA.portable,org.omg.CORBA_2_3,org.omg.CORBA_2_3.portable,org.omg.CosNaming,org.omg.CosNaming.NamingContextExtPackage,org.omg.CosNaming.NamingContextPackage,org.omg.Dynamic,org.omg.DynamicAny,org.omg.DynamicAny.DynAnyFactoryPackage,org.omg.DynamicAny.DynAnyPackage,org.omg.IOP,org.omg.IOP.CodecFactoryPackage,org.omg.IOP.CodecPackage,org.omg.Messaging,org.omg.PortableInterceptor,org.omg.PortableInterceptor.ORBInitInfoPackage,org.omg.PortableServer,org.omg.PortableServer.CurrentPackage,org.omg.
PortableServer.POAManagerPackage,org.omg.PortableServer.POAPackage,org.omg.PortableServer.ServantLocatorPackage,org.omg.PortableServer.portable,org.omg.SendingContext,org.omg.stub.java.rmi,org.w3c.dom,org.w3c.dom.bootstrap,org.w3c.dom.css,org.w3c.dom.events,org.w3c.dom.html,org.w3c.dom.ls,org.w3c.dom.ranges,org.w3c.dom.stylesheets,org.w3c.dom.traversal,org.w3c.dom.views,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers,javax.transaction;partial=true;mandatory:=partial,javax.transaction.xa;partial=true;mandatory:=partial"),
// Log
mavenBundle("org.ops4j.pax.logging", "pax-logging-api"),
@@ -93,11 +96,15 @@ public class JPAContainerTest {
mavenBundle("commons-pool", "commons-pool"),
mavenBundle("org.apache.aries", "org.apache.aries.util"),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"),
+ mavenBundle("asm", "asm-all"),
+ mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.api"),
mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.core"),
mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.url"),
mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.api"),
mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.container"),
+ mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.manager" ),
+ mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.wrappers" ),
mavenBundle("org.apache.derby", "derby"),
mavenBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec"),
mavenBundle("org.apache.geronimo.specs", "geronimo-jpa_2.0_spec"),