summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2009-11-01 07:48:41 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2009-11-01 07:48:41 +0000
commitfad092b8a9cb880765f2b04e288c60e0583e0171 (patch)
tree08c02e2cabed419e84004b02fe9176d7414a3b12
parenta1b817c3055beb837d04f47524fb5af290b474ff (diff)
Merge namespace fix from trunk to m4 brn
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@831650 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/helloworld.composite2
-rw-r--r--branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/add.composite2
-rw-r--r--branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite2
-rw-r--r--branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite2
-rw-r--r--branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite2
-rw-r--r--branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite2
6 files changed, 6 insertions, 6 deletions
diff --git a/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/helloworld.composite b/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/helloworld.composite
index c33da77c0d..aacf93e66a 100644
--- a/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/helloworld.composite
+++ b/branches/sca-java-2.0-M4/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/helloworld.composite
@@ -18,7 +18,7 @@
* under the License.
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
targetNamespace="http://${package}"
name="${artifactId}">
diff --git a/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/add.composite b/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/add.composite
index 2a8b041849..af2ed294f9 100644
--- a/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/add.composite
+++ b/branches/sca-java-2.0-M4/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/add.composite
@@ -18,7 +18,7 @@
* under the License.
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
targetNamespace="http://${package}"
name="${artifactId}">
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite b/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
index c2aced55f0..aa73578a36 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
+++ b/branches/sca-java-2.0-M4/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
@@ -18,7 +18,7 @@
* under the License.
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
targetNamespace="http://${package}"
name="${artifactId}">
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite b/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
index eb86cee711..847625fcf4 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
+++ b/branches/sca-java-2.0-M4/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
@@ -18,7 +18,7 @@
* under the License.
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
targetNamespace="http://${package}"
name="${artifactId}">
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite b/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
index 4ffadbe621..40896b1473 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
+++ b/branches/sca-java-2.0-M4/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
@@ -18,7 +18,7 @@
* under the License.
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
targetNamespace="http://${package}"
name="${artifactId}">
diff --git a/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite b/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
index 9df4cd915e..a90973d6f7 100644
--- a/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
+++ b/branches/sca-java-2.0-M4/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
@@ -18,7 +18,7 @@
* under the License.
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
targetNamespace="http://${package}"
name="${artifactId}">