You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2007/07/08 08:39:10 UTC

svn commit: r554327 - in /incubator/tuscany/java/sca: itest/contribution/src/main/resources/calculator/ itest/osgi-implementation/src/main/resources/META-INF/ samples/calculator-distributed/src/main/resources/META-INF/ samples/calculator-webapp/src/mai...

Author: lresende
Date: Sat Jul  7 23:39:09 2007
New Revision: 554327

URL: http://svn.apache.org/viewvc?view=rev&rev=554327
Log:
Fixing similar issue as in TUSCANY-1330, but in sca-contribution.xml

Modified:
    incubator/tuscany/java/sca/itest/contribution/src/main/resources/calculator/sca-contribution.xml
    incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/META-INF/sca-contribution.xml
    incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/META-INF/sca-contribution.xml
    incubator/tuscany/java/sca/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
    incubator/tuscany/java/sca/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml
    incubator/tuscany/java/sca/samples/das-service-web/src/main/webapp/META-INF/sca-contribution.xml
    incubator/tuscany/java/sca/samples/helloworld-dojo/src/main/webapp/META-INF/sca-contribution.xml
    incubator/tuscany/java/sca/samples/helloworld-jsonrpc/src/main/webapp/META-INF/sca-contribution.xml
    incubator/tuscany/java/sca/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml

Modified: incubator/tuscany/java/sca/itest/contribution/src/main/resources/calculator/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution/src/main/resources/calculator/sca-contribution.xml?view=diff&rev=554327&r1=554326&r2=554327
==============================================================================
--- incubator/tuscany/java/sca/itest/contribution/src/main/resources/calculator/sca-contribution.xml (original)
+++ incubator/tuscany/java/sca/itest/contribution/src/main/resources/calculator/sca-contribution.xml Sat Jul  7 23:39:09 2007
@@ -17,6 +17,8 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<contribution xmlns=http://www.osoa.org/xmlns/sca/1.0>
-   <deployable composite="Calculator"/>
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+              targetNamespace="http://sample"
+              xmlns:sample="http://sample">
+   <deployable composite="sample:Calculator"/>
 </contribution>

Modified: incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/META-INF/sca-contribution.xml?view=diff&rev=554327&r1=554326&r2=554327
==============================================================================
--- incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/META-INF/sca-contribution.xml (original)
+++ incubator/tuscany/java/sca/itest/osgi-implementation/src/main/resources/META-INF/sca-contribution.xml Sat Jul  7 23:39:09 2007
@@ -17,6 +17,8 @@
  * specific language governing permissions and limitations
  * under the License.
 -->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
-   <import namespace="Greetings" location="file:target/passbyref/Greetings.jar" />
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+              targetNamespace="http://sample"
+              xmlns:sample="http://sample">
+   <import namespace="sample:Greetings" location="file:target/passbyref/Greetings.jar" />
 </contribution>

Modified: incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/META-INF/sca-contribution.xml?view=diff&rev=554327&r1=554326&r2=554327
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/META-INF/sca-contribution.xml (original)
+++ incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/META-INF/sca-contribution.xml Sat Jul  7 23:39:09 2007
@@ -18,7 +18,7 @@
     * under the License.    
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://sample"
-    xmlns:sample="http://sample">
+	      targetNamespace="http://sample"
+              xmlns:sample="http://sample">
    <deployable composite="sample:Calculator"/>
 </contribution>

Modified: incubator/tuscany/java/sca/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml?view=diff&rev=554327&r1=554326&r2=554327
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml (original)
+++ incubator/tuscany/java/sca/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml Sat Jul  7 23:39:09 2007
@@ -17,6 +17,8 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
-   <deployable composite="Calculator"/>
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+              targetNamespace="http://sample"
+              xmlns:sample="http://sample">
+   <deployable composite="sample:Calculator"/>
 </contribution>

Modified: incubator/tuscany/java/sca/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml?view=diff&rev=554327&r1=554326&r2=554327
==============================================================================
--- incubator/tuscany/java/sca/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml (original)
+++ incubator/tuscany/java/sca/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml Sat Jul  7 23:39:09 2007
@@ -17,6 +17,8 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
-   <deployable composite="Chat"/>
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+              targetNamespace="http://sample"
+              xmlns:sample="http://sample">
+   <deployable composite="sample:Chat"/>
 </contribution>

Modified: incubator/tuscany/java/sca/samples/das-service-web/src/main/webapp/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/das-service-web/src/main/webapp/META-INF/sca-contribution.xml?view=diff&rev=554327&r1=554326&r2=554327
==============================================================================
--- incubator/tuscany/java/sca/samples/das-service-web/src/main/webapp/META-INF/sca-contribution.xml (original)
+++ incubator/tuscany/java/sca/samples/das-service-web/src/main/webapp/META-INF/sca-contribution.xml Sat Jul  7 23:39:09 2007
@@ -1,6 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://sample"
-    xmlns:sample="http://sample">
-   <deployable composite="DASService"/>
+	      targetNamespace="http://sample"
+              xmlns:sample="http://sample">
+   <deployable composite="sample:DASService"/>
 </contribution>

Modified: incubator/tuscany/java/sca/samples/helloworld-dojo/src/main/webapp/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-dojo/src/main/webapp/META-INF/sca-contribution.xml?view=diff&rev=554327&r1=554326&r2=554327
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-dojo/src/main/webapp/META-INF/sca-contribution.xml (original)
+++ incubator/tuscany/java/sca/samples/helloworld-dojo/src/main/webapp/META-INF/sca-contribution.xml Sat Jul  7 23:39:09 2007
@@ -19,8 +19,8 @@
 -->
 
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-targetNamespace="http://sample"
-    xmlns:sample="http://sample">
+              targetNamespace="http://sample"
+              xmlns:sample="http://sample">
    <deployable composite="sample:helloworldjsonrpc"/>
 </contribution>
 

Modified: incubator/tuscany/java/sca/samples/helloworld-jsonrpc/src/main/webapp/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-jsonrpc/src/main/webapp/META-INF/sca-contribution.xml?view=diff&rev=554327&r1=554326&r2=554327
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-jsonrpc/src/main/webapp/META-INF/sca-contribution.xml (original)
+++ incubator/tuscany/java/sca/samples/helloworld-jsonrpc/src/main/webapp/META-INF/sca-contribution.xml Sat Jul  7 23:39:09 2007
@@ -19,8 +19,8 @@
 -->
 
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-targetNamespace="http://sample"
-    xmlns:sample="http://sample">
+              targetNamespace="http://sample"
+              xmlns:sample="http://sample">
    <deployable composite="sample:helloworldjsonrpc"/>
 </contribution>
 

Modified: incubator/tuscany/java/sca/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml?view=diff&rev=554327&r1=554326&r2=554327
==============================================================================
--- incubator/tuscany/java/sca/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml (original)
+++ incubator/tuscany/java/sca/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml Sat Jul  7 23:39:09 2007
@@ -19,7 +19,7 @@
  -->
 
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://sample"
-    xmlns:sample="http://sample">
+	      targetNamespace="http://sample"
+              xmlns:sample="http://sample">
    <deployable composite="sample:OuterComposite"/>
 </contribution>



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org