incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r820271 [3/3] - in /incubator/aries/trunk/blueprint: blueprint-bundle/ blueprint-cm/ blueprint-cm/src/main/java/org/apache/aries/ blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/ blueprint-cm/src/main/java/org/apache/ger...
Date Wed, 30 Sep 2009 13:58:33 GMT
Modified: incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/BeanD.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/BeanD.java?rev=820271&r1=820177&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/BeanD.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/BeanD.java Wed Sep 30 13:58:29 2009
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.geronimo.blueprint.pojos;
+package org.apache.aries.blueprint.pojos;
 
-import org.apache.geronimo.blueprint.CallbackTracker;
-import org.apache.geronimo.blueprint.CallbackTracker.Callback;
+import org.apache.aries.blueprint.CallbackTracker;
+import org.apache.aries.blueprint.CallbackTracker.Callback;
 
 public class BeanD {
 

Modified: incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/BeanE.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/BeanE.java?rev=820271&r1=820177&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/BeanE.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/BeanE.java Wed Sep 30 13:58:29 2009
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.geronimo.blueprint.pojos;
+package org.apache.aries.blueprint.pojos;
 
-import org.apache.geronimo.blueprint.CallbackTracker;
-import org.apache.geronimo.blueprint.CallbackTracker.Callback;
+import org.apache.aries.blueprint.CallbackTracker;
+import org.apache.aries.blueprint.CallbackTracker.Callback;
 
 public class BeanE {
 

Modified: incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/BeanF.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/BeanF.java?rev=820271&r1=820177&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/BeanF.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/BeanF.java Wed Sep 30 13:58:29 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.geronimo.blueprint.pojos;
+package org.apache.aries.blueprint.pojos;
 
 public class BeanF {
 

Modified: incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/ConverterA.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/ConverterA.java?rev=820271&r1=820177&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/ConverterA.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/ConverterA.java Wed Sep 30 13:58:29 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.geronimo.blueprint.pojos;
+package org.apache.aries.blueprint.pojos;
 
 import java.io.File;
 

Modified: incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/ConverterB.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/ConverterB.java?rev=820271&r1=820177&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/ConverterB.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/ConverterB.java Wed Sep 30 13:58:29 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.geronimo.blueprint.pojos;
+package org.apache.aries.blueprint.pojos;
 
 import java.net.URI;
 

Modified: incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/InterfaceA.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/InterfaceA.java?rev=820271&r1=820177&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/InterfaceA.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/InterfaceA.java Wed Sep 30 13:58:29 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.geronimo.blueprint.pojos;
+package org.apache.aries.blueprint.pojos;
 
 public interface InterfaceA {
 }

Modified: incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/ListenerA.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/ListenerA.java?rev=820271&r1=820177&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/ListenerA.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/ListenerA.java Wed Sep 30 13:58:29 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.geronimo.blueprint.pojos;
+package org.apache.aries.blueprint.pojos;
 
 import org.osgi.framework.ServiceReference;
 

Modified: incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/Multiple.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/Multiple.java?rev=820271&r1=820177&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/Multiple.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/Multiple.java Wed Sep 30 13:58:29 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.geronimo.blueprint.pojos;
+package org.apache.aries.blueprint.pojos;
 
 import java.util.Map;
 import java.util.Properties;

Modified: incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/PojoA.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/PojoA.java?rev=820271&r1=820177&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/PojoA.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/PojoA.java Wed Sep 30 13:58:29 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.geronimo.blueprint.pojos;
+package org.apache.aries.blueprint.pojos;
 
 import java.util.List;
 import java.util.Map;

Modified: incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/PojoB.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/PojoB.java?rev=820271&r1=820177&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/PojoB.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/PojoB.java Wed Sep 30 13:58:29 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.geronimo.blueprint.pojos;
+package org.apache.aries.blueprint.pojos;
 
 import java.net.URI;
 import java.util.List;

Modified: incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/PojoCircular.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/PojoCircular.java?rev=820271&r1=820177&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/PojoCircular.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/PojoCircular.java Wed Sep 30 13:58:29 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.geronimo.blueprint.pojos;
+package org.apache.aries.blueprint.pojos;
 
 public class PojoCircular {
 

Modified: incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/PojoGenerics.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/PojoGenerics.java?rev=820271&r1=820177&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/PojoGenerics.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/PojoGenerics.java Wed Sep 30 13:58:29 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.geronimo.blueprint.pojos;
+package org.apache.aries.blueprint.pojos;
 
 import java.util.List;
 import java.util.Map;

Modified: incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/PojoListener.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/PojoListener.java?rev=820271&r1=820177&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/PojoListener.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/PojoListener.java Wed Sep 30 13:58:29 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.geronimo.blueprint.pojos;
+package org.apache.aries.blueprint.pojos;
 
 import java.util.Map;
 

Modified: incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/PojoRecursive.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/PojoRecursive.java?rev=820271&r1=820177&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/PojoRecursive.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/pojos/PojoRecursive.java Wed Sep 30 13:58:29 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.geronimo.blueprint.pojos;
+package org.apache.aries.blueprint.pojos;
 
 import org.osgi.service.blueprint.container.BlueprintContainer;
 

Modified: incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/utils/DynamicCollectionTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/utils/DynamicCollectionTest.java?rev=820271&r1=820177&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/utils/DynamicCollectionTest.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/utils/DynamicCollectionTest.java Wed Sep 30 13:58:29 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.geronimo.blueprint.utils;
+package org.apache.aries.blueprint.utils;
 
 import java.util.Iterator;
 

Modified: incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/utils/HeaderParserTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/utils/HeaderParserTest.java?rev=820271&r1=820177&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/utils/HeaderParserTest.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/utils/HeaderParserTest.java Wed Sep 30 13:58:29 2009
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.geronimo.blueprint.utils;
+package org.apache.aries.blueprint.utils;
 
 import java.util.List;
 
 import junit.framework.TestCase;
-import org.apache.geronimo.blueprint.utils.HeaderParser.PathElement;
+import org.apache.aries.blueprint.utils.HeaderParser.PathElement;
 
 public class HeaderParserTest extends TestCase {
 

Modified: incubator/aries/trunk/blueprint/blueprint-core/src/test/resources/test-bad-id-ref.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-core/src/test/resources/test-bad-id-ref.xml?rev=820271&r1=820270&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/test/resources/test-bad-id-ref.xml (original)
+++ incubator/aries/trunk/blueprint/blueprint-core/src/test/resources/test-bad-id-ref.xml Wed Sep 30 13:58:29 2009
@@ -18,7 +18,7 @@
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
            default-availability="mandatory" >
 
-   <bean id="badIdRef" class="org.apache.geronimo.blueprint.pojos.BeanD">
+   <bean id="badIdRef" class="org.apache.aries.blueprint.pojos.BeanD">
         <property name="name">
           <idref component-id="doesnotexist"/>
         </property>

Modified: incubator/aries/trunk/blueprint/blueprint-core/src/test/resources/test-circular.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-core/src/test/resources/test-circular.xml?rev=820271&r1=820270&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/test/resources/test-circular.xml (original)
+++ incubator/aries/trunk/blueprint/blueprint-core/src/test/resources/test-circular.xml Wed Sep 30 13:58:29 2009
@@ -17,33 +17,33 @@
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
 
-    <bean id="a" class="org.apache.geronimo.blueprint.pojos.PojoCircular">
+    <bean id="a" class="org.apache.aries.blueprint.pojos.PojoCircular">
         <property name="circular" ref="b"/>
     </bean>
 
-    <bean id="b" class="org.apache.geronimo.blueprint.pojos.PojoCircular">
+    <bean id="b" class="org.apache.aries.blueprint.pojos.PojoCircular">
         <property name="circular" ref="a"/>
     </bean>
     
-    <bean id="c" class="org.apache.geronimo.blueprint.pojos.PojoCircular" init-method = "init">
+    <bean id="c" class="org.apache.aries.blueprint.pojos.PojoCircular" init-method = "init">
         <property name="circular" ref="d"/>
     </bean>
 
-    <bean id="d" class="org.apache.geronimo.blueprint.pojos.PojoCircular">
+    <bean id="d" class="org.apache.aries.blueprint.pojos.PojoCircular">
         <property name="circular" ref="c"/>
     </bean>
     
     
     
-    <bean id="serviceBean" class="org.apache.geronimo.blueprint.pojos.PojoB">
+    <bean id="serviceBean" class="org.apache.aries.blueprint.pojos.PojoB">
         <property name="uri" value="urn:myuri" />
     </bean>
     
-    <bean id="listener" class="org.apache.geronimo.blueprint.pojos.PojoListener">
+    <bean id="listener" class="org.apache.aries.blueprint.pojos.PojoListener">
         <property name="service" ref="service" />
     </bean>
     
-    <service id="service" ref="serviceBean" interface="org.apache.geronimo.blueprint.pojos.PojoB">
+    <service id="service" ref="serviceBean" interface="org.apache.aries.blueprint.pojos.PojoB">
         <service-properties>
             <entry key="key1" value="value1"/>
             <entry key="key2" value="value2"/>
@@ -55,44 +55,44 @@
     
     <!-- for prototype cycle tests -->
     
-    <bean id="circularPrototype" class="org.apache.geronimo.blueprint.pojos.PojoCircular" scope = "prototype">
+    <bean id="circularPrototype" class="org.apache.aries.blueprint.pojos.PojoCircular" scope = "prototype">
         <property name="circular" ref="circularPrototype"/>
     </bean>
     
-    <bean id="circularPrototypeDriver" class="org.apache.geronimo.blueprint.pojos.PojoCircular" scope = "prototype">
+    <bean id="circularPrototypeDriver" class="org.apache.aries.blueprint.pojos.PojoCircular" scope = "prototype">
         <property name="circular" ref="circularPrototypeDriver"/>
     </bean>
             
      <!-- for dynamic cycle tests (blueprintContainer.getComponentInstance()) -->
      
-    <bean id="recursiveConstructor" class="org.apache.geronimo.blueprint.pojos.PojoRecursive">
+    <bean id="recursiveConstructor" class="org.apache.aries.blueprint.pojos.PojoRecursive">
         <argument ref="blueprintContainer"/>
         <argument value="recursiveConstructor"/>
         <argument value="1"/>
     </bean>
     
-    <bean id="recursiveSetter" class="org.apache.geronimo.blueprint.pojos.PojoRecursive">
+    <bean id="recursiveSetter" class="org.apache.aries.blueprint.pojos.PojoRecursive">
         <argument ref="blueprintContainer"/>
         <argument value="recursiveSetter"/>
         <property name="foo" value="1"/>
     </bean>
     
-    <bean id="recursiveInitMethod" class="org.apache.geronimo.blueprint.pojos.PojoRecursive" init-method = "init">
+    <bean id="recursiveInitMethod" class="org.apache.aries.blueprint.pojos.PojoRecursive" init-method = "init">
         <argument ref="blueprintContainer"/>
         <argument value="recursiveInitMethod"/>
     </bean>
 
     <!-- for breaking dependency cycle tests  -->
 
-    <bean id="c1" class="org.apache.geronimo.blueprint.pojos.PojoCircular">
+    <bean id="c1" class="org.apache.aries.blueprint.pojos.PojoCircular">
         <argument ref="c2"/>
     </bean>
     
-    <bean id="c2" class="org.apache.geronimo.blueprint.pojos.PojoCircular">
+    <bean id="c2" class="org.apache.aries.blueprint.pojos.PojoCircular">
         <argument ref="c3"/>
     </bean>
     
-    <bean id="c3" class="org.apache.geronimo.blueprint.pojos.PojoCircular">
+    <bean id="c3" class="org.apache.aries.blueprint.pojos.PojoCircular">
         <property name="circular" ref="c1"/>
     </bean>
     

Modified: incubator/aries/trunk/blueprint/blueprint-core/src/test/resources/test-constructor.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-core/src/test/resources/test-constructor.xml?rev=820271&r1=820270&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/test/resources/test-constructor.xml (original)
+++ incubator/aries/trunk/blueprint/blueprint-core/src/test/resources/test-constructor.xml Wed Sep 30 13:58:29 2009
@@ -20,24 +20,24 @@
             xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0"
             default-availability="mandatory" >
 
-    <bean id="pojoB" class="org.apache.geronimo.blueprint.pojos.PojoB">
+    <bean id="pojoB" class="org.apache.aries.blueprint.pojos.PojoB">
         <argument value="urn:myuri" />
         <argument value="10" />
     </bean>
     
-    <bean id="pojoA" class="org.apache.geronimo.blueprint.pojos.PojoA">
+    <bean id="pojoA" class="org.apache.aries.blueprint.pojos.PojoA">
         <argument ref="pojoB" />
         <property name="number">
             <value type="java.math.BigInteger">10</value>
         </property>
     </bean>
 
-    <bean id="pojoC" class="org.apache.geronimo.blueprint.pojos.PojoB" factory-method = "createStatic" >
+    <bean id="pojoC" class="org.apache.aries.blueprint.pojos.PojoB" factory-method = "createStatic" >
         <argument><value type="int">15</value></argument>
         <argument value="urn:myuri" />
     </bean>
     
-    <bean id="pojoD" class="org.apache.geronimo.blueprint.pojos.PojoB" factory-method = "createStatic" >
+    <bean id="pojoD" class="org.apache.aries.blueprint.pojos.PojoB" factory-method = "createStatic" >
         <argument value="15" index = "1" />
         <argument value="urn:myuri" index = "0" />
     </bean>
@@ -47,47 +47,47 @@
         <argument value="urn:myuri" />
     </bean>
     
-    <bean id="multipleInt" class="org.apache.geronimo.blueprint.pojos.Multiple">
+    <bean id="multipleInt" class="org.apache.aries.blueprint.pojos.Multiple">
         <argument type="int" value="123"/>
     </bean>
     
-    <bean id="multipleInteger" class="org.apache.geronimo.blueprint.pojos.Multiple">
+    <bean id="multipleInteger" class="org.apache.aries.blueprint.pojos.Multiple">
         <argument type="java.lang.Integer" value="123"/>
     </bean>
     
-    <bean id="multipleString" class="org.apache.geronimo.blueprint.pojos.Multiple">
+    <bean id="multipleString" class="org.apache.aries.blueprint.pojos.Multiple">
         <argument type="java.lang.String" value="123"/>
     </bean>
     
-    <bean id="multipleStringConvertable" class="org.apache.geronimo.blueprint.pojos.Multiple">
+    <bean id="multipleStringConvertable" class="org.apache.aries.blueprint.pojos.Multiple">
         <argument value="hello"/>
     </bean>
     
-    <bean id="multipleFactory1" class="org.apache.geronimo.blueprint.pojos.Multiple"
+    <bean id="multipleFactory1" class="org.apache.aries.blueprint.pojos.Multiple"
           factory-method = "create" >
         <argument value="hello"/>
         <argument value="1234"/>
     </bean>
         
-    <bean id="multipleFactory2" class="org.apache.geronimo.blueprint.pojos.Multiple"
+    <bean id="multipleFactory2" class="org.apache.aries.blueprint.pojos.Multiple"
           factory-method = "create" >
         <argument value="helloCreate"/>
         <argument value="yes"/>
     </bean>
 
-    <bean id="multipleFactoryNull" class="org.apache.geronimo.blueprint.pojos.Multiple"
+    <bean id="multipleFactoryNull" class="org.apache.aries.blueprint.pojos.Multiple"
           factory-method = "create" >
         <argument value="helloNull"/>
         <argument><null/></argument>
     </bean>
     
-     <bean id="multipleFactoryTypedNull" class="org.apache.geronimo.blueprint.pojos.Multiple"
+     <bean id="multipleFactoryTypedNull" class="org.apache.aries.blueprint.pojos.Multiple"
           factory-method = "create" >
         <argument value="hello"/>
         <argument type = "java.lang.Boolean"><null/></argument>
     </bean>
     
-    <bean id="mapConstruction" class="org.apache.geronimo.blueprint.pojos.Multiple">
+    <bean id="mapConstruction" class="org.apache.aries.blueprint.pojos.Multiple">
         <argument>
             <map>
                 <entry key="a" value="b"/>
@@ -95,7 +95,7 @@
         </argument>
     </bean>
 
-    <bean id="propsConstruction" class="org.apache.geronimo.blueprint.pojos.Multiple">
+    <bean id="propsConstruction" class="org.apache.aries.blueprint.pojos.Multiple">
         <argument>
             <props>
                 <prop key="a" value="b"/>
@@ -103,11 +103,11 @@
         </argument>
     </bean>
 
-    <bean id="booleanPrim" class="org.apache.geronimo.blueprint.pojos.BeanF">
+    <bean id="booleanPrim" class="org.apache.aries.blueprint.pojos.BeanF">
         <argument><value type="boolean">no</value></argument>
     </bean>
 
-    <bean id="booleanWrapped" class="org.apache.geronimo.blueprint.pojos.BeanF">
+    <bean id="booleanWrapped" class="org.apache.aries.blueprint.pojos.BeanF">
         <argument type="java.lang.Boolean" value="no" />
     </bean>
 

Modified: incubator/aries/trunk/blueprint/blueprint-core/src/test/resources/test-depends-on.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-core/src/test/resources/test-depends-on.xml?rev=820271&r1=820270&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/test/resources/test-depends-on.xml (original)
+++ incubator/aries/trunk/blueprint/blueprint-core/src/test/resources/test-depends-on.xml Wed Sep 30 13:58:29 2009
@@ -17,11 +17,11 @@
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
 
-    <bean id="c" class="org.apache.geronimo.blueprint.pojos.BeanC" depends-on="d" init-method="init" destroy-method="destroy"/>
+    <bean id="c" class="org.apache.aries.blueprint.pojos.BeanC" depends-on="d" init-method="init" destroy-method="destroy"/>
 
-    <bean id="d" class="org.apache.geronimo.blueprint.pojos.BeanD" init-method="init" destroy-method="destroy"/>
+    <bean id="d" class="org.apache.aries.blueprint.pojos.BeanD" init-method="init" destroy-method="destroy"/>
     
-    <bean id="e" class="org.apache.geronimo.blueprint.pojos.BeanE" init-method="init" destroy-method="destroy">
+    <bean id="e" class="org.apache.aries.blueprint.pojos.BeanE" init-method="init" destroy-method="destroy">
         <argument ref="c"/>
     </bean>
 

Modified: incubator/aries/trunk/blueprint/blueprint-core/src/test/resources/test-generics.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-core/src/test/resources/test-generics.xml?rev=820271&r1=820270&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/test/resources/test-generics.xml (original)
+++ incubator/aries/trunk/blueprint/blueprint-core/src/test/resources/test-generics.xml Wed Sep 30 13:58:29 2009
@@ -20,7 +20,7 @@
             xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0"
             default-availability="mandatory" >
 
-    <bean id="method" class="org.apache.geronimo.blueprint.pojos.PojoGenerics">
+    <bean id="method" class="org.apache.aries.blueprint.pojos.PojoGenerics">
         <property name="list">
             <list>
                 <value>10</value>
@@ -47,7 +47,7 @@
         </property>        
     </bean>
     
-    <bean id="constructorList" class="org.apache.geronimo.blueprint.pojos.PojoGenerics">
+    <bean id="constructorList" class="org.apache.aries.blueprint.pojos.PojoGenerics">
         <argument type="java.util.List">
             <list>
                 <value>10</value>
@@ -57,7 +57,7 @@
         </argument>      
     </bean>
     
-    <bean id="constructorSet" class="org.apache.geronimo.blueprint.pojos.PojoGenerics">
+    <bean id="constructorSet" class="org.apache.aries.blueprint.pojos.PojoGenerics">
        <argument type="java.util.Set">
             <set>
                 <value>1000</value>
@@ -67,7 +67,7 @@
         </argument>
     </bean>
     
-    <bean id="constructorMap" class="org.apache.geronimo.blueprint.pojos.PojoGenerics">
+    <bean id="constructorMap" class="org.apache.aries.blueprint.pojos.PojoGenerics">
         <argument>
             <map>
                 <entry key="1" value="yes"/>

Modified: incubator/aries/trunk/blueprint/blueprint-core/src/test/resources/test-simple-component.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-core/src/test/resources/test-simple-component.xml?rev=820271&r1=820270&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/test/resources/test-simple-component.xml (original)
+++ incubator/aries/trunk/blueprint/blueprint-core/src/test/resources/test-simple-component.xml Wed Sep 30 13:58:29 2009
@@ -17,7 +17,7 @@
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
 
-    <bean id="pojoA" class="org.apache.geronimo.blueprint.pojos.PojoA" depends-on=" pojoB  pojoC ">
+    <bean id="pojoA" class="org.apache.aries.blueprint.pojos.PojoA" depends-on=" pojoB  pojoC ">
         <argument value="val0"/>
         <argument ref="val1" />
         <argument>
@@ -45,7 +45,7 @@
         </property>
     </bean>
 
-    <bean id="pojoB" class="org.apache.geronimo.blueprint.pojos.PojoA" init-method="initPojo" >
+    <bean id="pojoB" class="org.apache.aries.blueprint.pojos.PojoA" init-method="initPojo" >
         <argument index = "1" value="val0"/>
         <argument index = "0" ref="val1" />
     </bean>

Modified: incubator/aries/trunk/blueprint/blueprint-core/src/test/resources/test-wiring.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-core/src/test/resources/test-wiring.xml?rev=820271&r1=820270&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/test/resources/test-wiring.xml (original)
+++ incubator/aries/trunk/blueprint/blueprint-core/src/test/resources/test-wiring.xml Wed Sep 30 13:58:29 2009
@@ -19,19 +19,19 @@
            default-availability="mandatory" >
 
     <type-converters>
-            <bean id="converter1" class="org.apache.geronimo.blueprint.pojos.ConverterA">
+            <bean id="converter1" class="org.apache.aries.blueprint.pojos.ConverterA">
                 <property name="bundle" ref="blueprintBundleContext" />
             </bean>
     </type-converters>
 
-    <service id="service1" ref="pojoB" interface="org.apache.geronimo.blueprint.pojos.PojoB">
+    <service id="service1" ref="pojoB" interface="org.apache.aries.blueprint.pojos.PojoB">
         <service-properties>
             <entry key="key1" value="value1"/>
             <entry key="key2" value="value2"/>
         </service-properties>    
     </service>
 
-    <bean id="pojoC" class="org.apache.geronimo.blueprint.pojos.PojoB" scope = "prototype">
+    <bean id="pojoC" class="org.apache.aries.blueprint.pojos.PojoB" scope = "prototype">
         <property name="uri" value="urn:myuri" />
         <property name="objects">
             <list>
@@ -40,11 +40,11 @@
         </property>
     </bean>
     
-    <bean id="pojoB" class="org.apache.geronimo.blueprint.pojos.PojoB" init-method = "init" destroy-method = "destroy" >
+    <bean id="pojoB" class="org.apache.aries.blueprint.pojos.PojoB" init-method = "init" destroy-method = "destroy" >
         <property name="uri" value="urn:myuri" />
     </bean>
 
-    <bean id="pojoA" class="org.apache.geronimo.blueprint.pojos.PojoA">
+    <bean id="pojoA" class="org.apache.aries.blueprint.pojos.PojoA">
         <property name="pojob" ref="pojoB"/>
         <property name="map">
             <map>
@@ -107,11 +107,11 @@
         </property>
     </bean>
 
-    <bean id="compound" class="org.apache.geronimo.blueprint.pojos.PojoB">
+    <bean id="compound" class="org.apache.aries.blueprint.pojos.PojoB">
         <property name="bean.name" value="hello bean property" />
     </bean>
     
-    <bean id="goodIdRef" class="org.apache.geronimo.blueprint.pojos.BeanD">
+    <bean id="goodIdRef" class="org.apache.aries.blueprint.pojos.BeanD">
         <property name="name">
           <idref component-id="pojoA"/>
         </property>

Modified: incubator/aries/trunk/blueprint/blueprint-core/src/test/resources/test.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-core/src/test/resources/test.xml?rev=820271&r1=820270&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-core/src/test/resources/test.xml (original)
+++ incubator/aries/trunk/blueprint/blueprint-core/src/test/resources/test.xml Wed Sep 30 13:58:29 2009
@@ -23,40 +23,40 @@
     </description>
 
     <type-converters>
-        <bean class="org.apache.geronimo.blueprint.pojos.ConverterA"/>
+        <bean class="org.apache.aries.blueprint.pojos.ConverterA"/>
         <ref component-id="converterB"/>
     </type-converters>
 
-    <bean id="pojoA" class="org.apache.geronimo.blueprint.pojos.PojoA">
+    <bean id="pojoA" class="org.apache.aries.blueprint.pojos.PojoA">
         <property name="pojob" ref="pojoB"/>
     </bean>
 
-    <bean id="pojoAcns" class="org.apache.geronimo.blueprint.pojos.PojoA">
+    <bean id="pojoAcns" class="org.apache.aries.blueprint.pojos.PojoA">
         <argument ref="pojoB"/>
     </bean>
 
-    <bean id="pojoB" class="org.apache.geronimo.blueprint.pojos.PojoB">
+    <bean id="pojoB" class="org.apache.aries.blueprint.pojos.PojoB">
         <property name="uri" value="urn:myuri"/>
     </bean>
 
-    <bean id="pojoBcns" class="org.apache.geronimo.blueprint.pojos.PojoB">
+    <bean id="pojoBcns" class="org.apache.aries.blueprint.pojos.PojoB">
         <argument value="urn:myuri"/>
     </bean>
 
-    <bean id="converterB" class="org.apache.geronimo.blueprint.pojos.ConverterB"/>
+    <bean id="converterB" class="org.apache.aries.blueprint.pojos.ConverterB"/>
 
-    <reference id="refA" filter="(key=prop)" interface="org.apache.geronimo.blueprint.pojos.InterfaceA"/>
+    <reference id="refA" filter="(key=prop)" interface="org.apache.aries.blueprint.pojos.InterfaceA"/>
 
     <reference id="refB" availability="optional">
         <interfaces>
-            <value>org.apache.geronimo.blueprint.pojos.InterfaceA</value>
+            <value>org.apache.aries.blueprint.pojos.InterfaceA</value>
         </interfaces>
         <listener   ref="listenerA" bind-method="bind" unbind-method="unbind"/>
     </reference>
 
-    <service interface="org.apache.geronimo.blueprint.pojos.InterfaceA" ref="pojoA"/>
+    <service interface="org.apache.aries.blueprint.pojos.InterfaceA" ref="pojoA"/>
 
-    <bean id="listenerA" class="org.apache.geronimo.blueprint.pojos.ListenerA"/>
+    <bean id="listenerA" class="org.apache.aries.blueprint.pojos.ListenerA"/>
 
     <reference-list availability="optional" member-type="service-object"/>
 

Propchange: incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractIntegrationTest.java?rev=820271&r1=820269&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractIntegrationTest.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractIntegrationTest.java Wed Sep 30 13:58:29 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.geronimo.blueprint.itests;
+package org.apache.aries.blueprint.itests;
 
 import org.ops4j.pax.exam.CoreOptions;
 import org.ops4j.pax.exam.Inject;

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=820271&r1=820269&r2=820271&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 Wed Sep 30 13:58:29 2009
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.geronimo.blueprint.itests;
+package org.apache.aries.blueprint.itests;
 
 import java.text.SimpleDateFormat;
 import java.util.Currency;
 import java.util.Hashtable;
 
-import org.apache.geronimo.blueprint.sample.Bar;
-import org.apache.geronimo.blueprint.sample.Foo;
+import org.apache.aries.blueprint.sample.Bar;
+import org.apache.aries.blueprint.sample.Foo;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;

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=820271&r1=820269&r2=820271&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 Wed Sep 30 13:58:29 2009
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.geronimo.blueprint.itests;
+package org.apache.aries.blueprint.itests;
 
 import java.util.Currency;
 import java.util.Hashtable;
 
-import org.apache.geronimo.blueprint.sample.Foo;
+import org.apache.aries.blueprint.sample.Foo;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import org.junit.Test;

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=820271&r1=820269&r2=820271&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 Wed Sep 30 13:58:29 2009
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.geronimo.blueprint.itests;
+package org.apache.aries.blueprint.itests;
 
 import java.util.Hashtable;
 import java.util.List;
 
-import org.apache.geronimo.blueprint.sample.BindingListener;
-import org.apache.geronimo.blueprint.sample.InterfaceA;
+import org.apache.aries.blueprint.sample.BindingListener;
+import org.apache.aries.blueprint.sample.InterfaceA;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;

Modified: incubator/aries/trunk/blueprint/blueprint-sample/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-sample/pom.xml?rev=820271&r1=820270&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-sample/pom.xml (original)
+++ incubator/aries/trunk/blueprint/blueprint-sample/pom.xml Wed Sep 30 13:58:29 2009
@@ -40,7 +40,7 @@
                     <instructions>
                         <Bundle-SymbolicName>${pom.groupId}.sample</Bundle-SymbolicName>
                         <Bundle-Activator>
-                            org.apache.geronimo.blueprint.sample.Activator
+                            org.apache.aries.blueprint.sample.Activator
                         </Bundle-Activator>
 <!--
                         <Bundle-Blueprint>/test.xml</Bundle-Blueprint>

Propchange: incubator/aries/trunk/blueprint/blueprint-sample/src/main/java/org/apache/aries/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: incubator/aries/trunk/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/Activator.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/Activator.java?rev=820271&r1=820165&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/Activator.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/Activator.java Wed Sep 30 13:58:29 2009
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.blueprint.sample;
+package org.apache.aries.blueprint.sample;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;

Modified: incubator/aries/trunk/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/Bar.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/Bar.java?rev=820271&r1=820165&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/Bar.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/Bar.java Wed Sep 30 13:58:29 2009
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.blueprint.sample;
+package org.apache.aries.blueprint.sample;
 
 import java.util.List;
 

Modified: incubator/aries/trunk/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/BindingListener.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/BindingListener.java?rev=820271&r1=820165&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/BindingListener.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/BindingListener.java Wed Sep 30 13:58:29 2009
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.blueprint.sample;
+package org.apache.aries.blueprint.sample;
 
 import java.util.Map;
 import java.util.List;

Modified: incubator/aries/trunk/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/CurrencyTypeConverter.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/CurrencyTypeConverter.java?rev=820271&r1=820165&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/CurrencyTypeConverter.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/CurrencyTypeConverter.java Wed Sep 30 13:58:29 2009
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.blueprint.sample;
+package org.apache.aries.blueprint.sample;
 
 import java.util.Currency;
 

Modified: incubator/aries/trunk/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/DateTypeConverter.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/DateTypeConverter.java?rev=820271&r1=820165&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/DateTypeConverter.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/DateTypeConverter.java Wed Sep 30 13:58:29 2009
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.blueprint.sample;
+package org.apache.aries.blueprint.sample;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;

Modified: incubator/aries/trunk/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/Foo.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/Foo.java?rev=820271&r1=820165&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/Foo.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/Foo.java Wed Sep 30 13:58:29 2009
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.blueprint.sample;
+package org.apache.aries.blueprint.sample;
 
 import java.io.Serializable;
 import java.util.Currency;

Modified: incubator/aries/trunk/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/FooRegistrationListener.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/FooRegistrationListener.java?rev=820271&r1=820165&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/FooRegistrationListener.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/FooRegistrationListener.java Wed Sep 30 13:58:29 2009
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.blueprint.sample;
+package org.apache.aries.blueprint.sample;
 
 import java.io.Serializable;
 import java.util.Map;

Modified: incubator/aries/trunk/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/InterfaceA.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/InterfaceA.java?rev=820271&r1=820165&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/InterfaceA.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-sample/src/main/java/org/apache/aries/blueprint/sample/InterfaceA.java Wed Sep 30 13:58:29 2009
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.blueprint.sample;
+package org.apache.aries.blueprint.sample;
 
 public interface InterfaceA {
 

Modified: incubator/aries/trunk/blueprint/blueprint-sample/src/main/resources/OSGI-INF/blueprint/config.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-sample/src/main/resources/OSGI-INF/blueprint/config.xml?rev=820271&r1=820270&r2=820271&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-sample/src/main/resources/OSGI-INF/blueprint/config.xml (original)
+++ incubator/aries/trunk/blueprint/blueprint-sample/src/main/resources/OSGI-INF/blueprint/config.xml Wed Sep 30 13:58:29 2009
@@ -16,15 +16,15 @@
     limitations under the License.
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xmlns:cm="http://geronimo.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
-           xmlns:ext="http://geronimo.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0"
+           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
+           xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0"
            default-availability="optional">
 
     <type-converters>
-        <bean id="converter1" class="org.apache.geronimo.blueprint.sample.DateTypeConverter">
+        <bean id="converter1" class="org.apache.aries.blueprint.sample.DateTypeConverter">
             <property name="format" value="yyyy.MM.dd"/>
         </bean>
-        <bean id="converter2" class="org.apache.geronimo.blueprint.sample.CurrencyTypeConverter"/>
+        <bean id="converter2" class="org.apache.aries.blueprint.sample.CurrencyTypeConverter"/>
 
     </type-converters>
 
@@ -36,12 +36,12 @@
     </ext:property-placeholder>
 
     <cm:managed-service-factory id="managed-service-factory" factory-pid="blueprint-sample-managed-service-factory"
-            interface="org.apache.geronimo.blueprint.sample.Foo"
+            interface="org.apache.aries.blueprint.sample.Foo"
             ext:system-properties="fallback">
         <service-properties>
             <entry key="key1" value="value1"/>
         </service-properties>
-        <cm:managed-component class="org.apache.geronimo.blueprint.sample.Foo"/>
+        <cm:managed-component class="org.apache.aries.blueprint.sample.Foo"/>
     </cm:managed-service-factory>
 
     <cm:property-placeholder id="property-placeholder" persistent-id="blueprint-sample-placeholder">
@@ -50,19 +50,19 @@
         </cm:default-properties>
     </cm:property-placeholder>
 
-    <bean id="none-managed" class="org.apache.geronimo.blueprint.sample.Foo">
+    <bean id="none-managed" class="org.apache.aries.blueprint.sample.Foo">
         <cm:managed-properties persistent-id="blueprint-sample-managed.none" update-strategy="none"/>
     </bean>
 
-    <bean id="component-managed" class="org.apache.geronimo.blueprint.sample.Foo">
+    <bean id="component-managed" class="org.apache.aries.blueprint.sample.Foo">
         <cm:managed-properties persistent-id="blueprint-sample-managed.component" update-strategy="component-managed" update-method="update"/>
     </bean>
 
-    <bean id="container-managed" class="org.apache.geronimo.blueprint.sample.Foo">
+    <bean id="container-managed" class="org.apache.aries.blueprint.sample.Foo">
         <cm:managed-properties persistent-id="blueprint-sample-managed.container" update-strategy="container-managed"/>
     </bean>
 
-    <bean id="foo" class="org.apache.geronimo.blueprint.sample.Foo" init-method="init" destroy-method="destroy">
+    <bean id="foo" class="org.apache.aries.blueprint.sample.Foo" init-method="init" destroy-method="destroy">
         <property name="a" value="5" />
         <property name="b" value="${key.b}" />
         <property name="bar" ref="bar" />
@@ -74,7 +74,7 @@
         </property>
     </bean>
 
-    <bean id="bar" class="org.apache.geronimo.blueprint.sample.Bar">
+    <bean id="bar" class="org.apache.aries.blueprint.sample.Bar">
         <property name="value"><value>Hello FooBar</value></property>
         <property name="context" ref="blueprintBundleContext"/>
         <property name="list">
@@ -94,23 +94,23 @@
                                unregistration-method="serviceUnregistered"/>
     </service>
     
-    <bean id="fooRegistrationListener" class="org.apache.geronimo.blueprint.sample.FooRegistrationListener"/>
+    <bean id="fooRegistrationListener" class="org.apache.aries.blueprint.sample.FooRegistrationListener"/>
 
-    <reference id="ref2" interface="org.apache.geronimo.blueprint.sample.InterfaceA" timeout="100">
+    <reference id="ref2" interface="org.apache.aries.blueprint.sample.InterfaceA" timeout="100">
         <reference-listener bind-method="bind" unbind-method="unbind" ref="bindingListener" />
     </reference>
 
-    <bean id="bindingListener" class="org.apache.geronimo.blueprint.sample.BindingListener"/>
+    <bean id="bindingListener" class="org.apache.aries.blueprint.sample.BindingListener"/>
 
-    <reference-list id="ref-list" interface="org.apache.geronimo.blueprint.sample.InterfaceA">
+    <reference-list id="ref-list" interface="org.apache.aries.blueprint.sample.InterfaceA">
         <reference-listener bind-method="bind" unbind-method="unbind" ref="listBindingListener" />
     </reference-list>
 
-    <bean id="listBindingListener" class="org.apache.geronimo.blueprint.sample.BindingListener"/>
+    <bean id="listBindingListener" class="org.apache.aries.blueprint.sample.BindingListener"/>
 
-    <bean id="circularReference" class="org.apache.geronimo.blueprint.sample.BindingListener" init-method="init">
+    <bean id="circularReference" class="org.apache.aries.blueprint.sample.BindingListener" init-method="init">
         <property name="list">
-            <reference-list interface="org.apache.geronimo.blueprint.sample.InterfaceA" availability="optional">
+            <reference-list interface="org.apache.aries.blueprint.sample.InterfaceA" availability="optional">
                 <reference-listener bind-method="bind" unbind-method="unbind" ref="circularReference"/>
             </reference-list>
         </property>



Mime
View raw message