aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r1057359 [5/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...
Date Mon, 10 Jan 2011 21:03:26 GMT
Modified: aries/sandbox/jbohn/interceptor-proto/samples-sandbox/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples-sandbox/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples-sandbox/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples-sandbox/pom.xml Mon Jan 10 21:03:14 2011
@@ -20,13 +20,13 @@
     <parent>
         <groupId>org.apache.aries</groupId>
         <artifactId>java5-parent</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
     
     <groupId>org.apache.aries.samples</groupId>
-    <version>0.1-incubating-SNAPSHOT</version>
+    <version>0.1-SNAPSHOT</version>
     <artifactId>samples</artifactId>
     <name>Apache Aries Samples</name>
     <packaging>pom</packaging>
@@ -38,14 +38,14 @@
     </scm>
 
     <properties>
-        <ariesApplicationVersion>0.1-incubating-SNAPSHOT</ariesApplicationVersion>
-        <ariesBlueprintVersion>0.1-incubating-SNAPSHOT</ariesBlueprintVersion>
-        <ariesJmxVersion>0.1-incubating-SNAPSHOT</ariesJmxVersion>
-        <ariesJndiVersion>0.1-incubating-SNAPSHOT</ariesJndiVersion>
-        <ariesJpaVersion>0.1-incubating-SNAPSHOT</ariesJpaVersion>
-        <ariesTransactionVersion>0.1-incubating-SNAPSHOT</ariesTransactionVersion>
-        <ariesUtilVersion>0.1-incubating-SNAPSHOT</ariesUtilVersion>
-        <ariesWebVersion>0.1-incubating-SNAPSHOT</ariesWebVersion>
+        <ariesApplicationVersion>0.1-SNAPSHOT</ariesApplicationVersion>
+        <ariesBlueprintVersion>0.1-SNAPSHOT</ariesBlueprintVersion>
+        <ariesJmxVersion>0.1-SNAPSHOT</ariesJmxVersion>
+        <ariesJndiVersion>0.1-SNAPSHOT</ariesJndiVersion>
+        <ariesJpaVersion>0.1-SNAPSHOT</ariesJpaVersion>
+        <ariesTransactionVersion>0.1-SNAPSHOT</ariesTransactionVersion>
+        <ariesUtilVersion>0.1-SNAPSHOT</ariesUtilVersion>
+        <ariesWebVersion>0.1-SNAPSHOT</ariesWebVersion>
         <openjpaVersion>2.0.0-beta3</openjpaVersion>
     </properties>
     

Modified: aries/sandbox/jbohn/interceptor-proto/samples-sandbox/transaction-sample/osgi-jdbc-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples-sandbox/transaction-sample/osgi-jdbc-api/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples-sandbox/transaction-sample/osgi-jdbc-api/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples-sandbox/transaction-sample/osgi-jdbc-api/pom.xml Mon Jan 10 21:03:14 2011
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.aries.transaction-sample</groupId>
         <artifactId>transaction-sample</artifactId>
-        <version>0.1-incubating-SNAPSHOT</version>
+        <version>0.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.aries.samples</groupId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples-sandbox/transaction-sample/osgi-jdbc-derby/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples-sandbox/transaction-sample/osgi-jdbc-derby/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples-sandbox/transaction-sample/osgi-jdbc-derby/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples-sandbox/transaction-sample/osgi-jdbc-derby/pom.xml Mon Jan 10 21:03:14 2011
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.aries.transaction-sample</groupId>
         <artifactId>transaction-sample</artifactId>
-        <version>0.1-incubating-SNAPSHOT</version>
+        <version>0.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.aries.samples</groupId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples-sandbox/transaction-sample/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples-sandbox/transaction-sample/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples-sandbox/transaction-sample/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples-sandbox/transaction-sample/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.aries.samples</groupId>
         <artifactId>samples</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.aries.transaction-sample</groupId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples-sandbox/transaction-sample/transaction-assembly/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples-sandbox/transaction-sample/transaction-assembly/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples-sandbox/transaction-sample/transaction-assembly/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples-sandbox/transaction-sample/transaction-assembly/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.apache.aries.transaction-sample</groupId>
 		<artifactId>transaction-sample</artifactId>
-        <version>0.1-incubating-SNAPSHOT</version>
+        <version>0.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>transaction-assembly</artifactId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples-sandbox/transaction-sample/transaction-assembly/src/main/resources/configuration/config.ini
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples-sandbox/transaction-sample/transaction-assembly/src/main/resources/configuration/config.ini?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples-sandbox/transaction-sample/transaction-assembly/src/main/resources/configuration/config.ini (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples-sandbox/transaction-sample/transaction-assembly/src/main/resources/configuration/config.ini Mon Jan 10 21:03:14 2011
@@ -15,5 +15,5 @@
 # specific language governing permissions and limitations
 # under the License.
 
-osgi.bundles=cm-3.2.0-v20070116.jar@start,services-3.1.200-v20070605.jar@start,pax-logging-api-1.4.jar@start,pax-logging-service-1.4.jar@start,pax-web-jetty-bundle-0.7.2.jar@start,pax-web-extender-war-0.7.2.jar@start,pax-web-jsp-0.7.2.jar@start,osgi-jdbc-derby-1.0.0.jar@start,osgi-jdbc-api-1.0.0.jar@start,org.apache.aries.transaction-1.0.0-incubating-SNAPSHOT.jar@start,transaction-sample-web-1.0.0.jar@start
+osgi.bundles=cm-3.2.0-v20070116.jar@start,services-3.1.200-v20070605.jar@start,pax-logging-api-1.4.jar@start,pax-logging-service-1.4.jar@start,pax-web-jetty-bundle-0.7.2.jar@start,pax-web-extender-war-0.7.2.jar@start,pax-web-jsp-0.7.2.jar@start,osgi-jdbc-derby-1.0.0.jar@start,osgi-jdbc-api-1.0.0.jar@start,org.apache.aries.transaction-1.0.0-SNAPSHOT.jar@start,transaction-sample-web-1.0.0.jar@start
 eclipse.ignoreApp=true

Modified: aries/sandbox/jbohn/interceptor-proto/samples-sandbox/transaction-sample/transaction-sample-web/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples-sandbox/transaction-sample/transaction-sample-web/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples-sandbox/transaction-sample/transaction-sample-web/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples-sandbox/transaction-sample/transaction-sample-web/pom.xml Mon Jan 10 21:03:14 2011
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.aries.transaction-sample</groupId>
         <artifactId>transaction-sample</artifactId>
-        <version>0.1-incubating-SNAPSHOT</version>
+        <version>0.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.aries.samples</groupId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples-sandbox/words-sample/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples-sandbox/words-sample/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples-sandbox/words-sample/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples-sandbox/words-sample/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.aries.samples</groupId>
         <artifactId>samples</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
     <groupId>words</groupId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples-sandbox/words-sample/words-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples-sandbox/words-sample/words-api/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples-sandbox/words-sample/words-api/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples-sandbox/words-sample/words-api/pom.xml Mon Jan 10 21:03:14 2011
@@ -17,7 +17,7 @@
   <parent>
     <groupId>words</groupId>
     <artifactId>words</artifactId>
-    <version>0.3-incubating-SNAPSHOT</version>
+    <version>0.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>words-api</artifactId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples-sandbox/words-sample/words-assembly/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples-sandbox/words-sample/words-assembly/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples-sandbox/words-sample/words-assembly/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples-sandbox/words-sample/words-assembly/pom.xml Mon Jan 10 21:03:14 2011
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>words</groupId>
 		<artifactId>words</artifactId>
-		<version>0.3-incubating-SNAPSHOT</version>
+		<version>0.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>words-assembly</artifactId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples-sandbox/words-sample/words-datasource/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples-sandbox/words-sample/words-datasource/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples-sandbox/words-sample/words-datasource/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples-sandbox/words-sample/words-datasource/pom.xml Mon Jan 10 21:03:14 2011
@@ -15,7 +15,7 @@
   <parent>
     <groupId>words</groupId>
     <artifactId>words</artifactId>
-    <version>0.3-incubating-SNAPSHOT</version>
+    <version>0.3-SNAPSHOT</version>
   </parent>
   <groupId>words</groupId>
   <artifactId>words-datasource</artifactId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples-sandbox/words-sample/words-jpa/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples-sandbox/words-sample/words-jpa/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples-sandbox/words-sample/words-jpa/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples-sandbox/words-sample/words-jpa/pom.xml Mon Jan 10 21:03:14 2011
@@ -17,7 +17,7 @@
   <parent>
     <groupId>words</groupId>
     <artifactId>words</artifactId>
-    <version>0.3-incubating-SNAPSHOT</version>
+    <version>0.3-SNAPSHOT</version>
   </parent>
 
   <groupId>words</groupId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples-sandbox/words-sample/words-web/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples-sandbox/words-sample/words-web/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples-sandbox/words-sample/words-web/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples-sandbox/words-sample/words-web/pom.xml Mon Jan 10 21:03:14 2011
@@ -17,7 +17,7 @@
   <parent>
     <groupId>words</groupId>
     <artifactId>words</artifactId>
-    <version>0.3-incubating-SNAPSHOT</version>
+    <version>0.3-SNAPSHOT</version>
   </parent>
 
   <groupId>words</groupId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/ariestrader-all-eba/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/ariestrader-all-eba/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/ariestrader-all-eba/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/ariestrader-all-eba/pom.xml Mon Jan 10 21:03:14 2011
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.aries.samples.ariestrader</groupId>
 		<artifactId>assemblies</artifactId>
-		<version>0.3-incubating-SNAPSHOT</version>
+		<version>0.3-SNAPSHOT</version>
 	</parent>
     
     <groupId>org.apache.aries.samples.ariestrader</groupId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/ariestrader-jdbc-eba/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/ariestrader-jdbc-eba/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/ariestrader-jdbc-eba/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/ariestrader-jdbc-eba/pom.xml Mon Jan 10 21:03:14 2011
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.aries.samples.ariestrader</groupId>
 		<artifactId>assemblies</artifactId>
-		<version>0.3-incubating-SNAPSHOT</version>
+		<version>0.3-SNAPSHOT</version>
 	</parent>
     
     <groupId>org.apache.aries.samples.ariestrader</groupId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/equinox-test-harness/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/equinox-test-harness/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/equinox-test-harness/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/equinox-test-harness/pom.xml Mon Jan 10 21:03:14 2011
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.aries.samples.ariestrader</groupId>
         <artifactId>assemblies</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.aries.samples.ariestrader</groupId>
@@ -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: aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini Mon Jan 10 21:03:14 2011
@@ -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: aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/assemblies/pom.xml Mon Jan 10 21:03:14 2011
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.aries.samples.ariestrader</groupId>
         <artifactId>ariestrader</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.aries.samples.ariestrader</groupId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-api/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-api/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-api/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.aries.samples.ariestrader</groupId>
         <artifactId>modules</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.aries.samples.ariestrader</groupId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-beans/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-beans/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-beans/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-beans/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.aries.samples.ariestrader</groupId>
         <artifactId>modules</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.aries.samples.ariestrader</groupId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-core/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-core/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-core/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.aries.samples.ariestrader</groupId>
         <artifactId>modules</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.aries.samples.ariestrader</groupId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-derby-ds/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-derby-ds/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-derby-ds/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-derby-ds/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.aries.samples.ariestrader</groupId>
         <artifactId>modules</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.aries.samples.ariestrader</groupId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-entities/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-entities/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-entities/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-entities/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.aries.samples.ariestrader</groupId>
         <artifactId>modules</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.aries.samples.ariestrader</groupId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-persist-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-persist-jdbc/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-persist-jdbc/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-persist-jdbc/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.aries.samples.ariestrader</groupId>
         <artifactId>modules</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.aries.samples.ariestrader</groupId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-persist-jpa-am/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-persist-jpa-am/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-persist-jpa-am/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-persist-jpa-am/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.aries.samples.ariestrader</groupId>
         <artifactId>modules</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.aries.samples.ariestrader</groupId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-persist-jpa-cm/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-persist-jpa-cm/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-persist-jpa-cm/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-persist-jpa-cm/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.aries.samples.ariestrader</groupId>
         <artifactId>modules</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.aries.samples.ariestrader</groupId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-util/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-util/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-util/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-util/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.aries.samples.ariestrader</groupId>
         <artifactId>modules</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.aries.samples.ariestrader</groupId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-web/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-web/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-web/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/ariestrader-web/pom.xml Mon Jan 10 21:03:14 2011
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.aries.samples.ariestrader</groupId>
         <artifactId>modules</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.aries.samples.ariestrader</groupId>
@@ -78,6 +78,7 @@
                     javax.servlet*;version=2.5,
                     *
                   </Import-Package>
+                  <_wab>src/main/webapp</_wab>
                 </instructions>
               </configuration>
             </plugin>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/modules/pom.xml Mon Jan 10 21:03:14 2011
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.aries.samples.ariestrader</groupId>
         <artifactId>ariestrader</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.aries.samples.ariestrader</groupId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/ariestrader/pom.xml Mon Jan 10 21:03:14 2011
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.aries.samples</groupId>
         <artifactId>samples</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.aries.samples.ariestrader</groupId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-api/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-api/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-api/pom.xml Mon Jan 10 21:03:14 2011
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.aries.samples.blog</groupId>
         <artifactId>blog</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.apache.aries.samples.blog.api</artifactId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-assembly/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-assembly/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-assembly/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-assembly/pom.xml Mon Jan 10 21:03:14 2011
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.apache.aries.samples.blog</groupId>
 		<artifactId>blog</artifactId>
-		<version>0.3-incubating-SNAPSHOT</version>
+		<version>0.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.apache.aries.samples.blog.assembly</artifactId>
@@ -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: aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini Mon Jan 10 21:03:14 2011
@@ -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: aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-biz/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-biz/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-biz/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-biz/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.aries.samples.blog</groupId>
         <artifactId>blog</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
 	<artifactId>org.apache.aries.samples.blog.biz</artifactId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-datasource/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-datasource/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-datasource/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-datasource/pom.xml Mon Jan 10 21:03:14 2011
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.aries.samples.blog</groupId>
         <artifactId>blog</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
   <groupId>org.apache.aries.samples.blog</groupId>
   <artifactId>org.apache.aries.samples.blog.datasource</artifactId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.aries.samples.blog</groupId>
         <artifactId>blog</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.apache.aries.samples.blog.itests</artifactId>
@@ -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>
@@ -400,14 +406,14 @@
 		<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>
       		<scope>provided</scope>
 		</dependency>
 		
 		<dependency>
       		<groupId>org.apache.aries.quiesce</groupId>
       		<artifactId>org.apache.aries.quiesce.manager</artifactId>
-      		<version>0.3-incubating-SNAPSHOT</version>
+      		<version>0.3-SNAPSHOT</version>
       		<scope>provided</scope>
 		</dependency>
 		

Modified: aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java Mon Jan 10 21:03:14 2011
@@ -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: aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java Mon Jan 10 21:03:14 2011
@@ -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: aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java Mon Jan 10 21:03:14 2011
@@ -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: aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-jdbc-eba/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-jdbc-eba/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-jdbc-eba/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-jdbc-eba/pom.xml Mon Jan 10 21:03:14 2011
@@ -26,7 +26,7 @@ under the License.
     <parent>
         <groupId>org.apache.aries.samples.blog</groupId>
         <artifactId>blog</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.aries.samples.blog</groupId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-jpa-eba/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-jpa-eba/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-jpa-eba/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-jpa-eba/pom.xml Mon Jan 10 21:03:14 2011
@@ -26,7 +26,7 @@ under the License.
     <parent>
         <groupId>org.apache.aries.samples.blog</groupId>
         <artifactId>blog</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.aries.samples.blog</groupId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-persistence-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-persistence-jdbc/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-persistence-jdbc/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-persistence-jdbc/pom.xml Mon Jan 10 21:03:14 2011
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.aries.samples.blog</groupId>
         <artifactId>blog</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.aries.samples.blog</groupId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-persistence-jpa/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-persistence-jpa/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-persistence-jpa/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-persistence-jpa/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.apache.aries.samples.blog</groupId>
 		<artifactId>blog</artifactId>
-		<version>0.3-incubating-SNAPSHOT</version>
+		<version>0.3-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.apache.aries.samples.blog</groupId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-web/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-web/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-web/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/blog/blog-web/pom.xml Mon Jan 10 21:03:14 2011
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.aries.samples.blog</groupId>
         <artifactId>blog</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.aries.samples.blog</groupId>
@@ -56,7 +56,8 @@
                             javax.servlet*;version=2.5,
                             *
                         </Import-Package>
-                    </instructions>
+                        <_wab>src/main/webapp/</_wab>
+                   </instructions>
                 </configuration>
             </plugin>
         </plugins>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/blog/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/blog/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/blog/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/blog/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.aries.samples</groupId>
         <artifactId>samples</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.aries.samples.blog</groupId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/blueprint/helloworld/helloworld-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/blueprint/helloworld/helloworld-api/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/blueprint/helloworld/helloworld-api/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/blueprint/helloworld/helloworld-api/pom.xml Mon Jan 10 21:03:14 2011
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.aries.samples.blueprint.helloworld</groupId>
         <artifactId>helloworld</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.apache.aries.samples.blueprint.helloworld.api</artifactId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/blueprint/helloworld/helloworld-assembly/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/blueprint/helloworld/helloworld-assembly/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/blueprint/helloworld/helloworld-assembly/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/blueprint/helloworld/helloworld-assembly/pom.xml Mon Jan 10 21:03:14 2011
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.aries.samples.blueprint.helloworld</groupId>
         <artifactId>helloworld</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.apache.aries.samples.blueprint.helloworld.assembly</artifactId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/blueprint/helloworld/helloworld-client/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/blueprint/helloworld/helloworld-client/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/blueprint/helloworld/helloworld-client/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/blueprint/helloworld/helloworld-client/pom.xml Mon Jan 10 21:03:14 2011
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>org.apache.aries.samples.blueprint.helloworld</groupId>
 		<artifactId>helloworld</artifactId>
-		<version>0.3-incubating-SNAPSHOT</version>
+		<version>0.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.apache.aries.samples.blueprint.helloworld.client</artifactId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/blueprint/helloworld/helloworld-server/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/blueprint/helloworld/helloworld-server/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/blueprint/helloworld/helloworld-server/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/blueprint/helloworld/helloworld-server/pom.xml Mon Jan 10 21:03:14 2011
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.aries.samples.blueprint.helloworld</groupId>
         <artifactId>helloworld</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.apache.aries.samples.blueprint.helloworld.server</artifactId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/blueprint/helloworld/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/blueprint/helloworld/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/blueprint/helloworld/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/blueprint/helloworld/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
 	<parent>
 	<groupId>org.apache.aries.samples.blueprint</groupId>
 	        <artifactId>blueprint</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
         </parent>
 
 	<groupId>org.apache.aries.samples.blueprint.helloworld</groupId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/blueprint/idverifier/idverifier-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/blueprint/idverifier/idverifier-api/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/blueprint/idverifier/idverifier-api/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/blueprint/idverifier/idverifier-api/pom.xml Mon Jan 10 21:03:14 2011
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.aries.samples.blueprint.idverifier</groupId>
     	<artifactId>idverifier</artifactId>
-    	<version>0.3-incubating-SNAPSHOT</version>
+    	<version>0.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.apache.aries.samples.blueprint.idverifier.api</artifactId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/blueprint/idverifier/idverifier-assembly/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/blueprint/idverifier/idverifier-assembly/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/blueprint/idverifier/idverifier-assembly/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/blueprint/idverifier/idverifier-assembly/pom.xml Mon Jan 10 21:03:14 2011
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>org.apache.aries.samples.blueprint.idverifier</groupId>
 		<artifactId>idverifier</artifactId>
-		<version>0.3-incubating-SNAPSHOT</version>
+		<version>0.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.apache.aries.samples.blueprint.idverifier.assembly</artifactId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/blueprint/idverifier/idverifier-client/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/blueprint/idverifier/idverifier-client/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/blueprint/idverifier/idverifier-client/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/blueprint/idverifier/idverifier-client/pom.xml Mon Jan 10 21:03:14 2011
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.aries.samples.blueprint.idverifier</groupId>
         <artifactId>idverifier</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.apache.aries.samples.blueprint.idverifier.client</artifactId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/blueprint/idverifier/idverifier-server/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/blueprint/idverifier/idverifier-server/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/blueprint/idverifier/idverifier-server/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/blueprint/idverifier/idverifier-server/pom.xml Mon Jan 10 21:03:14 2011
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.aries.samples.blueprint.idverifier</groupId>
     	<artifactId>idverifier</artifactId>
-    	<version>0.3-incubating-SNAPSHOT</version>
+    	<version>0.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.apache.aries.samples.blueprint.idverifier.server</artifactId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/blueprint/idverifier/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/blueprint/idverifier/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/blueprint/idverifier/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/blueprint/idverifier/pom.xml Mon Jan 10 21:03:14 2011
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.aries.samples.blueprint</groupId>
         <artifactId>blueprint</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.aries.samples.blueprint.idverifier</groupId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/blueprint/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/blueprint/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/blueprint/pom.xml Mon Jan 10 21:03:14 2011
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.aries.samples</groupId>
         <artifactId>samples</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.aries.samples.blueprint</groupId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-api/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-api/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-api/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.aries.samples.goat</groupId>
         <artifactId>goat</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.apache.aries.samples.goat.api</artifactId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-assembly/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-assembly/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-assembly/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-assembly/pom.xml Mon Jan 10 21:03:14 2011
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.apache.aries.samples.goat</groupId>
 		<artifactId>goat</artifactId>
-		<version>0.3-incubating-SNAPSHOT</version>
+		<version>0.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.apache.aries.samples.goat.assembly</artifactId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-bundlecontext-modelprovider/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-bundlecontext-modelprovider/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-bundlecontext-modelprovider/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-bundlecontext-modelprovider/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.aries.samples.goat</groupId>
         <artifactId>goat</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.apache.aries.samples.goat.bundlecontextmodel</artifactId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-dummy-provider/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-dummy-provider/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-dummy-provider/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-dummy-provider/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.aries.samples.goat</groupId>
         <artifactId>goat</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.apache.aries.samples.goat.dummy</artifactId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-dummy2-provider/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-dummy2-provider/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-dummy2-provider/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-dummy2-provider/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.aries.samples.goat</groupId>
         <artifactId>goat</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.apache.aries.samples.goat.dummy2</artifactId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-eba/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-eba/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-eba/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-eba/pom.xml Mon Jan 10 21:03:14 2011
@@ -26,7 +26,7 @@ under the License.
     <parent>
         <groupId>org.apache.aries.samples</groupId>
         <artifactId>samples</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.aries.samples.goat</groupId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-info-enhancer/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-info-enhancer/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-info-enhancer/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-info-enhancer/pom.xml Mon Jan 10 21:03:14 2011
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.apache.aries.samples.goat</groupId>
 		<artifactId>goat</artifactId>
-		<version>0.3-incubating-SNAPSHOT</version>
+		<version>0.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.apache.aries.samples.goat.info.enhancer</artifactId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-web/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-web/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-web/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/goat/goat-web/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.aries.samples.goat</groupId>
         <artifactId>goat</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.apache.aries.samples.goat.web</artifactId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/goat/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/goat/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/goat/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/goat/pom.xml Mon Jan 10 21:03:14 2011
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.aries.samples</groupId>
         <artifactId>samples</artifactId>
-        <version>0.3-incubating-SNAPSHOT</version>
+        <version>0.3-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.aries.samples.goat</groupId>

Modified: aries/sandbox/jbohn/interceptor-proto/samples/pom.xml
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/samples/pom.xml?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/samples/pom.xml (original)
+++ aries/sandbox/jbohn/interceptor-proto/samples/pom.xml Mon Jan 10 21:03:14 2011
@@ -20,14 +20,14 @@
     <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>
     
     <modelVersion>4.0.0</modelVersion>
     
     <groupId>org.apache.aries.samples</groupId>
-    <version>0.3-incubating-SNAPSHOT</version>
+    <version>0.3-SNAPSHOT</version>
     <artifactId>samples</artifactId>
     <name>Apache Aries Samples</name>
     <packaging>pom</packaging>
@@ -39,14 +39,15 @@
     </scm>
 
     <properties>
-        <ariesApplicationVersion>0.3-incubating-SNAPSHOT</ariesApplicationVersion>
-        <ariesBlueprintVersion>0.3-incubating-SNAPSHOT</ariesBlueprintVersion>
-        <ariesJmxVersion>0.3-incubating-SNAPSHOT</ariesJmxVersion>
-        <ariesJndiVersion>0.3-incubating-SNAPSHOT</ariesJndiVersion>
-        <ariesJpaVersion>0.3-incubating-SNAPSHOT</ariesJpaVersion>
-        <ariesTransactionVersion>0.3-incubating-SNAPSHOT</ariesTransactionVersion>
-        <ariesUtilVersion>0.3-incubating-SNAPSHOT</ariesUtilVersion>
-        <ariesWebVersion>0.3-incubating-SNAPSHOT</ariesWebVersion>
+        <ariesApplicationVersion>0.3-SNAPSHOT</ariesApplicationVersion>
+        <ariesBlueprintVersion>0.3-SNAPSHOT</ariesBlueprintVersion>
+        <ariesJmxVersion>0.3-SNAPSHOT</ariesJmxVersion>
+        <ariesJndiVersion>0.3-SNAPSHOT</ariesJndiVersion>
+        <ariesJpaVersion>0.3-SNAPSHOT</ariesJpaVersion>
+        <ariesProxyVersion>0.3-SNAPSHOT</ariesProxyVersion>
+        <ariesTransactionVersion>0.3-SNAPSHOT</ariesTransactionVersion>
+        <ariesUtilVersion>0.3-SNAPSHOT</ariesUtilVersion>
+        <ariesWebVersion>0.3-SNAPSHOT</ariesWebVersion>
         <openjpaVersion>2.0.0</openjpaVersion>
         <geronimoJpaSpecVersion>1.1</geronimoJpaSpecVersion>
         <geronimoJtaSpecVersion>1.1.1</geronimoJtaSpecVersion>
@@ -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: aries/sandbox/jbohn/interceptor-proto/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/Activator.java
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/Activator.java?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/Activator.java (original)
+++ aries/sandbox/jbohn/interceptor-proto/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/Activator.java Mon Jan 10 21:03:14 2011
@@ -18,13 +18,18 @@
  */
 package org.apache.aries.spifly;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.TreeMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.CopyOnWriteArraySet;
 
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleActivator;
@@ -37,36 +42,43 @@ import org.osgi.util.tracker.BundleTrack
 import org.osgi.util.tracker.ServiceTracker;
 
 public class Activator implements BundleActivator {
+    // Provide static access to this activator. The bundle must therefore be a singleton.
     static Activator activator;
-    
+
+    private BundleContext bundleContext;
     private ServiceRegistration<WeavingHook> weavingHookService;
-    private LogServiceTracker lst;
+    private LogServiceTracker logServiceTracker;
     private List<LogService> logServices = new CopyOnWriteArrayList<LogService>();
-    private BundleTracker<List<ServiceRegistration<?>>> bt;
+    private BundleTracker<List<ServiceRegistration<?>>> bundleTracker;
 
-    private final ConcurrentMap<String, Collection<Bundle>>registeredSPIs = 
-            new ConcurrentHashMap<String, Collection<Bundle>>();
+    private final ConcurrentMap<String, SortedMap<Long, Bundle>> registeredProviders = 
+            new ConcurrentHashMap<String, SortedMap<Long, Bundle>>();
 
+    private final ConcurrentMap<Bundle, Map<ConsumerRestriction, List<BundleDescriptor>>> consumerRestrictions = 
+            new ConcurrentHashMap<Bundle, Map<ConsumerRestriction, List<BundleDescriptor>>>(); 
+    
     public synchronized void start(BundleContext context) throws Exception {
-        lst = new LogServiceTracker(context);
-        lst.open();
+        bundleContext = context;
+        
+        logServiceTracker = new LogServiceTracker(context);
+        logServiceTracker.open();
 
         WeavingHook wh = new ClientWeavingHook(context);
         weavingHookService = context.registerService(WeavingHook.class, wh,
                 null);
 
-        bt = new BundleTracker<List<ServiceRegistration<?>>>(context,
+        bundleTracker = new BundleTracker<List<ServiceRegistration<?>>>(context,
                 Bundle.ACTIVE, new ProviderBundleTrackerCustomizer(this, context.getBundle()));
-        bt.open();
+        bundleTracker.open();
         
         activator = this;
     }
 
     public synchronized void stop(BundleContext context) throws Exception {
         activator = null;
-        bt.close();
+        bundleTracker.close();
         weavingHookService.unregister();
-        lst.close();
+        logServiceTracker.close();
     }
 
     void log(int level, String message) {
@@ -85,6 +97,65 @@ public class Activator implements Bundle
         }
     }
 
+    public void registerProviderBundle(String registrationClassName, Bundle bundle) {        
+        registeredProviders.putIfAbsent(registrationClassName, Collections.synchronizedSortedMap(new TreeMap<Long, Bundle>()));
+        SortedMap<Long, Bundle> map = registeredProviders.get(registrationClassName);
+        map.put(bundle.getBundleId(), bundle);
+    }
+
+    public Collection<Bundle> findProviderBundles(String name) {
+        SortedMap<Long, Bundle> map = registeredProviders.get(name);
+        return map == null ? Collections.<Bundle>emptyList() : map.values();
+    }
+    
+    // TODO unRegisterProviderBundle();
+    public void registerConsumerBundle( Bundle consumerBundle,
+            Set<ConsumerRestriction> restrictions, List<BundleDescriptor> allowedBundles) {
+        consumerRestrictions.putIfAbsent(consumerBundle, new HashMap<ConsumerRestriction, List<BundleDescriptor>>());
+        Map<ConsumerRestriction, List<BundleDescriptor>> map = consumerRestrictions.get(consumerBundle);
+        for (ConsumerRestriction restriction : restrictions) {
+            map.put(restriction, allowedBundles);
+        }
+    }
+
+    public Collection<Bundle> findConsumerRestrictions(Bundle consumer, String className, String methodName,
+            Map<Pair<Integer, String>, String> args) {
+        Map<ConsumerRestriction, List<BundleDescriptor>> restrictions = consumerRestrictions.get(consumer);
+        if (restrictions == null) {
+            // Null means: no restrictions
+            return null;
+        }
+        
+        for (Map.Entry<ConsumerRestriction, List<BundleDescriptor>> entry : restrictions.entrySet()) {
+            if (entry.getKey().matches(className, methodName, args)) {
+                return getBundles(entry.getValue());
+            }
+        }
+        
+        // Empty collection: nothing matches
+        return Collections.emptySet();
+    }
+
+    private Collection<Bundle> getBundles(List<BundleDescriptor> descriptors) {
+        if (descriptors == null) {
+            return null;
+        }
+        
+        List<Bundle> bundles = new ArrayList<Bundle>();
+        for (Bundle b : bundleContext.getBundles()) {
+            for (BundleDescriptor desc : descriptors) {
+                if (b.getSymbolicName().equals(desc.getSymbolicName())) {
+                    if (desc.getVersion() == null || b.getVersion().equals(desc.getVersion())) {
+                        bundles.add(b);
+                    }
+                }
+            }
+        }
+        return bundles;
+    }
+
+    // TODO unRegisterConsumerBundle();
+    
     private class LogServiceTracker extends ServiceTracker<LogService, LogService> {
         public LogServiceTracker(BundleContext context) {
             super(context, LogService.class, null);
@@ -102,15 +173,4 @@ public class Activator implements Bundle
             logServices.remove(service);
         }        
     }
-
-    public void registerSPIProviderBundle(String registrationClassName, Bundle bundle) {
-        registeredSPIs.putIfAbsent(registrationClassName, new CopyOnWriteArraySet<Bundle>());
-        Collection<Bundle> bl = registeredSPIs.get(registrationClassName);
-        bl.add(bundle);
-    }
-
-    public Collection<Bundle> findSPIProviderBundles(String name) {
-        Collection<Bundle> bundles = registeredSPIs.get(name);
-        return bundles == null ? Collections.<Bundle>emptyList() : bundles;
-    }
 }

Modified: aries/sandbox/jbohn/interceptor-proto/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/ClientWeavingHook.java
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/ClientWeavingHook.java?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/ClientWeavingHook.java (original)
+++ aries/sandbox/jbohn/interceptor-proto/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/ClientWeavingHook.java Mon Jan 10 21:03:14 2011
@@ -18,11 +18,19 @@
  */
 package org.apache.aries.spifly;
 
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.ServiceLoader;
+import java.util.Set;
+
+import org.apache.aries.spifly.HeaderParser.PathElement;
 import org.apache.aries.spifly.api.SpiFlyConstants;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.Version;
 import org.osgi.framework.hooks.weaving.WeavingHook;
 import org.osgi.framework.hooks.weaving.WovenClass;
 import org.osgi.service.log.LogService;
@@ -42,16 +50,163 @@ public class ClientWeavingHook implement
     
 	@Override
 	public void weave(WovenClass wovenClass) {
-	    if (wovenClass.getBundleWiring().getBundle().getHeaders().get(SpiFlyConstants.SPI_CONSUMER_HEADER) != null) {
-	        Activator.activator.log(LogService.LOG_DEBUG, "Weaving class " + wovenClass.getClassName());
-	        System.out.println("*** WovenClass: " + wovenClass.getClassName());
+	    Bundle consumerBundle = wovenClass.getBundleWiring().getBundle();
+        String consumerHeader = consumerBundle.getHeaders().get(SpiFlyConstants.SPI_CONSUMER_HEADER);
+        if (consumerHeader != null) {
+	        Activator.activator.log(LogService.LOG_DEBUG, "Weaving class " + wovenClass.getClassName());            
+            
+            WeavingData[] wd = processHeader(consumerBundle, consumerHeader);
 	        
 	        ClassReader cr = new ClassReader(wovenClass.getBytes());
 	        ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS | ClassWriter.COMPUTE_FRAMES);
-	        TCCLSetterVisitor tsv = new TCCLSetterVisitor(cw, wovenClass.getClassName());
-	        cr.accept(tsv, 0);
+	        TCCLSetterVisitor tsv = new TCCLSetterVisitor(cw, wovenClass.getClassName(), wd);
+	        cr.accept(tsv, 0);	        
 	        wovenClass.setBytes(cw.toByteArray());
-	        wovenClass.getDynamicImports().add(addedImport);
+	        if (tsv.additionalImportRequired())
+	            wovenClass.getDynamicImports().add(addedImport);
 	    }			
 	}
+
+	/**
+	 * Parses headers of the following syntax:
+	 * <ul>
+	 * <li><tt>org.acme.MyClass#myMethod</tt> - apply the weaving to all overloads of <tt>myMethod()</tt> 
+	 * in <tt>MyClass</tt>
+	 * <li><tt>org.acme.MyClass#myMethod(java.lang.String, java.util.List)</tt> - apply the weaving only 
+	 * to the <tt>myMethod(String, List)</tt> overload in <tt>MyClass</tt>
+	 * <li><tt>org.acme.MyClass#myMethod()</tt> - apply the weaving only to the noarg overload of 
+	 * <tt>myMethod()</tt>
+	 * <li><b>true</b> - equivalend to <tt>java.util.ServiceLoader#load(java.lang.Class)</tt>
+	 * </ul>
+	 * Additionally, it registers the consumer's contraints with the consumer registry in the activator, if the 
+	 * consumer is only constrained to a certain set of bundles.<p/>
+	 * 
+	 * The following attributes are supported:
+	 * <ul>
+	 * <li><tt>bundle</tt> - restrict wiring to the bundle with the specifies Symbolic Name. The attribute value 
+	 * is a list of bundle identifiers separated by a '|' sign. The bundle identifier starts with the Symbolic name
+	 * and can optionally contain a version suffix. E.g. bundle=impl2:version=1.2.3 or bundle=impl2|impl4.  
+	 * <li><tt>bundleId</tt> - restrict wiring to the bundle with the specified bundle ID. Typically used when 
+	 * the service should be forceably picked up from the system bundle (<tt>bundleId=0</tt>). Multiple bundle IDs 
+	 * can be specified separated by a '|' sign. 
+	 * </ul>
+	 * 
+	 * @param consumerBundle the consuming bundle.
+	 * @param consumerHeader the <tt>SPI-Consumer</tt> header.
+	 * @return an instance of the {@link WeavingData} class.
+	 */
+    private WeavingData[] processHeader(Bundle consumerBundle, String consumerHeader) {
+        Set<WeavingData> weavingData = new HashSet<WeavingData>();
+        
+        for (PathElement element : HeaderParser.parseHeader(consumerHeader)) {
+            List<BundleDescriptor> allowedBundles = new ArrayList<BundleDescriptor>();
+            String name = element.getName().trim();
+
+            String className;
+            String methodName;
+            MethodRestriction methodRestriction;
+            
+            int hashIdx = name.indexOf('#');
+            if (hashIdx > 0) {                
+                className = name.substring(0, hashIdx);
+                int braceIdx = name.substring(hashIdx).indexOf('(');
+                if (braceIdx > 0) {
+                    methodName = name.substring(hashIdx + 1, hashIdx + braceIdx);
+                    ArgRestrictions argRestrictions = new ArgRestrictions();
+                    int closeIdx = name.substring(hashIdx).indexOf(')');
+                    if (closeIdx > 0) {
+                        String classes = name.substring(hashIdx + braceIdx + 1, hashIdx + closeIdx).trim();
+                        if (classes.length() > 0) {
+                            if (classes.indexOf('[') > 0) {
+                                int argNumber = 0;
+                                for (String s : classes.split(",")) {
+                                    int idx = s.indexOf('[');
+                                    int end = s.indexOf(']', idx);
+                                    if (idx > 0 && end > idx) {
+                                        argRestrictions.addRestriction(argNumber, s.substring(0, idx), s.substring(idx + 1, end));
+                                    } else {
+                                        argRestrictions.addRestriction(argNumber, s);
+                                    }
+                                    argNumber++;
+                                }
+                            } else {
+                                String[] classNames = classes.split(",");
+                                for (int i = 0; i < classNames.length; i++) {
+                                    argRestrictions.addRestriction(i, classNames[i]);
+                                }
+                            }
+                        } else {
+                            argRestrictions = null;
+                        }
+                    }
+                    methodRestriction = new MethodRestriction(methodName, argRestrictions);
+                } else {
+                    methodName = name.substring(hashIdx + 1);
+                    methodRestriction = new MethodRestriction(methodName);
+                }
+            } else {
+                if ("true".equalsIgnoreCase(name)) {
+                    className = ServiceLoader.class.getName();
+                    methodName = "load";
+                    ArgRestrictions argRestrictions = new ArgRestrictions();
+                    argRestrictions.addRestriction(0, Class.class.getName());
+                    methodRestriction = new MethodRestriction(methodName, argRestrictions);
+                } else {
+                    throw new IllegalArgumentException("Must at least specify class name and method name: " + name);
+                }
+            }  
+            ConsumerRestriction restriction = new ConsumerRestriction(className, methodRestriction);
+
+            Set<ConsumerRestriction> restrictions = new HashSet<ConsumerRestriction>();
+            restrictions.add(restriction);
+                
+            String bsn = element.getAttribute("bundle");
+            if (bsn != null) {
+                bsn = bsn.trim();
+                if (bsn.length() > 0) {
+                    for (String s : bsn.split("\\|")) {
+                        int colonIdx = s.indexOf(':');
+                        if (colonIdx > 0) {
+                            String sn = s.substring(0, colonIdx);
+                            String versionSfx = s.substring(colonIdx + 1);
+                            if (versionSfx.startsWith("version=")) {
+                                allowedBundles.add(new BundleDescriptor(sn, 
+                                        Version.parseVersion(versionSfx.substring("version=".length()))));
+                            } else {
+                                allowedBundles.add(new BundleDescriptor(sn));
+                            }
+                        } else {
+                            allowedBundles.add(new BundleDescriptor(s));
+                        }
+                    }
+                }
+            }
+                        
+            String bid = element.getAttribute("bundleId");
+            if (bid != null) {
+                bid = bid.trim();
+                if (bid.length() > 0) {
+                    for (String s : bid.split("\\|")) {
+                        for (Bundle b : consumerBundle.getBundleContext().getBundles()) {
+                            if (("" + b.getBundleId()).equals(s)) {                       
+                                allowedBundles.add(new BundleDescriptor(b.getSymbolicName()));
+                                break;                        
+                            }
+                        }                        
+                    }
+                }
+            }
+            
+            // TODO fix log message
+            // Activator.activator.log(LogService.LOG_INFO, "Weaving " + className + "#" + methodName + " from bundle " + 
+            //    consumerBundle.getSymbolicName() + " to " + (allowedBundles.size() == 0 ? " any provider" : allowedBundles));
+                        
+            Activator.activator.registerConsumerBundle(consumerBundle, restrictions, 
+                    allowedBundles.size() == 0 ? null : allowedBundles);           
+            String[] argClasses = restriction.getMethodRestriction(methodName).getArgClasses();
+
+            weavingData.add(new WeavingData(className, methodName, argClasses));
+        }
+        return weavingData.toArray(new WeavingData [weavingData.size()]);
+    }
 }

Modified: aries/sandbox/jbohn/interceptor-proto/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/HeaderParser.java
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/HeaderParser.java?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/HeaderParser.java (original)
+++ aries/sandbox/jbohn/interceptor-proto/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/HeaderParser.java Mon Jan 10 21:03:14 2011
@@ -29,7 +29,8 @@ import java.util.Map;
  * Stolen from Aries Blueprint Core (blueprint.utils). Need to give it back! 
  */
 public class HeaderParser  {
-
+    private HeaderParser() {}
+    
     /**
      * Parse a given OSGi header into a list of paths
      *

Modified: aries/sandbox/jbohn/interceptor-proto/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/MultiDelegationClassloader.java
URL: http://svn.apache.org/viewvc/aries/sandbox/jbohn/interceptor-proto/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/MultiDelegationClassloader.java?rev=1057359&r1=1057358&r2=1057359&view=diff
==============================================================================
--- aries/sandbox/jbohn/interceptor-proto/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/MultiDelegationClassloader.java (original)
+++ aries/sandbox/jbohn/interceptor-proto/spi-fly/contrib/pilot_using_weavinghook/SpiFly/src/org/apache/aries/spifly/MultiDelegationClassloader.java Mon Jan 10 21:03:14 2011
@@ -26,6 +26,12 @@ import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
 
+/** A classloader that delegates to a number of other classloaders.
+ * This classloader can be used if a single classloader is needed that has
+ * vibisility of a number of other classloaders. For example if a Thread Context
+ * Classloader is needed that has visibility of a number of bundles so that 
+ * ServiceLoader.load() can find all the services provided by these bundles.
+ */
 public class MultiDelegationClassloader extends ClassLoader {
     private final ClassLoader[] delegates;
     



Mime
View raw message