You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2008/06/14 12:06:55 UTC

svn commit: r667767 [10/11] - in /incubator/tuscany/java/sca: ./ demos/ demos/alert-aggregator-webapp/ demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/ demos/bigbank-account/ demos/bigbank-calculator/ demos/bigbank-stockquote/ demos/bigbank/ demo...

Modified: incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java (original)
+++ incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java Sat Jun 14 03:06:39 2008
@@ -1,170 +1,170 @@
-/*
- * 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.    
- */
-
-package org.apache.tuscany.sca.core.classpath;
-
-import static org.apache.tuscany.sca.core.log.LogUtil.error;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-
-/**
- * Utility functions to help determine the runtime classpath.
- *
- * @version $Rev: $ $Date: $
- */
-public class ClasspathUtil {
-
-    private static final String TUSCANY_RUNTIME_LIBRARIES = "org.apache.tuscany.sca.core.runtimeLibraries";
-
-    private static final String TUSCANY_FEATURE = "org.apache.tuscany.sca.feature";
-    private static final String TUSCANY_VERSION = "1.2.0";
-    
-    /**
-     * Return the installed runtime classpath entries.
-     * 
-     * @return
-     * @throws CoreException
-     */
-    public static String installedRuntimeClasspath() throws CoreException {
-        
-        List<IClasspathEntry> classpathEntries = new ArrayList<IClasspathEntry>(); 
-        for (IExtension extension: Platform.getExtensionRegistry().getExtensionPoint(TUSCANY_RUNTIME_LIBRARIES).getExtensions()) {
-            for (IConfigurationElement configuration: extension.getConfigurationElements()) {
-                IClasspathContainer container = (IClasspathContainer)configuration.createExecutableExtension("class");
-                classpathEntries.addAll(Arrays.asList(container.getClasspathEntries()));
-            }
-        }
-        
-        String separator = System.getProperty("path.separator");
-        StringBuffer classpath = new StringBuffer();
-        for (int i = 0, n = classpathEntries.size(); i < n; i++) {
-            IClasspathEntry entry = classpathEntries.get(i);
-            if (i >0) {
-                classpath.append(separator);
-            }
-            classpath.append(entry.getPath().toFile().toURI().getPath());
-        }
-        
-        return classpath.toString();
-    }
-
-    /**
-     * Returns the Tuscany feature location.
-     *  
-     * @return
-     */
-    static IPath feature() {
-        try {
-            URL location = Platform.getInstallLocation().getURL();
-            File feature = new File(location.getPath() + "/features/" + TUSCANY_FEATURE + "_" + TUSCANY_VERSION);
-            return new Path(feature.getPath());
-        } catch (Exception e) {
-            error("Tuscany runtime feature not found", e);
-            return null;
-        }
-    }
-
-    /**
-     * Returns the location of the runtime distribution under the Tuscany feature.
-     * 
-     * @param feature
-     * @return
-     */
-    static IPath runtime(IPath feature) {
-        IPath runtimePath = null;
-        try {
-            
-            // Find the Tuscany distribution under the feature's runtime directory
-            // Typically runtime/distro-archive-name/un-archived-distro-dir
-            File file = new File(feature.toFile(), "runtime");
-            if (file.exists()) {
-                File distro = null;
-                for (File f: file.listFiles()) {
-                    if (f.getName().contains("tuscany-sca")) {
-                        distro = f;
-                        break;
-                    }
-                }
-                if (distro != null) {
-                    for (File f: distro.listFiles()) {
-                        if (f.getName().contains("tuscany-sca")) {
-                            runtimePath = new Path(f.getPath());
-                            break;
-                        }
-                    }
-                    if (runtimePath == null) {
-                        error("Tuscany runtime distribution directory not found", new FileNotFoundException(distro.getAbsolutePath()));
-                    }
-                } else {
-                    error("Tuscany runtime distribution archive not found", new FileNotFoundException(file.getAbsolutePath()));
-                }
-            } else {
-                error("Tuscany runtime feature not found", new FileNotFoundException(file.getAbsolutePath()));
-            }
-        } catch (Exception e) {
-            error("Tuscany runtime feature not found", e);
-        }
-        return runtimePath;
-    }
-
-    /**
-     * Returns the location of the src distribution under the Tuscany feature.
-     * 
-     * @param feature
-     * @return
-     */
-    static IPath src(IPath feature) {
-        IPath sourcePath = null;
-        try {
-
-            // Find the Tuscany source distribution under the feature's src directory
-            // Typically src/distro-archive-src.zip
-            File file = new File(feature.toFile(), "src");
-            if (file.exists()) {
-                File distro = null;
-                for (File f: file.listFiles()) {
-                    if (f.getName().contains("tuscany-sca") && f.getName().endsWith("-src.zip")) {
-                        distro = f;
-                        break;
-                    }
-                }
-                if (distro != null) {
-                    sourcePath = new Path(distro.getPath());
-                }
-            }
-        } catch (Exception e) {
-        }
-        return sourcePath;
-    }
-    
-}
+/*
+ * 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.    
+ */
+
+package org.apache.tuscany.sca.core.classpath;
+
+import static org.apache.tuscany.sca.core.log.LogUtil.error;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtension;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jdt.core.IClasspathContainer;
+import org.eclipse.jdt.core.IClasspathEntry;
+
+/**
+ * Utility functions to help determine the runtime classpath.
+ *
+ * @version $Rev: $ $Date: $
+ */
+public class ClasspathUtil {
+
+    private static final String TUSCANY_RUNTIME_LIBRARIES = "org.apache.tuscany.sca.core.runtimeLibraries";
+
+    private static final String TUSCANY_FEATURE = "org.apache.tuscany.sca.feature";
+    private static final String TUSCANY_VERSION = "1.4.0";
+    
+    /**
+     * Return the installed runtime classpath entries.
+     * 
+     * @return
+     * @throws CoreException
+     */
+    public static String installedRuntimeClasspath() throws CoreException {
+        
+        List<IClasspathEntry> classpathEntries = new ArrayList<IClasspathEntry>(); 
+        for (IExtension extension: Platform.getExtensionRegistry().getExtensionPoint(TUSCANY_RUNTIME_LIBRARIES).getExtensions()) {
+            for (IConfigurationElement configuration: extension.getConfigurationElements()) {
+                IClasspathContainer container = (IClasspathContainer)configuration.createExecutableExtension("class");
+                classpathEntries.addAll(Arrays.asList(container.getClasspathEntries()));
+            }
+        }
+        
+        String separator = System.getProperty("path.separator");
+        StringBuffer classpath = new StringBuffer();
+        for (int i = 0, n = classpathEntries.size(); i < n; i++) {
+            IClasspathEntry entry = classpathEntries.get(i);
+            if (i >0) {
+                classpath.append(separator);
+            }
+            classpath.append(entry.getPath().toFile().toURI().getPath());
+        }
+        
+        return classpath.toString();
+    }
+
+    /**
+     * Returns the Tuscany feature location.
+     *  
+     * @return
+     */
+    static IPath feature() {
+        try {
+            URL location = Platform.getInstallLocation().getURL();
+            File feature = new File(location.getPath() + "/features/" + TUSCANY_FEATURE + "_" + TUSCANY_VERSION);
+            return new Path(feature.getPath());
+        } catch (Exception e) {
+            error("Tuscany runtime feature not found", e);
+            return null;
+        }
+    }
+
+    /**
+     * Returns the location of the runtime distribution under the Tuscany feature.
+     * 
+     * @param feature
+     * @return
+     */
+    static IPath runtime(IPath feature) {
+        IPath runtimePath = null;
+        try {
+            
+            // Find the Tuscany distribution under the feature's runtime directory
+            // Typically runtime/distro-archive-name/un-archived-distro-dir
+            File file = new File(feature.toFile(), "runtime");
+            if (file.exists()) {
+                File distro = null;
+                for (File f: file.listFiles()) {
+                    if (f.getName().contains("tuscany-sca")) {
+                        distro = f;
+                        break;
+                    }
+                }
+                if (distro != null) {
+                    for (File f: distro.listFiles()) {
+                        if (f.getName().contains("tuscany-sca")) {
+                            runtimePath = new Path(f.getPath());
+                            break;
+                        }
+                    }
+                    if (runtimePath == null) {
+                        error("Tuscany runtime distribution directory not found", new FileNotFoundException(distro.getAbsolutePath()));
+                    }
+                } else {
+                    error("Tuscany runtime distribution archive not found", new FileNotFoundException(file.getAbsolutePath()));
+                }
+            } else {
+                error("Tuscany runtime feature not found", new FileNotFoundException(file.getAbsolutePath()));
+            }
+        } catch (Exception e) {
+            error("Tuscany runtime feature not found", e);
+        }
+        return runtimePath;
+    }
+
+    /**
+     * Returns the location of the src distribution under the Tuscany feature.
+     * 
+     * @param feature
+     * @return
+     */
+    static IPath src(IPath feature) {
+        IPath sourcePath = null;
+        try {
+
+            // Find the Tuscany source distribution under the feature's src directory
+            // Typically src/distro-archive-src.zip
+            File file = new File(feature.toFile(), "src");
+            if (file.exists()) {
+                File distro = null;
+                for (File f: file.listFiles()) {
+                    if (f.getName().contains("tuscany-sca") && f.getName().endsWith("-src.zip")) {
+                        distro = f;
+                        break;
+                    }
+                }
+                if (distro != null) {
+                    sourcePath = new Path(distro.getPath());
+                }
+            }
+        } catch (Exception e) {
+        }
+        return sourcePath;
+    }
+    
+}

Modified: incubator/tuscany/java/sca/tools/eclipse/plugins/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/eclipse/plugins/core/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/eclipse/plugins/core/pom.xml (original)
+++ incubator/tuscany/java/sca/tools/eclipse/plugins/core/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-eclipse-tools</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>org.apache.tuscany.sca.core</artifactId>

Modified: incubator/tuscany/java/sca/tools/eclipse/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/eclipse/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/eclipse/pom.xml (original)
+++ incubator/tuscany/java/sca/tools/eclipse/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-tools</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

Modified: incubator/tuscany/java/sca/tools/eclipse/site/updatesite/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/eclipse/site/updatesite/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/eclipse/site/updatesite/pom.xml (original)
+++ incubator/tuscany/java/sca/tools/eclipse/site/updatesite/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-eclipse-tools</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>org.apache.tuscany.sca.updatesite</artifactId>
@@ -36,12 +36,12 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>org.apache.tuscany.sca.core</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>org.apache.tuscany.sca.feature</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

Modified: incubator/tuscany/java/sca/tools/eclipse/site/updatesite/site.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/eclipse/site/updatesite/site.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/eclipse/site/updatesite/site.xml (original)
+++ incubator/tuscany/java/sca/tools/eclipse/site/updatesite/site.xml Sat Jun 14 03:06:39 2008
@@ -22,15 +22,15 @@
       Apache Tuscany SCA Tools.
    </description>
    
-   <feature id="org.apache.tuscany.sca.feature" version="1.2.0"
-      url="features/org.apache.tuscany.sca.feature-2.0-incubating-SNAPSHOT.jar"/>
+   <feature id="org.apache.tuscany.sca.feature" version="1.4.0"
+      url="features/org.apache.tuscany.sca.feature-1.4-SNAPSHOT.jar"/>
    
-   <archive path="plugins/org.apache.tuscany.sca.core_1.2.0.jar"
-      url="plugins/org.apache.tuscany.sca.core-2.0-incubating-SNAPSHOT.jar"/>
+   <archive path="plugins/org.apache.tuscany.sca.core_1.4.0.jar"
+      url="plugins/org.apache.tuscany.sca.core-1.4-SNAPSHOT.jar"/>
 
-   <archive path="features/org.apache.tuscany.sca.feature_1.2.0/runtime/apache-tuscany-sca-2.0-incubating-SNAPSHOT.jar"
-      url="../apache-tuscany-sca-2.0-incubating-SNAPSHOT.zip"/>
+   <archive path="features/org.apache.tuscany.sca.feature_1.4.0/runtime/apache-tuscany-sca-1.4-SNAPSHOT.jar"
+      url="../apache-tuscany-sca-1.4-SNAPSHOT.zip"/>
 
-   <archive path="features/org.apache.tuscany.sca.feature_1.2.0/src/apache-tuscany-sca-2.0-incubating-SNAPSHOT-src.zip"
-      url="../apache-tuscany-sca-2.0-incubating-SNAPSHOT-src.zip"/>   
+   <archive path="features/org.apache.tuscany.sca.feature_1.4.0/src/apache-tuscany-sca-1.4-SNAPSHOT-src.zip"
+      url="../apache-tuscany-sca-1.4-SNAPSHOT-src.zip"/>   
 </site>

Modified: incubator/tuscany/java/sca/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml (original)
+++ incubator/tuscany/java/sca/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml Sat Jun 14 03:06:39 2008
@@ -28,7 +28,6 @@
         <fileSet>
              <outputDirectory>tuscany-sca-${tuscany.version}-updatesite</outputDirectory>
             <includes>
-                <include>DISCLAIMER</include>
                 <include>LICENSE</include>
                 <include>NOTICE</include>
                 <include>site.xml</include>

Modified: incubator/tuscany/java/sca/tools/java2wsdl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/java2wsdl/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/java2wsdl/pom.xml (original)
+++ incubator/tuscany/java/sca/tools/java2wsdl/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-tools</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-java2wsdl</artifactId>
@@ -38,13 +38,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>

Modified: incubator/tuscany/java/sca/tools/maven/maven-ant-generator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/maven/maven-ant-generator/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/maven/maven-ant-generator/pom.xml (original)
+++ incubator/tuscany/java/sca/tools/maven/maven-ant-generator/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-maven-tools</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-maven-ant-generator</artifactId>

Modified: incubator/tuscany/java/sca/tools/maven/maven-dependency-lister/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/maven/maven-dependency-lister/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/maven/maven-dependency-lister/pom.xml (original)
+++ incubator/tuscany/java/sca/tools/maven/maven-dependency-lister/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-maven-tools</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-maven-dependency-lister</artifactId>

Modified: incubator/tuscany/java/sca/tools/maven/maven-incremental-build/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/maven/maven-incremental-build/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/maven/maven-incremental-build/pom.xml (original)
+++ incubator/tuscany/java/sca/tools/maven/maven-incremental-build/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-maven-tools</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-maven-incremental-build</artifactId>

Modified: incubator/tuscany/java/sca/tools/maven/maven-java2wsdl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/maven/maven-java2wsdl/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/maven/maven-java2wsdl/pom.xml (original)
+++ incubator/tuscany/java/sca/tools/maven/maven-java2wsdl/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-maven-tools</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-maven-java2wsdl</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-java2wsdl</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>

Modified: incubator/tuscany/java/sca/tools/maven/maven-web-junit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/maven/maven-web-junit/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/maven/maven-web-junit/pom.xml (original)
+++ incubator/tuscany/java/sca/tools/maven/maven-web-junit/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-maven-tools</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-maven-web-junit</artifactId>

Modified: incubator/tuscany/java/sca/tools/maven/maven-wsdl2java/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/maven/maven-wsdl2java/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/maven/maven-wsdl2java/pom.xml (original)
+++ incubator/tuscany/java/sca/tools/maven/maven-wsdl2java/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-maven-tools</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-maven-wsdl2java</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-wsdl2java</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>

Modified: incubator/tuscany/java/sca/tools/maven/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/maven/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/maven/pom.xml (original)
+++ incubator/tuscany/java/sca/tools/maven/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-tools</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

Modified: incubator/tuscany/java/sca/tools/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/pom.xml (original)
+++ incubator/tuscany/java/sca/tools/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-sca-tools</artifactId>

Modified: incubator/tuscany/java/sca/tools/runtime-inspector/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/runtime-inspector/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/runtime-inspector/pom.xml (original)
+++ incubator/tuscany/java/sca/tools/runtime-inspector/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-tools</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tools-runtime-inspector</artifactId>
@@ -40,19 +40,19 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
             
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node2-impl</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 

Modified: incubator/tuscany/java/sca/tools/wsdl2java/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/wsdl2java/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/wsdl2java/pom.xml (original)
+++ incubator/tuscany/java/sca/tools/wsdl2java/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca-tools</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-wsdl2java</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 

Modified: incubator/tuscany/java/sca/tutorial/assets/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/assets/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/assets/pom.xml (original)
+++ incubator/tuscany/java/sca/tutorial/assets/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-assets</artifactId>
@@ -39,13 +39,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -74,7 +74,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-incubating-SNAPSHOT</version>
+                <version>1.4-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>

Modified: incubator/tuscany/java/sca/tutorial/catalog-ejb/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/catalog-ejb/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/catalog-ejb/pom.xml (original)
+++ incubator/tuscany/java/sca/tutorial/catalog-ejb/pom.xml Sat Jun 14 03:06:39 2008
@@ -1,110 +1,110 @@
-<?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.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-tutorial</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tutorial-catalog-ejb</artifactId>
-    <name>Apache Tuscany SCA Tutorial Catalog EJB</name>
-    <packaging>jar</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
-            <version>1.0</version>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-openejb</artifactId>
-            <version>2.1.1</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.geronimo.modules</groupId>
-                    <artifactId>geronimo-connector</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.modules</groupId>
-                    <artifactId>geronimo-persistence-jpa10</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.openejb</groupId>
-                    <artifactId>openejb-ejbd</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.openejb</groupId>
-                    <artifactId>openejb-server</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.openejb</groupId>
-                    <artifactId>openejb-loader</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.openejb</groupId>
-                    <artifactId>openejb-jee</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.openejb</groupId>
-                    <artifactId>openejb-ejbd</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.openejb</groupId>
-                    <artifactId>openejb-javaagent</artifactId>
+<?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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-tutorial</artifactId>
+        <version>1.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>tutorial-catalog-ejb</artifactId>
+    <name>Apache Tuscany SCA Tutorial Catalog EJB</name>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.2</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-openejb</artifactId>
+            <version>2.1.1</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.geronimo.modules</groupId>
+                    <artifactId>geronimo-connector</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.modules</groupId>
+                    <artifactId>geronimo-persistence-jpa10</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.openejb</groupId>
+                    <artifactId>openejb-ejbd</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.openejb</groupId>
+                    <artifactId>openejb-server</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.openejb</groupId>
+                    <artifactId>openejb-loader</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.openejb</groupId>
+                    <artifactId>openejb-jee</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.openejb</groupId>
+                    <artifactId>openejb-ejbd</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.openejb</groupId>
+                    <artifactId>openejb-javaagent</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>com.sun.xml.bind</groupId>
                     <artifactId>jaxb-impl</artifactId>
-                </exclusion>                
-            </exclusions>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
-
-</project>
-
+                </exclusion>                
+            </exclusions>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
+</project>
+

Modified: incubator/tuscany/java/sca/tutorial/catalog-mediation/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/catalog-mediation/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/catalog-mediation/pom.xml (original)
+++ incubator/tuscany/java/sca/tutorial/catalog-mediation/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-catalog-mediation</artifactId>
@@ -39,13 +39,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tutorial-assets</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tutorial-catalog-ejb</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -76,7 +76,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-incubating-SNAPSHOT</version>
+                <version>1.4-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>

Modified: incubator/tuscany/java/sca/tutorial/catalog-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/catalog-webapp/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/catalog-webapp/pom.xml (original)
+++ incubator/tuscany/java/sca/tutorial/catalog-webapp/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-catalog-webapp</artifactId>
@@ -40,30 +40,30 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-api</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tutorial-assets</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node2-launcher</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node2-api</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tutorial-assets</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node2-launcher</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+        
     </dependencies>
     
     <build>
@@ -72,15 +72,15 @@
        <resources>
           <resource>
               <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/*.java</exclude>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.xml</exclude>
-                  <exclude>target/**</exclude>
-                  <exclude>webapp/**</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
+              <excludes>
+                  <exclude>**/*.java</exclude>
+                  <exclude>**/.*/**</exclude>
+                  <exclude>pom.xml</exclude>
+                  <exclude>build.xml</exclude>
+                  <exclude>target/**</exclude>
+                  <exclude>webapp/**</exclude>
+                  <exclude>target/**</exclude>
+              </excludes>
           </resource>
        </resources>
        
@@ -95,7 +95,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-incubating-SNAPSHOT</version>
+                <version>1.4-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>

Modified: incubator/tuscany/java/sca/tutorial/domain/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/domain/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/domain/pom.xml (original)
+++ incubator/tuscany/java/sca/tutorial/domain/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-domain</artifactId>
@@ -39,90 +39,90 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node2-launcher</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-manager</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -154,7 +154,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-incubating-SNAPSHOT</version>
+                <version>1.4-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>

Modified: incubator/tuscany/java/sca/tutorial/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/pom.xml (original)
+++ incubator/tuscany/java/sca/tutorial/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-tutorial</artifactId>

Modified: incubator/tuscany/java/sca/tutorial/store-client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store-client/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store-client/pom.xml (original)
+++ incubator/tuscany/java/sca/tutorial/store-client/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-client</artifactId>
@@ -39,52 +39,52 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node2-launcher</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node2-api</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
@@ -108,7 +108,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-incubating-SNAPSHOT</version>
+                <version>1.4-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>

Modified: incubator/tuscany/java/sca/tutorial/store-db/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store-db/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store-db/pom.xml (original)
+++ incubator/tuscany/java/sca/tutorial/store-db/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-db</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-incubating-SNAPSHOT</version>
+                <version>1.4-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>

Modified: incubator/tuscany/java/sca/tutorial/store-eu/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store-eu/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store-eu/pom.xml (original)
+++ incubator/tuscany/java/sca/tutorial/store-eu/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-eu</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-incubating-SNAPSHOT</version>
+                <version>1.4-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>

Modified: incubator/tuscany/java/sca/tutorial/store-market/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store-market/build.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store-market/build.xml (original)
+++ incubator/tuscany/java/sca/tutorial/store-market/build.xml Sat Jun 14 03:06:39 2008
@@ -46,7 +46,7 @@
     </target>
 
     <fileset id="tuscany.jars" dir="../../modules">
-        <include name="tuscany-sca-api-2.0-incubating-SNAPSHOT.jar"/>
+        <include name="tuscany-sca-api-1.4-SNAPSHOT.jar"/>
     </fileset>
     <fileset id="3rdparty.jars" dir="../../lib">
     </fileset>

Modified: incubator/tuscany/java/sca/tutorial/store-market/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store-market/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store-market/pom.xml (original)
+++ incubator/tuscany/java/sca/tutorial/store-market/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-market</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-incubating-SNAPSHOT</version>
+                <version>1.4-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>

Modified: incubator/tuscany/java/sca/tutorial/store-mashup/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store-mashup/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store-mashup/pom.xml (original)
+++ incubator/tuscany/java/sca/tutorial/store-mashup/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-mashup</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-incubating-SNAPSHOT</version>
+                <version>1.4-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>

Modified: incubator/tuscany/java/sca/tutorial/store-merger/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store-merger/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store-merger/pom.xml (original)
+++ incubator/tuscany/java/sca/tutorial/store-merger/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-merger</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-incubating-SNAPSHOT</version>
+                <version>1.4-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>

Modified: incubator/tuscany/java/sca/tutorial/store-supplier/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store-supplier/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store-supplier/pom.xml (original)
+++ incubator/tuscany/java/sca/tutorial/store-supplier/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-supplier</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-incubating-SNAPSHOT</version>
+                <version>1.4-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>

Modified: incubator/tuscany/java/sca/tutorial/store-test/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store-test/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store-test/pom.xml (original)
+++ incubator/tuscany/java/sca/tutorial/store-test/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-test</artifactId>
@@ -39,108 +39,108 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-data-api</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node2-launcher</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node2-api</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-manager</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -161,7 +161,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tutorial-store-supplier</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -186,7 +186,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-incubating-SNAPSHOT</version>
+                <version>1.4-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>

Modified: incubator/tuscany/java/sca/tutorial/store/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store/pom.xml (original)
+++ incubator/tuscany/java/sca/tutorial/store/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-incubating-SNAPSHOT</version>
+                <version>1.4-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>

Modified: incubator/tuscany/java/sca/tutorial/web-services/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/web-services/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/web-services/pom.xml (original)
+++ incubator/tuscany/java/sca/tutorial/web-services/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-web-services</artifactId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
     </dependencies>
     
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-incubating-SNAPSHOT</version>
+                <version>1.4-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>

Modified: incubator/tuscany/java/sca/tutorial/www-services/cart-amazon/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/www-services/cart-amazon/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/www-services/cart-amazon/pom.xml (original)
+++ incubator/tuscany/java/sca/tutorial/www-services/cart-amazon/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-cart-amazon</artifactId>
@@ -33,34 +33,34 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -79,13 +79,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -156,7 +156,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-incubating-SNAPSHOT</version>
+                <version>1.4-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
@@ -168,7 +168,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-wsdl2java</artifactId>
-                <version>2.0-incubating-SNAPSHOT</version>
+                <version>1.4-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
@@ -185,7 +185,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-incubating-SNAPSHOT</version>
+                <version>1.4-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>

Modified: incubator/tuscany/java/sca/tutorial/www-services/catalog-amazon/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/www-services/catalog-amazon/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/www-services/catalog-amazon/pom.xml (original)
+++ incubator/tuscany/java/sca/tutorial/www-services/catalog-amazon/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-catalog-amazon</artifactId>
@@ -33,48 +33,48 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-saxon</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-xquery</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 

Modified: incubator/tuscany/java/sca/tutorial/www-services/catalog-amazon/store-db/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/www-services/catalog-amazon/store-db/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/www-services/catalog-amazon/store-db/pom.xml (original)
+++ incubator/tuscany/java/sca/tutorial/www-services/catalog-amazon/store-db/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-tutorial</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-store-db</artifactId>
@@ -39,40 +39,40 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tutorial-assets</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -96,7 +96,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>2.0-incubating-SNAPSHOT</version>
+                <version>1.4-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>

Modified: incubator/tuscany/java/sca/tutorial/www-services/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/www-services/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/www-services/pom.xml (original)
+++ incubator/tuscany/java/sca/tutorial/www-services/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tutorial-www-services</artifactId>

Modified: incubator/tuscany/java/sca/vtest/assembly/ctypefile/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/assembly/ctypefile/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/vtest/assembly/ctypefile/pom.xml (original)
+++ incubator/tuscany/java/sca/vtest/assembly/ctypefile/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>vtest-assembly</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-assembly-ctypefile</artifactId>
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         

Modified: incubator/tuscany/java/sca/vtest/assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/assembly/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/vtest/assembly/pom.xml (original)
+++ incubator/tuscany/java/sca/vtest/assembly/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-vtest</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-assembly</artifactId>
@@ -33,20 +33,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>vtest-utilities</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 

Modified: incubator/tuscany/java/sca/vtest/java-api/annotations/conversational/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/annotations/conversational/pom.xml?rev=667767&r1=667766&r2=667767&view=diff
==============================================================================
--- incubator/tuscany/java/sca/vtest/java-api/annotations/conversational/pom.xml (original)
+++ incubator/tuscany/java/sca/vtest/java-api/annotations/conversational/pom.xml Sat Jun 14 03:06:39 2008
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>java-api-annotations</artifactId>
-        <version>2.0-incubating-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>vtest-java-api-annotations-conversation</artifactId>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>