Author: rfeng
Date: Thu Aug 23 20:40:53 2007
New Revision: 569236

URL: http://svn.apache.org/viewvc?rev=569236&view=rev
Log:
Fix the namespace issues for OSGi-impl

Modified:
    
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/factory-ds-test.composite
    
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/factory-test.composite
    
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/interfaces-ds-test.composite
    
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/interfaces-test.composite
    
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/passbyref-test.composite
    
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/properties-ds-test.composite
    
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/properties-test.composite
    
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/properties2-ds-test.composite
    
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/properties2-test.composite
    
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/services-ds-test.composite
    
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/services-test.composite
    
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/version-ds-test.composite
    
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/version-test.composite
    
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/wiring-ds-test1.composite
    
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/wiring-ds-test2.composite
    
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/wiring-test1.composite
    
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/wiring-test2.composite
    
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/ws-helloworld.composite
    incubator/tuscany/java/sca/itest/pom.xml
    
incubator/tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java

Modified: 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/factory-ds-test.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/factory-ds-test.composite?rev=569236&r1=569235&r2=569236&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/factory-ds-test.composite
 (original)
+++ 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/factory-ds-test.composite
 Thu Aug 23 20:40:53 2007
@@ -24,7 +24,7 @@
        name="supplychain">
 
     <component name="CustomerComponent">
-        <implementation.osgi 
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"; 
                 bundle="supplychain.Customer"
                 bundleLocation="file:target/factory/ds/Customer.jar"
                 scope="STATELESS" >
@@ -48,7 +48,7 @@
     </component>
 
     <component name="RetailerComponent1">
-        <implementation.osgi
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";
                 bundle="supplychain.Retailer"
                 bundleLocation="file:target/factory/ds/Retailer.jar" >
             <properties service="Retailer">
@@ -62,7 +62,7 @@
     </component>
     
     <component name="RetailerComponent2">
-        <implementation.osgi
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";
                 bundle="supplychain.Retailer"
                 bundleLocation="file:target/factory/ds/Retailer.jar" >
             <properties service="Retailer">
@@ -75,7 +75,7 @@
     </component>
     
     <component name="RetailerComponent3">
-        <implementation.osgi
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";
                 bundle="supplychain.Retailer"
                 bundleLocation="file:target/factory/ds/Retailer.jar" >
             <properties service="Retailer">
@@ -102,7 +102,7 @@
     </component>
 
     <component name="ShipperComponent1">
-        <implementation.osgi     
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";   
  
             bundle="supplychain.Shipper"   
             bundleLocation="file:target/factory/ds/Shipper.jar"
             scope="STATELESS">
@@ -117,7 +117,7 @@
     </component>
     
      <component name="ShipperComponent2">
-        <implementation.osgi 
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"; 
             bundle="supplychain.Shipper"   
             bundleLocation="file:target/factory/ds/Shipper.jar"
             scope="STATELESS">

Modified: 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/factory-test.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/factory-test.composite?rev=569236&r1=569235&r2=569236&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/factory-test.composite
 (original)
+++ 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/factory-test.composite
 Thu Aug 23 20:40:53 2007
@@ -24,7 +24,7 @@
        name="supplychain">
 
     <component name="CustomerComponent">
-        <implementation.osgi 
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"; 
                 bundle="supplychain.Customer"
                 bundleLocation="file:target/factory/Customer.jar"
                 scope="STATELESS" >
@@ -48,7 +48,7 @@
     </component>
 
     <component name="RetailerComponent1">
-        <implementation.osgi
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";
                 bundle="supplychain.Retailer"
                 bundleLocation="file:target/factory/Retailer.jar" >
             <properties service="Retailer">
@@ -62,7 +62,7 @@
     </component>
     
     <component name="RetailerComponent2">
-        <implementation.osgi
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";
                 bundle="supplychain.Retailer"
                 bundleLocation="file:target/factory/Retailer.jar" >
             <properties service="Retailer">
@@ -75,7 +75,7 @@
     </component>
     
     <component name="RetailerComponent3">
-        <implementation.osgi
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";
                 bundle="supplychain.Retailer"
                 bundleLocation="file:target/factory/Retailer.jar" >
             <properties service="Retailer">
@@ -102,7 +102,7 @@
     </component>
 
     <component name="ShipperComponent1">
-        <implementation.osgi     
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";   
  
             bundle="supplychain.Shipper"   
             bundleLocation="file:target/factory/Shipper.jar"
             scope="STATELESS">

Modified: 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/interfaces-ds-test.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/interfaces-ds-test.composite?rev=569236&r1=569235&r2=569236&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/interfaces-ds-test.composite
 (original)
+++ 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/interfaces-ds-test.composite
 Thu Aug 23 20:40:53 2007
@@ -24,7 +24,7 @@
        name="supplychain">
        
     <component name="CustomerComponent">
-        <implementation.osgi 
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"; 
             bundle="supplychain.CustomerWithQuery"
             bundleLocation="file:target/interfaces/ds/Customer.jar"
         />
@@ -34,7 +34,7 @@
     </component>
 
     <component name="RetailerComponent">
-        <implementation.osgi 
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"; 
             bundle="supplychain.RetailerWithQuery"
             bundleLocation="file:target/interfaces/ds/Retailer.jar"
         />
@@ -49,7 +49,7 @@
     </component>
 
     <component name="ShipperComponent">
-        <implementation.osgi 
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"; 
             bundle="supplychain.Shipper"
             bundleLocation="file:target/interfaces/ds/Shipper.jar"
         />

Modified: 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/interfaces-test.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/interfaces-test.composite?rev=569236&r1=569235&r2=569236&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/interfaces-test.composite
 (original)
+++ 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/interfaces-test.composite
 Thu Aug 23 20:40:53 2007
@@ -24,7 +24,7 @@
        name="supplychain">
        
     <component name="CustomerComponent">
-        <implementation.osgi 
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"; 
             bundle="supplychain.CustomerWithQuery"
             bundleLocation="file:target/interfaces/Customer.jar"
         />
@@ -34,7 +34,7 @@
     </component>
 
     <component name="RetailerComponent">
-        <implementation.osgi 
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"; 
             bundle="supplychain.RetailerWithQuery"
             bundleLocation="file:target/interfaces/Retailer.jar"
         />
@@ -49,7 +49,7 @@
     </component>
 
     <component name="ShipperComponent">
-        <implementation.osgi 
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"; 
             bundle="supplychain.Shipper"
             bundleLocation="file:target/interfaces/Shipper.jar"
         />

Modified: 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/passbyref-test.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/passbyref-test.composite?rev=569236&r1=569235&r2=569236&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/passbyref-test.composite
 (original)
+++ 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/passbyref-test.composite
 Thu Aug 23 20:40:53 2007
@@ -27,7 +27,7 @@
     </component>
 
     <component name="OSGiGreetingsComponent">
-               <implementation.osgi 
+               <implementation.osgi 
xmlns="http://tuscany.apache.org/xmlns/sca/1.0"; 
             bundle="helloworld.Greetings"
             bundleLocation="file:target/passbyref/Greetings.jar"
             
allowsPassByReference="helloworld.OSGiGreetingsImpl.getModifiedGreetingsFromJava
 

Modified: 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/properties-ds-test.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/properties-ds-test.composite?rev=569236&r1=569235&r2=569236&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/properties-ds-test.composite
 (original)
+++ 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/properties-ds-test.composite
 Thu Aug 23 20:40:53 2007
@@ -22,7 +22,7 @@
            name="StockQuoteComposite">
 
     <component name="StockQuoteComponent">
-        <implementation.osgi 
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"; 
             bundle="stockquote.StockQuote" 
             bundleLocation="file:target/properties/ds/StockQuote.jar" 
             scope="COMPOSITE"

Modified: 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/properties-test.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/properties-test.composite?rev=569236&r1=569235&r2=569236&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/properties-test.composite
 (original)
+++ 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/properties-test.composite
 Thu Aug 23 20:40:53 2007
@@ -22,7 +22,7 @@
            name="StockQuoteComposite">
 
     <component name="StockQuoteComponent">
-        <implementation.osgi 
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"; 
             bundle="stockquote.StockQuote" 
             bundleLocation="file:target/properties/StockQuote.jar" 
             scope="COMPOSITE"

Modified: 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/properties2-ds-test.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/properties2-ds-test.composite?rev=569236&r1=569235&r2=569236&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/properties2-ds-test.composite
 (original)
+++ 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/properties2-ds-test.composite
 Thu Aug 23 20:40:53 2007
@@ -22,7 +22,7 @@
            name="StockQuoteComposite">
 
     <component name="USDStockQuoteComponent">
-        <implementation.osgi 
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"; 
             bundle="stockquote.StockQuote" 
             bundleLocation="file:target/properties/ds/StockQuoteFactory.jar" 
             scope="COMPOSITE"
@@ -39,7 +39,7 @@
     </component>
     
      <component name="EUROStockQuoteComponent">
-        <implementation.osgi 
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"; 
             bundle="stockquote.StockQuote" 
             bundleLocation="file:target/properties/ds/StockQuoteFactory.jar" 
             scope="COMPOSITE"

Modified: 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/properties2-test.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/properties2-test.composite?rev=569236&r1=569235&r2=569236&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/properties2-test.composite
 (original)
+++ 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/properties2-test.composite
 Thu Aug 23 20:40:53 2007
@@ -22,7 +22,7 @@
            name="StockQuoteComposite">
 
     <component name="USDStockQuoteComponent">
-        <implementation.osgi 
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"; 
             bundle="stockquote.StockQuote" 
             bundleLocation="file:target/properties/StockQuoteFactory.jar" 
             scope="COMPOSITE"
@@ -36,7 +36,7 @@
     </component>
     
     <component name="EUROStockQuoteComponent">
-        <implementation.osgi 
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"; 
             bundle="stockquote.StockQuote" 
             bundleLocation="file:target/properties/StockQuoteFactory.jar" 
             scope="COMPOSITE"

Modified: 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/services-ds-test.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/services-ds-test.composite?rev=569236&r1=569235&r2=569236&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/services-ds-test.composite
 (original)
+++ 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/services-ds-test.composite
 Thu Aug 23 20:40:53 2007
@@ -24,7 +24,7 @@
        name="supplychain">
 
     <component name="CustomerComponent">
-        <implementation.osgi 
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"; 
                 bundle="supplychain.CustomerServices"
                 bundleLocation="file:target/services/ds/Customer.jar" >
             
@@ -49,7 +49,7 @@
     
     <component name="RetailerComponent">
         <!-- implementation.java 
class="supplychain.retailer.JavaRetailerComponentImpl" -->
-        <implementation.osgi
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";
                 bundle="supplychain.RetailerServices"
                 bundleLocation="file:target/services/ds/Retailer.jar" >
             <properties service="RetailerService1">
@@ -74,7 +74,7 @@
     
 
     <component name="ShipperComponent">
-        <implementation.osgi     
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";   
  
             bundle="supplychain.ShipperServices"   
             bundleLocation="file:target/services/ds/Shipper.jar" >
             

Modified: 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/services-test.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/services-test.composite?rev=569236&r1=569235&r2=569236&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/services-test.composite
 (original)
+++ 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/services-test.composite
 Thu Aug 23 20:40:53 2007
@@ -24,7 +24,7 @@
        name="supplychain">
 
     <component name="CustomerComponent">
-        <implementation.osgi 
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"; 
                 bundle="supplychain.CustomerServices"
                 bundleLocation="file:target/services/Customer.jar" >
             
@@ -48,7 +48,7 @@
     </component>
     
     <component name="RetailerComponent">
-        <implementation.osgi
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";
                 bundle="supplychain.RetailerServices"
                 bundleLocation="file:target/services/Retailer.jar" >
             <properties service="RetailerService1">
@@ -73,7 +73,7 @@
     
 
     <component name="ShipperComponent">
-        <implementation.osgi     
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";   
  
             bundle="supplychain.ShipperServices"   
             bundleLocation="file:target/services/Shipper.jar" >
             

Modified: 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/version-ds-test.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/version-ds-test.composite?rev=569236&r1=569235&r2=569236&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/version-ds-test.composite
 (original)
+++ 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/version-ds-test.composite
 Thu Aug 23 20:40:53 2007
@@ -24,7 +24,7 @@
        name="supplychain">
 
     <component name="CustomerComponent1">
-        <implementation.osgi 
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"; 
                 bundle="supplychain.CustomerServices"
                 bundleLocation="file:target/version/ds/Customer1.jar" >
                 
@@ -44,7 +44,7 @@
     
     
     <component name="CustomerComponent2">
-        <implementation.osgi 
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"; 
                 bundle="supplychain.CustomerServices"
                 bundleLocation="file:target/version/ds/Customer2.jar" >
                 
@@ -62,7 +62,7 @@
     </component>
 
     <component name="RetailerComponent1">
-        <implementation.osgi
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";
                 bundle="supplychain.RetailerServices"
                 bundleLocation="file:target/version/ds/Retailer1.jar" >
             <properties service="RetailerService1">
@@ -83,7 +83,7 @@
     </component>
     
     <component name="RetailerComponent2">
-        <implementation.osgi
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";
                 bundle="supplychain.RetailerServices"
                 bundleLocation="file:target/version/ds/Retailer2.jar" >
             <properties service="RetailerService1">
@@ -117,7 +117,7 @@
     </component>
 
     <component name="ShipperComponent1">
-        <implementation.osgi     
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";   
  
             bundle="supplychain.ShipperServices"   
             bundleLocation="file:target/version/ds/Shipper1.jar">
             
@@ -136,7 +136,7 @@
     </component>
     
      <component name="ShipperComponent2">
-        <implementation.osgi 
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"; 
             bundle="supplychain.ShipperServices"   
             bundleLocation="file:target/version/ds/Shipper2.jar">
             

Modified: 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/version-test.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/version-test.composite?rev=569236&r1=569235&r2=569236&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/version-test.composite
 (original)
+++ 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/version-test.composite
 Thu Aug 23 20:40:53 2007
@@ -24,7 +24,7 @@
        name="supplychain">
 
     <component name="CustomerComponent1">
-        <implementation.osgi 
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"; 
                 bundle="supplychain.CustomerServices"
                 bundleLocation="file:target/version/Customer1.jar" >
             
@@ -40,7 +40,7 @@
     
     
     <component name="CustomerComponent2">
-        <implementation.osgi 
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"; 
                 bundle="supplychain.CustomerServices"
                 bundleLocation="file:target/version/Customer2.jar" >
             
@@ -54,7 +54,7 @@
     </component>
 
     <component name="RetailerComponent1">
-        <implementation.osgi
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";
                 bundle="supplychain.RetailerServices"
                 bundleLocation="file:target/version/Retailer1.jar" >
             <properties service="RetailerService1">
@@ -73,7 +73,7 @@
     </component>
     
     <component name="RetailerComponent2">
-        <implementation.osgi
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";
                 bundle="supplychain.RetailerServices"
                 bundleLocation="file:target/version/Retailer2.jar" >
             <properties service="RetailerService1">
@@ -107,7 +107,7 @@
     </component>
 
     <component name="ShipperComponent1">
-        <implementation.osgi     
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";   
  
             bundle="supplychain.ShipperServices"   
             bundleLocation="file:target/version/Shipper1.jar">
             
@@ -126,7 +126,7 @@
     </component>
     
      <component name="ShipperComponent2">
-        <implementation.osgi 
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"; 
             bundle="supplychain.ShipperServices"   
             bundleLocation="file:target/version/Shipper2.jar">
             

Modified: 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/wiring-ds-test1.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/wiring-ds-test1.composite?rev=569236&r1=569235&r2=569236&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/wiring-ds-test1.composite
 (original)
+++ 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/wiring-ds-test1.composite
 Thu Aug 23 20:40:53 2007
@@ -24,7 +24,7 @@
        name="supplychain">
 
     <component name="CustomerComponent">
-        <implementation.osgi 
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"; 
                 bundle="supplychain.Customer"
                 bundleLocation="file:target/wiring/ds/Customer.jar" >
             
@@ -47,7 +47,7 @@
     </component>
 
     <component name="RetailerComponent1">
-        <implementation.osgi
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";
                 bundle="supplychain.Retailer"
                 bundleLocation="file:target/wiring/ds/Retailer.jar" >
             <properties service="Retailer">
@@ -64,7 +64,7 @@
     </component>
     
     <component name="RetailerComponent2">
-        <implementation.osgi
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";
                 bundle="supplychain.Retailer"
                 bundleLocation="file:target/wiring/ds/Retailer.jar" >
             <properties service="Retailer">
@@ -81,7 +81,7 @@
     
     
     <component name="RetailerComponent3">
-        <implementation.osgi
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";
                 bundle="supplychain.Retailer"
                 bundleLocation="file:target/wiring/ds/Retailer.jar" >
             <properties service="Retailer">
@@ -110,7 +110,7 @@
     </component>
 
     <component name="ShipperComponent1">
-        <implementation.osgi     
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";   
  
             bundle="supplychain.Shipper"   
             bundleLocation="file:target/wiring/ds/Shipper.jar" >
             
@@ -124,7 +124,7 @@
     </component>
     
      <component name="ShipperComponent2">
-        <implementation.osgi 
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"; 
             bundle="supplychain.Shipper"   
             bundleLocation="file:target/wiring/ds/Shipper.jar" >
             

Modified: 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/wiring-ds-test2.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/wiring-ds-test2.composite?rev=569236&r1=569235&r2=569236&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/wiring-ds-test2.composite
 (original)
+++ 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/wiring-ds-test2.composite
 Thu Aug 23 20:40:53 2007
@@ -24,7 +24,7 @@
        name="supplychain">
 
     <component name="CustomerComponent">
-        <implementation.osgi 
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"; 
                 bundle="supplychain.Customer"
                 bundleLocation="file:target/wiring/ds/Customer.jar" >
             
@@ -47,7 +47,7 @@
     </component>
 
     <component name="RetailerComponent1">
-        <implementation.osgi
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";
                 bundle="supplychain.Retailer"
                 bundleLocation="file:target/wiring/ds/Retailer.jar" >
             <properties service="Retailer">
@@ -64,7 +64,7 @@
     </component>
     
     <component name="RetailerComponent2">
-        <implementation.osgi
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";
                 bundle="supplychain.Retailer"
                 bundleLocation="file:target/wiring/ds/Retailer.jar" >
             
@@ -81,7 +81,7 @@
     </component>
     
     <component name="RetailerComponent3">
-        <implementation.osgi
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";
                 bundle="supplychain.Retailer"
                 bundleLocation="file:target/wiring/ds/Retailer.jar" >
             
@@ -98,7 +98,7 @@
     
     <component name="WarehouseComponent1">
         
-        <implementation.osgi
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";
                 bundle="supplychain.Warehouse"
                 bundleLocation="file:target/wiring/ds/Warehouse.jar" >
                 
@@ -113,7 +113,7 @@
 
     <component name="WarehouseComponent2">
         
-        <implementation.osgi
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";
                 bundle="supplychain.Warehouse"
                 bundleLocation="file:target/wiring/ds/Warehouse.jar" >
                 
@@ -127,7 +127,7 @@
     
    
     <component name="ShipperComponent1">
-        <implementation.osgi     
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";   
  
             bundle="supplychain.Shipper"   
             bundleLocation="file:target/wiring/ds/Shipper.jar">
             
@@ -141,7 +141,7 @@
     </component>
     
      <component name="ShipperComponent2">
-        <implementation.osgi 
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"; 
             bundle="supplychain.Shipper"   
             bundleLocation="file:target/wiring/ds/Shipper.jar">
             

Modified: 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/wiring-test1.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/wiring-test1.composite?rev=569236&r1=569235&r2=569236&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/wiring-test1.composite
 (original)
+++ 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/wiring-test1.composite
 Thu Aug 23 20:40:53 2007
@@ -24,7 +24,7 @@
        name="supplychain">
 
     <component name="CustomerComponent">
-        <implementation.osgi 
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"; 
                 bundle="supplychain.Customer"
                 bundleLocation="file:target/wiring/Customer.jar" >
             
@@ -47,7 +47,7 @@
     </component>
 
     <component name="RetailerComponent1">
-        <implementation.osgi
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";
                 bundle="supplychain.Retailer"
                 bundleLocation="file:target/wiring/Retailer.jar" >
             <properties service="Retailer">
@@ -60,7 +60,7 @@
     </component>
     
     <component name="RetailerComponent2">
-        <implementation.osgi
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";
                 bundle="supplychain.Retailer"
                 bundleLocation="file:target/wiring/Retailer.jar" >
             
@@ -73,7 +73,7 @@
     </component>
     
     <component name="RetailerComponent3">
-        <implementation.osgi
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";
                 bundle="supplychain.Retailer"
                 bundleLocation="file:target/wiring/Retailer.jar" >
             
@@ -100,7 +100,7 @@
     
    
     <component name="ShipperComponent1">
-        <implementation.osgi     
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";   
  
             bundle="supplychain.Shipper"   
             bundleLocation="file:target/wiring/Shipper.jar">
             
@@ -114,7 +114,7 @@
     </component>
     
      <component name="ShipperComponent2">
-        <implementation.osgi 
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"; 
             bundle="supplychain.Shipper"   
             bundleLocation="file:target/wiring/Shipper.jar">
             

Modified: 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/wiring-test2.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/wiring-test2.composite?rev=569236&r1=569235&r2=569236&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/wiring-test2.composite
 (original)
+++ 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/wiring-test2.composite
 Thu Aug 23 20:40:53 2007
@@ -24,7 +24,7 @@
        name="supplychain">
 
     <component name="CustomerComponent">
-        <implementation.osgi 
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"; 
                 bundle="supplychain.Customer"
                 bundleLocation="file:target/wiring/Customer.jar" >
             
@@ -47,7 +47,7 @@
     </component>
 
     <component name="RetailerComponent1">
-        <implementation.osgi
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";
                 bundle="supplychain.Retailer"
                 bundleLocation="file:target/wiring/Retailer.jar" >
             <properties service="Retailer">
@@ -64,7 +64,7 @@
     </component>
     
     <component name="RetailerComponent2">
-        <implementation.osgi
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";
                 bundle="supplychain.Retailer"
                 bundleLocation="file:target/wiring/Retailer.jar" >
             
@@ -81,7 +81,7 @@
     </component>
     
     <component name="RetailerComponent3">
-        <implementation.osgi
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";
                 bundle="supplychain.Retailer"
                 bundleLocation="file:target/wiring/Retailer.jar" >
             
@@ -98,7 +98,7 @@
     
     <component name="WarehouseComponent1">
         
-        <implementation.osgi
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";
                 bundle="supplychain.Warehouse"
                 bundleLocation="file:target/wiring/Warehouse.jar" >
                 
@@ -113,7 +113,7 @@
 
     <component name="WarehouseComponent2">
         
-        <implementation.osgi
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";
                 bundle="supplychain.Warehouse"
                 bundleLocation="file:target/wiring/Warehouse.jar" >
                 
@@ -127,7 +127,7 @@
     
    
     <component name="ShipperComponent1">
-        <implementation.osgi     
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0";   
  
             bundle="supplychain.Shipper"   
             bundleLocation="file:target/wiring/Shipper.jar">
             
@@ -141,7 +141,7 @@
     </component>
     
      <component name="ShipperComponent2">
-        <implementation.osgi 
+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"; 
             bundle="supplychain.Shipper"   
             bundleLocation="file:target/wiring/Shipper.jar">
             

Modified: 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/ws-helloworld.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/ws-helloworld.composite?rev=569236&r1=569235&r2=569236&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/ws-helloworld.composite
 (original)
+++ 
incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/sca/ws-helloworld.composite
 Thu Aug 23 20:40:53 2007
@@ -33,7 +33,7 @@
     <component name="HelloWorldComponent">
                <!--implementation.java 
class="helloworld.HelloWorldComponent"/-->
                
-               <implementation.osgi 
+               <implementation.osgi 
xmlns="http://tuscany.apache.org/xmlns/sca/1.0"; 
             bundle="helloworld.HelloWorld"
             bundleLocation="file:target/ws/HelloWorld.jar"
         />

Modified: incubator/tuscany/java/sca/itest/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/pom.xml?rev=569236&r1=569235&r2=569236&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/pom.xml Thu Aug 23 20:40:53 2007
@@ -52,9 +52,7 @@
                 <module>exceptions-cross-binding-ws</module>
                 <module>extended-api</module>
                 <module>operation-overloading</module>
-                <!--
                 <module>osgi-implementation</module>
-                -->
                 <module>properties</module>
                 <module>recursive</module>
                 <module>references</module>

Modified: 
incubator/tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java?rev=569236&r1=569235&r2=569236&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
 (original)
+++ 
incubator/tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
 Thu Aug 23 20:40:53 2007
@@ -82,8 +82,8 @@
     private static final String INJECT_PROPERTIES  = "injectProperties";
 
    
-    private static final QName PROPERTIES_QNAME    = new 
QName(Constants.SCA10_NS, "properties");
-    private static final QName PROPERTY_QNAME      = new 
QName(Constants.SCA10_NS, "property");
+    private static final QName PROPERTIES_QNAME    = new 
QName(Constants.SCA10_TUSCANY_NS, "properties");
+    private static final QName PROPERTY_QNAME      = new 
QName(Constants.SCA10_TUSCANY_NS, "property");
     
     private JavaInterfaceFactory javaInterfaceFactory;
     private AssemblyFactory assemblyFactory;



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to