incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n..@apache.org
Subject svn commit: r1051440 - in /incubator/aries/trunk: application/ application/application-itests/ application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/ blueprint/blueprint-annotation-itest/ blueprint/blueprint-annotatio...
Date Tue, 21 Dec 2010 10:00:43 GMT
Author: not
Date: Tue Dec 21 10:00:41 2010
New Revision: 1051440

URL: http://svn.apache.org/viewvc?rev=1051440&view=rev
Log:
ARIES-517 Fix up the way our uber bundles are built.

Added:
    incubator/aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/nls/
    incubator/aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/nls/BlueprintMessages.properties
Removed:
    incubator/aries/trunk/blueprint/blueprint-bundle/src/main/java/org/apache/aries/blueprint/uberbundle/
Modified:
    incubator/aries/trunk/application/application-itests/pom.xml
    incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java
    incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java
    incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java
    incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java
    incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java
    incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java
    incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java
    incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java
    incubator/aries/trunk/application/pom.xml
    incubator/aries/trunk/blueprint/blueprint-annotation-itest/pom.xml
    incubator/aries/trunk/blueprint/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/BlueprintAnnotationTest.java
    incubator/aries/trunk/blueprint/blueprint-bundle/pom.xml
    incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BeanRecipe.java
    incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ServiceRecipe.java
    incubator/aries/trunk/blueprint/blueprint-itests/pom.xml
    incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2BTCustomizerTest.java
    incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java
    incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java
    incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java
    incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiBundleWithAsmTest.java
    incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java
    incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
    incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java
    incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java
    incubator/aries/trunk/jmx/jmx-bundle/pom.xml
    incubator/aries/trunk/jmx/jmx-itests/pom.xml
    incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java
    incubator/aries/trunk/jmx/pom.xml
    incubator/aries/trunk/jndi/jndi-bundle/pom.xml
    incubator/aries/trunk/jndi/jndi-bundle/src/main/java/org/apache/aries/jndi/priv/Activator.java
    incubator/aries/trunk/jndi/jndi-url-itest/pom.xml
    incubator/aries/trunk/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java
    incubator/aries/trunk/jndi/pom.xml
    incubator/aries/trunk/jpa/jpa-container-itest/pom.xml
    incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/JPAInjectionTest.java
    incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java
    incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java
    incubator/aries/trunk/jpa/pom.xml
    incubator/aries/trunk/proxy/proxy-bundle/pom.xml
    incubator/aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/pom.xml
    incubator/aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini
    incubator/aries/trunk/samples/blog/blog-assembly/pom.xml
    incubator/aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini
    incubator/aries/trunk/samples/blog/blog-itests/pom.xml
    incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java
    incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java
    incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java
    incubator/aries/trunk/samples/pom.xml
    incubator/aries/trunk/transaction/pom.xml
    incubator/aries/trunk/transaction/transaction-itests/pom.xml
    incubator/aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java
    incubator/aries/trunk/web/pom.xml
    incubator/aries/trunk/web/web-itests/pom.xml
    incubator/aries/trunk/web/web-itests/src/test/java/org/apache/aries/web/converter/itest/WabConverterITest.java

Modified: incubator/aries/trunk/application/application-itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-itests/pom.xml?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-itests/pom.xml (original)
+++ incubator/aries/trunk/application/application-itests/pom.xml Tue Dec 21 10:00:41 2010
@@ -55,6 +55,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.ops4j.pax.logging</groupId>
 			<artifactId>pax-logging-api</artifactId>
 			<scope>test</scope>
@@ -115,7 +125,7 @@
         <dependency>
             <groupId>org.apache.aries.application.itest.twitter</groupId>
             <artifactId>org.apache.aries.application.itest.twitter.eba</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>eba</type>
             <scope>test</scope>
         </dependency>

Modified: incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java (original)
+++ incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java Tue Dec 21 10:00:41 2010
@@ -145,6 +145,8 @@ public class BasicAppManagerTest extends
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime.itest.interfaces"),
         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.osgi", "org.osgi.compendium"),
         mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit"),
         

Modified: incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java (original)
+++ incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java Tue Dec 21 10:00:41 2010
@@ -144,6 +144,8 @@ public class BasicNoOpResolverTest exten
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime.itest.interfaces"),
         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.osgi", "org.osgi.compendium"),
         mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit"),
         

Modified: incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java (original)
+++ incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java Tue Dec 21 10:00:41 2010
@@ -244,6 +244,8 @@ public class IsolatedRuntimeTest extends
         systemProperty(AppConstants.PROVISON_EXCLUDE_LOCAL_REPO_SYSPROP).value("true"),
         // Bundles
         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.transaction", "org.apache.aries.transaction.blueprint"),
         mavenBundle("org.apache.aries", "org.apache.aries.util"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.api"),

Modified: incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java (original)
+++ incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java Tue Dec 21 10:00:41 2010
@@ -195,6 +195,8 @@ public class MinimumImportsTest extends 
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.modeller"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.deployment.management"),
         mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"), 
+        mavenBundle("asm", "asm-all"),
+        mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
         mavenBundle("org.osgi", "org.osgi.compendium"),
         mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit"),
 

Modified: incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java (original)
+++ incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java Tue Dec 21 10:00:41 2010
@@ -164,6 +164,8 @@ public class OBRAppManagerTest extends A
 
         // Bundles
         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", "org.apache.aries.util"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.api"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.utils"),

Modified: incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java (original)
+++ incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java Tue Dec 21 10:00:41 2010
@@ -540,6 +540,8 @@ public class OBRResolverAdvancedTest ext
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime.itest.interfaces"),
         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.osgi", "org.osgi.compendium"),
         mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit"),
         /* For debugging, uncomment the next two lines  */

Modified: incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java (original)
+++ incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java Tue Dec 21 10:00:41 2010
@@ -281,6 +281,8 @@ public class OBRResolverTest extends Abs
 
         // Bundles
         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", "org.apache.aries.util"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.api"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.utils"),

Modified: incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java (original)
+++ incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java Tue Dec 21 10:00:41 2010
@@ -260,6 +260,8 @@ public class UpdateAppTest extends Abstr
         // Bundles
         
         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.transaction", "org.apache.aries.transaction.blueprint"),
         mavenBundle("org.apache.aries", "org.apache.aries.util"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.api"),

Modified: incubator/aries/trunk/application/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/pom.xml?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/application/pom.xml (original)
+++ incubator/aries/trunk/application/pom.xml Tue Dec 21 10:00:41 2010
@@ -53,6 +53,11 @@
                 <version>0.3-incubating-SNAPSHOT</version>
             </dependency>
             <dependency>
+                <groupId>org.apache.aries.proxy</groupId>
+                <artifactId>org.apache.aries.proxy</artifactId>
+                <version>0.3-incubating-SNAPSHOT</version>
+            </dependency>
+            <dependency>
                 <groupId>org.apache.aries.blueprint</groupId>
                 <artifactId>org.apache.aries.blueprint</artifactId>
                 <version>0.3-incubating-SNAPSHOT</version>

Modified: incubator/aries/trunk/blueprint/blueprint-annotation-itest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-annotation-itest/pom.xml?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-annotation-itest/pom.xml (original)
+++ incubator/aries/trunk/blueprint/blueprint-annotation-itest/pom.xml Tue Dec 21 10:00:41 2010
@@ -58,6 +58,10 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.aries.proxy</groupId>
+            <artifactId>org.apache.aries.proxy</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint.sample</artifactId>
             <scope>test</scope>

Modified: incubator/aries/trunk/blueprint/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/BlueprintAnnotationTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/BlueprintAnnotationTest.java?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/BlueprintAnnotationTest.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/BlueprintAnnotationTest.java Tue Dec 21 10:00:41 2010
@@ -97,6 +97,7 @@ public class BlueprintAnnotationTest ext
 
             // 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.xbean", "xbean-finder"),
             mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.annotation.api"),

Modified: incubator/aries/trunk/blueprint/blueprint-bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-bundle/pom.xml?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-bundle/pom.xml (original)
+++ incubator/aries/trunk/blueprint/blueprint-bundle/pom.xml Tue Dec 21 10:00:41 2010
@@ -35,12 +35,11 @@
             ${project.artifactId};blueprint.graceperiod:=false
         </aries.osgi.symbolic.name>
         <aries.osgi.activator>
-            org.apache.aries.blueprint.uberbundle.UberActivator
+            org.apache.aries.blueprint.container.BlueprintExtender
         </aries.osgi.activator>
         <aries.osgi.import>
             !org.apache.aries.blueprint*,
             !org.osgi.service.blueprint*,
-            !org.objectweb.asm*,
             org.eclipse.osgi.internal.loader;resolution:=optional,
             org.eclipse.osgi.framework.internal.core;resolution:=optional,
             org.eclipse.osgi.framework.adaptor;resolution:=optional,
@@ -57,13 +56,9 @@
             org.osgi.service.blueprint.container;version="1.0.1",
             org.osgi.service.blueprint.reflect;version="1.0.1",
             !org.apache.aries.blueprint.annotation*,
-            org.apache.aries.blueprint*;version="${pom.version}",
-            org.apache.aries.proxy;version=0.3-incubating-SNAPSHOT
+            org.apache.aries.blueprint*;version="${pom.version}"
         </aries.osgi.export>
         <aries.osgi.private.pkg>
-            org.apache.aries.proxy*,
-            org.objectweb.asm*,
-            org.apache.aries.util*,
             OSGI-INF*
         </aries.osgi.private.pkg>
         <aries.osgi.export.service>
@@ -97,11 +92,12 @@
         <dependency>
             <groupId>org.apache.aries.proxy</groupId>
             <artifactId>org.apache.aries.proxy</artifactId>
-            <scope>compile</scope>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>asm</groupId>
             <artifactId>asm-all</artifactId>
+            <scope>test</scope>
             <optional>true</optional>
         </dependency>
         <dependency>

Modified: incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BeanRecipe.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BeanRecipe.java?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BeanRecipe.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BeanRecipe.java Tue Dec 21 10:00:41 2010
@@ -679,19 +679,6 @@ public class BeanRecipe extends Abstract
         List<Interceptor> interceptors = reg.getInterceptors(interceptorLookupKey);
         if (interceptors != null && interceptors.size() > 0) {
             try {
-                // Try load load an asm class (to make sure it's actually
-                // available)
-                getClass().getClassLoader().loadClass(
-                        "org.objectweb.asm.ClassVisitor");
-                LOGGER.debug("asm available for interceptors");
-            } catch (Throwable t) {
-                throw new ComponentDefinitionException(
-                        "Interceptors have been configured but asm is not available",
-                        t);
-            }
-            // if asm is available we can proxy the original object with the
-            // AsmInterceptorWrapper
-            try {
               intercepted = BlueprintExtender.getProxyManager().createProxy(FrameworkUtil.getBundle(original.getClass()), 
                   ProxyUtils.asList(original.getClass()), ProxyUtils.passThrough(original), 
                   new Collaborator(interceptorLookupKey, interceptors));

Modified: incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ServiceRecipe.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ServiceRecipe.java?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ServiceRecipe.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/ServiceRecipe.java Tue Dec 21 10:00:41 2010
@@ -418,14 +418,12 @@ public class ServiceRecipe extends Abstr
     	private ComponentMetadata cm;
     	private ServiceMetadata sm;
         private boolean isQuiesceAvailable;
-        private boolean isAsmAvailable;
     	public TriggerServiceFactory(ServiceRecipe serviceRecipe, ServiceMetadata cm)
     	{
     		this.serviceRecipe = serviceRecipe;
     		this.cm = cm;
     		this.sm = cm;
             this.isQuiesceAvailable = isClassAvailable("org.apache.aries.quiesce.participant.QuiesceParticipant");
-            this.isAsmAvailable = isClassAvailable("org.objectweb.asm.ClassVisitor");
     	}
     	
         public Object getService(Bundle bundle, ServiceRegistration registration) {
@@ -447,12 +445,6 @@ public class ServiceRecipe extends Abstr
             if (interceptors.isEmpty()) {
                 return original;
             }
-            // If asm is not available, exit
-            if (!isAsmAvailable) {
-                LOGGER.info("ASM is not available to create a proxy object. Returning the original object instead.");
-                LOGGER.debug(LOG_EXIT, "getService", original);
-                return original;
-            }
 
             Object intercepted;
             try {

Added: incubator/aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/nls/BlueprintMessages.properties
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/nls/BlueprintMessages.properties?rev=1051440&view=auto
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/nls/BlueprintMessages.properties (added)
+++ incubator/aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries/blueprint/nls/BlueprintMessages.properties Tue Dec 21 10:00:41 2010
@@ -0,0 +1 @@
+duplicate.component=The component name {0} is already in use.
\ No newline at end of file

Modified: incubator/aries/trunk/blueprint/blueprint-itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-itests/pom.xml?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-itests/pom.xml (original)
+++ incubator/aries/trunk/blueprint/blueprint-itests/pom.xml Tue Dec 21 10:00:41 2010
@@ -127,6 +127,10 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+           <groupId>org.apache.aries.proxy</groupId>
+           <artifactId>org.apache.aries.proxy</artifactId>
+     	</dependency>
+        <dependency>
         	<groupId>org.apache.aries.quiesce</groupId>
         	<artifactId>org.apache.aries.quiesce.api</artifactId>
         	<version>0.3-incubating-SNAPSHOT</version>

Modified: incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2BTCustomizerTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2BTCustomizerTest.java?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2BTCustomizerTest.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2BTCustomizerTest.java Tue Dec 21 10:00:41 2010
@@ -126,6 +126,8 @@ public class BlueprintContainer2BTCustom
 
             // 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").noStart(),
             // 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: incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java Tue Dec 21 10:00:41 2010
@@ -80,6 +80,8 @@ public class BlueprintContainer2Test ext
             // Bundles
             mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.sample").noStart(),
             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").noStart(),
             mavenBundle("org.osgi", "org.osgi.compendium"),
 //            org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),

Modified: incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java Tue Dec 21 10:00:41 2010
@@ -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: incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java Tue Dec 21 10:00:41 2010
@@ -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: incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiBundleWithAsmTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiBundleWithAsmTest.java?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiBundleWithAsmTest.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiBundleWithAsmTest.java Tue Dec 21 10:00:41 2010
@@ -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: incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java Tue Dec 21 10:00:41 2010
@@ -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: incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java Tue Dec 21 10:00:41 2010
@@ -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: incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java Tue Dec 21 10:00:41 2010
@@ -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: incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java Tue Dec 21 10:00:41 2010
@@ -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: incubator/aries/trunk/jmx/jmx-bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-bundle/pom.xml?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-bundle/pom.xml (original)
+++ incubator/aries/trunk/jmx/jmx-bundle/pom.xml Tue Dec 21 10:00:41 2010
@@ -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: incubator/aries/trunk/jmx/jmx-itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/pom.xml?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-itests/pom.xml (original)
+++ incubator/aries/trunk/jmx/jmx-itests/pom.xml Tue Dec 21 10:00:41 2010
@@ -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: incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java (original)
+++ incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java Tue Dec 21 10:00:41 2010
@@ -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: incubator/aries/trunk/jmx/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/pom.xml?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/pom.xml (original)
+++ incubator/aries/trunk/jmx/pom.xml Tue Dec 21 10:00:41 2010
@@ -46,32 +46,32 @@
             <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 -->
@@ -81,6 +81,16 @@
                 <version>0.3-incubating-SNAPSHOT</version>
             </dependency>
             <dependency>
+                <groupId>org.apache.aries.proxy</groupId>
+                <artifactId>org.apache.aries.proxy</artifactId>
+                <version>0.3-incubating-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>

Modified: incubator/aries/trunk/jndi/jndi-bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jndi/jndi-bundle/pom.xml?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/jndi/jndi-bundle/pom.xml (original)
+++ incubator/aries/trunk/jndi/jndi-bundle/pom.xml Tue Dec 21 10:00:41 2010
@@ -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: incubator/aries/trunk/jndi/jndi-bundle/src/main/java/org/apache/aries/jndi/priv/Activator.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jndi/jndi-bundle/src/main/java/org/apache/aries/jndi/priv/Activator.java?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/jndi/jndi-bundle/src/main/java/org/apache/aries/jndi/priv/Activator.java (original)
+++ incubator/aries/trunk/jndi/jndi-bundle/src/main/java/org/apache/aries/jndi/priv/Activator.java Tue Dec 21 10:00:41 2010
@@ -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: incubator/aries/trunk/jndi/jndi-url-itest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jndi/jndi-url-itest/pom.xml?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/jndi/jndi-url-itest/pom.xml (original)
+++ incubator/aries/trunk/jndi/jndi-url-itest/pom.xml Tue Dec 21 10:00:41 2010
@@ -62,6 +62,11 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.aries.proxy</groupId>
+            <artifactId>org.apache.aries.proxy</artifactId>
+        </dependency>
+        
+        <dependency>
             <groupId>org.apache.aries.jndi</groupId>
             <artifactId>org.apache.aries.jndi.url.itest.web</artifactId>
             <scope>test</scope>
@@ -143,11 +148,11 @@
             <scope>test</scope>
         </dependency>
 
-        <!--<dependency>
+        <dependency>
             <groupId>asm</groupId>
             <artifactId>asm-all</artifactId>
             <scope>test</scope>
-        </dependency> -->
+        </dependency>
 
 		<dependency>
 			<groupId>org.eclipse</groupId>

Modified: incubator/aries/trunk/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java (original)
+++ incubator/aries/trunk/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java Tue Dec 21 10:00:41 2010
@@ -91,19 +91,16 @@ public class JndiUrlIntegrationTest exte
         mavenBundle("org.ops4j.pax.web", "pax-web-extender-war"),
         mavenBundle("org.ops4j.pax.web", "pax-web-jetty-bundle"),
         mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"),
+        mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
+        mavenBundle("asm", "asm-all"),
         mavenBundle("org.apache.aries", "org.apache.aries.util"),
         mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi"),
-        mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.url"),
         mavenBundle("org.apache.felix", "org.apache.felix.fileinstall"),
         
         mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.url.itest.web"),
         mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.url.itest.biz"),
         /* For debugging, uncomment the next two lines */
-        /*
-         * vmOption
-         * ("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=7777"),
-         * waitForFrameworkStartup(),
-         */
+//        vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=7777"),
         /*
          * For debugging, add these imports: import static
          * org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartup; import static

Modified: incubator/aries/trunk/jndi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jndi/pom.xml?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/jndi/pom.xml (original)
+++ incubator/aries/trunk/jndi/pom.xml Tue Dec 21 10:00:41 2010
@@ -100,6 +100,11 @@
 	            <artifactId>org.apache.aries.proxy.api</artifactId>
 	            <version>0.3-incubating-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>

Modified: incubator/aries/trunk/jpa/jpa-container-itest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-container-itest/pom.xml?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/jpa-container-itest/pom.xml (original)
+++ incubator/aries/trunk/jpa/jpa-container-itest/pom.xml Tue Dec 21 10:00:41 2010
@@ -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>

Modified: incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/JPAInjectionTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/JPAInjectionTest.java?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/JPAInjectionTest.java (original)
+++ incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/JPAInjectionTest.java Tue Dec 21 10:00:41 2010
@@ -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: incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java (original)
+++ incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java Tue Dec 21 10:00:41 2010
@@ -96,6 +96,8 @@ 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"),

Modified: incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java (original)
+++ incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java Tue Dec 21 10:00:41 2010
@@ -430,6 +430,8 @@ public class JPAContextTest {
         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("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.jndi", "org.apache.aries.jndi.api"),
         mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi.core"),

Modified: incubator/aries/trunk/jpa/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/pom.xml?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/pom.xml (original)
+++ incubator/aries/trunk/jpa/pom.xml Tue Dec 21 10:00:41 2010
@@ -40,42 +40,42 @@
             <dependency>
                 <groupId>org.apache.aries.jpa</groupId>
                 <artifactId>org.apache.aries.jpa.api</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.jpa</groupId>
                 <artifactId>org.apache.aries.jpa.blueprint.aries</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.jpa</groupId>
                 <artifactId>org.apache.aries.jpa.blueprint.itest</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.jpa</groupId>
                 <artifactId>org.apache.aries.jpa.blueprint.itest.bundle</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.jpa</groupId>
                 <artifactId>org.apache.aries.jpa.container</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.jpa</groupId>
                 <artifactId>org.apache.aries.jpa.container.context</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.jpa</groupId>
                 <artifactId>org.apache.aries.jpa.container.itest</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.jpa</groupId>
                 <artifactId>org.apache.aries.jpa.container.itest.bundle</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
 
 
@@ -85,6 +85,11 @@
                 <version>0.3-incubating-SNAPSHOT</version>
             </dependency>
             <dependency>
+                <groupId>org.apache.aries.proxy</groupId>
+                <artifactId>org.apache.aries.proxy</artifactId>
+                <version>0.3-incubating-SNAPSHOT</version>
+            </dependency>
+            <dependency>
                 <groupId>org.apache.aries.blueprint</groupId>
                 <artifactId>org.apache.aries.blueprint</artifactId>
                 <version>0.3-incubating-SNAPSHOT</version>
@@ -121,7 +126,11 @@
                 <version>1.1</version>
                 <scope>provided</scope>
             </dependency>
-
+            <dependency>
+                <groupId>asm</groupId>
+                <artifactId>asm-all</artifactId>
+                <version>3.2</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jta_1.1_spec</artifactId>

Modified: incubator/aries/trunk/proxy/proxy-bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/proxy/proxy-bundle/pom.xml?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/proxy/proxy-bundle/pom.xml (original)
+++ incubator/aries/trunk/proxy/proxy-bundle/pom.xml Tue Dec 21 10:00:41 2010
@@ -47,13 +47,9 @@
         </aries.osgi.export.pkg>
         <aries.osgi.import.pkg>
             org.eclipse.*;resolution:=optional,
-            org.objectweb.asm;resolution:=optional,
-            org.objectweb.asm.commons;resolution:=optional,
             *
         </aries.osgi.import.pkg>
         <aries.osgi.private.pkg>
-            org.apache.aries.util*,
-            org.objectweb.asm*,
             org.apache.aries.proxy.impl*
         </aries.osgi.private.pkg>
     </properties>

Modified: incubator/aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/pom.xml?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/pom.xml (original)
+++ incubator/aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/pom.xml Tue Dec 21 10:00:41 2010
@@ -133,6 +133,10 @@
             <artifactId>org.apache.aries.blueprint</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.apache.aries.proxy</groupId>
+            <artifactId>org.apache.aries.proxy</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.aries</groupId>
             <artifactId>org.apache.aries.util</artifactId>
         </dependency>

Modified: incubator/aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini (original)
+++ incubator/aries/trunk/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini Tue Dec 21 10:00:41 2010
@@ -54,6 +54,7 @@ org.apache.aries.jpa.container-${ariesJp
 org.apache.aries.jpa.container.context-${ariesJpaVersion}.jar@start,\
 org.apache.aries.util-${ariesUtilVersion}.jar@start,\
 org.apache.aries.blueprint-${ariesBlueprintVersion}.jar@start,\
+org.apache.aries.proxy-${ariesProxyVersion}.jar@start,\
 org.apache.aries.transaction.blueprint-${ariesTransactionVersion}.jar@start,\
 org.apache.aries.transaction.manager-${ariesTransactionVersion}.jar@start,\
 org.apache.aries.transaction.wrappers-${ariesTransactionVersion}.jar@start,\

Modified: incubator/aries/trunk/samples/blog/blog-assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blog/blog-assembly/pom.xml?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blog/blog-assembly/pom.xml (original)
+++ incubator/aries/trunk/samples/blog/blog-assembly/pom.xml Tue Dec 21 10:00:41 2010
@@ -142,6 +142,11 @@
 		</dependency>
 
 		<dependency>
+			<groupId>org.apache.aries.proxy</groupId>
+			<artifactId>org.apache.aries.proxy</artifactId>
+		</dependency>
+
+		<dependency>
 			<groupId>org.apache.aries</groupId>
 			<artifactId>org.apache.aries.util</artifactId>
 		</dependency>

Modified: incubator/aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini (original)
+++ incubator/aries/trunk/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini Tue Dec 21 10:00:41 2010
@@ -28,6 +28,7 @@ pax-web-jsp-0.7.2.jar@start,\
 org.apache.aries.jndi-${ariesJndiVersion}.jar@start,\
 org.apache.aries.util-${ariesUtilVersion}.jar@start,\
 org.apache.aries.blueprint-${ariesBlueprintVersion}.jar@start,\
+org.apache.aries.proxy-${ariesProxyVersion}.jar@start,\
 org.apache.aries.application.install-${ariesApplicationVersion}.jar@start,\
 org.apache.aries.application.management-${ariesApplicationVersion}.jar@start,\
 org.apache.aries.application.api-${ariesApplicationVersion}.jar@start,\

Modified: incubator/aries/trunk/samples/blog/blog-itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blog/blog-itests/pom.xml?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blog/blog-itests/pom.xml (original)
+++ incubator/aries/trunk/samples/blog/blog-itests/pom.xml Tue Dec 21 10:00:41 2010
@@ -56,6 +56,12 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.aries.proxy</groupId>
+            <artifactId>org.apache.aries.proxy</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.aries</groupId>
             <artifactId>org.apache.aries.util</artifactId>
             <scope>test</scope>

Modified: incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java (original)
+++ incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java Tue Dec 21 10:00:41 2010
@@ -135,6 +135,7 @@ public class JdbcBlogSampleWithEbaTest e
                 mavenBundle("commons-pool", "commons-pool"),
                 mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.serp"),
                 mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint" ),
+                mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
                 mavenBundle("org.apache.aries", "org.apache.aries.util" ),
                 mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi" ),
                 mavenBundle("org.apache.felix", "org.apache.felix.fileinstall" ),

Modified: incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java (original)
+++ incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java Tue Dec 21 10:00:41 2010
@@ -153,6 +153,7 @@ bootDelegationPackages("javax.transactio
             mavenBundle("commons-pool", "commons-pool"),
             mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.serp"),
             mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint" ),
+            mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
             mavenBundle("org.apache.aries", "org.apache.aries.util" ),
             mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi" ),
             mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository"),

Modified: incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java (original)
+++ incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java Tue Dec 21 10:00:41 2010
@@ -215,6 +215,7 @@ bootDelegationPackages("javax.transactio
             mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.api"),
             mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.manager"),
             mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint" ),
+            mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
             mavenBundle("org.apache.aries", "org.apache.aries.util" ),
             mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi" ),
             mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository"),

Modified: incubator/aries/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/pom.xml?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/samples/pom.xml (original)
+++ incubator/aries/trunk/samples/pom.xml Tue Dec 21 10:00:41 2010
@@ -45,6 +45,7 @@
         <ariesJndiVersion>0.3-incubating-SNAPSHOT</ariesJndiVersion>
         <ariesJpaVersion>0.3-incubating-SNAPSHOT</ariesJpaVersion>
         <ariesTransactionVersion>0.3-incubating-SNAPSHOT</ariesTransactionVersion>
+        <ariesProxyVersion>0.3-incubating-SNAPSHOT</ariesProxyVersion>
         <ariesUtilVersion>0.3-incubating-SNAPSHOT</ariesUtilVersion>
         <ariesWebVersion>0.3-incubating-SNAPSHOT</ariesWebVersion>
         <openjpaVersion>2.0.0</openjpaVersion>
@@ -206,6 +207,13 @@
                 <scope>import</scope>
             </dependency>
             <dependency>
+                <groupId>org.apache.aries.proxy</groupId>
+                <artifactId>org.apache.aries.proxy</artifactId>
+                <version>${ariesProxyVersion}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
                 <groupId>org.apache.aries.jmx</groupId>
                 <artifactId>jmx</artifactId>
                 <version>${ariesJmxVersion}</version>

Modified: incubator/aries/trunk/transaction/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/pom.xml?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/transaction/pom.xml (original)
+++ incubator/aries/trunk/transaction/pom.xml Tue Dec 21 10:00:41 2010
@@ -49,28 +49,28 @@
             <dependency>
                 <groupId>org.apache.aries.transaction</groupId>
                 <artifactId>org.apache.aries.transaction.blueprint</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.transaction</groupId>
                 <artifactId>org.apache.aries.transaction.manager</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.transaction</groupId>
                 <artifactId>org.apache.aries.transaction.wrappers</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.transaction</groupId>
                 <artifactId>org.apache.aries.transaction.testds</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.transaction</groupId>
                 <artifactId>org.apache.aries.transaction.testbundle</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
                 <scope>test</scope>
             </dependency>
             
@@ -86,6 +86,11 @@
                 <version>0.3-incubating-SNAPSHOT</version>
             </dependency>
             <dependency>
+                <groupId>org.apache.aries.proxy</groupId>
+                <artifactId>org.apache.aries.proxy</artifactId>
+                <version>0.3-incubating-SNAPSHOT</version>
+            </dependency>
+            <dependency>
                 <groupId>org.apache.aries.testsupport</groupId>
                 <artifactId>org.apache.aries.testsupport.unit</artifactId>
                 <version>0.3-incubating-SNAPSHOT</version>

Modified: incubator/aries/trunk/transaction/transaction-itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/transaction-itests/pom.xml?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/transaction/transaction-itests/pom.xml (original)
+++ incubator/aries/trunk/transaction/transaction-itests/pom.xml Tue Dec 21 10:00:41 2010
@@ -83,6 +83,11 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.aries.proxy</groupId>
+            <artifactId>org.apache.aries.proxy</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.aries.transaction</groupId>
             <artifactId>org.apache.aries.transaction.manager</artifactId>
             <scope>test</scope>

Modified: incubator/aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java (original)
+++ incubator/aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java Tue Dec 21 10:00:41 2010
@@ -98,6 +98,8 @@ public abstract class AbstractIntegratio
                 mavenBundle("org.apache.derby", "derby"),
                 mavenBundle("org.apache.aries", "org.apache.aries.util"),
                 mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"), 
+                mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
+                mavenBundle("asm", "asm-all"),
                 mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.manager"),
                 mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.blueprint"),
                 mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.wrappers"),

Modified: incubator/aries/trunk/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/web/pom.xml?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/web/pom.xml (original)
+++ incubator/aries/trunk/web/pom.xml Tue Dec 21 10:00:41 2010
@@ -48,12 +48,12 @@
             <dependency>
                 <groupId>org.apache.aries.web</groupId>
                 <artifactId>org.apache.aries.web.itests</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.aries.web</groupId>
                 <artifactId>org.apache.aries.web.urlhandler</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
 
             <!-- external dependencies -->
@@ -75,6 +75,11 @@
                 <version>0.3-incubating-SNAPSHOT</version>
             </dependency>
             <dependency>
+                <groupId>org.apache.aries.proxy</groupId>
+                <artifactId>org.apache.aries.proxy</artifactId>
+                <version>0.3-incubating-SNAPSHOT</version>
+            </dependency>
+            <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.configadmin</artifactId>
                 <version>1.2.4</version>

Modified: incubator/aries/trunk/web/web-itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/web/web-itests/pom.xml?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/web/web-itests/pom.xml (original)
+++ incubator/aries/trunk/web/web-itests/pom.xml Tue Dec 21 10:00:41 2010
@@ -66,6 +66,11 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.aries.proxy</groupId>
+            <artifactId>org.apache.aries.proxy</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint</artifactId>
             <scope>test</scope>

Modified: incubator/aries/trunk/web/web-itests/src/test/java/org/apache/aries/web/converter/itest/WabConverterITest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/web/web-itests/src/test/java/org/apache/aries/web/converter/itest/WabConverterITest.java?rev=1051440&r1=1051439&r2=1051440&view=diff
==============================================================================
--- incubator/aries/trunk/web/web-itests/src/test/java/org/apache/aries/web/converter/itest/WabConverterITest.java (original)
+++ incubator/aries/trunk/web/web-itests/src/test/java/org/apache/aries/web/converter/itest/WabConverterITest.java Tue Dec 21 10:00:41 2010
@@ -142,6 +142,8 @@ public class WabConverterITest {
         // Bundles
         mavenBundle("org.apache.aries.web","org.apache.aries.web.urlhandler"),
         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.osgi", "org.osgi.compendium"),
         mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit"),



Mime
View raw message