From 71a7cba384b8ae7f4578fb9ab1f725d5ce616074 Mon Sep 17 00:00:00 2001
From: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 26 Oct 2009 23:44:59 +0000
Subject: Merge all changes from 1.5.2 branch into trunk

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@830026 13f79535-47bb-0310-9956-ffa450edef68
---
 .../sca-java-1.x/tools/eclipse/features/core/META-INF/MANIFEST.MF | 2 +-
 branches/sca-java-1.x/tools/eclipse/features/core/feature.xml     | 4 ++--
 .../sca-java-1.x/tools/eclipse/plugins/core/META-INF/MANIFEST.MF  | 2 +-
 .../core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java | 2 +-
 branches/sca-java-1.x/tools/eclipse/site/updatesite/site.xml      | 8 ++++----
 branches/sca-java-1.x/tools/pom.xml                               | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'branches/sca-java-1.x/tools')

diff --git a/branches/sca-java-1.x/tools/eclipse/features/core/META-INF/MANIFEST.MF b/branches/sca-java-1.x/tools/eclipse/features/core/META-INF/MANIFEST.MF
index 63215d7c6f..c3ba542745 100644
--- a/branches/sca-java-1.x/tools/eclipse/features/core/META-INF/MANIFEST.MF
+++ b/branches/sca-java-1.x/tools/eclipse/features/core/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Apache Tuscany SCA Tools Core Feature
 Bundle-SymbolicName: org.apache.tuscany.sca.feature.core
-Bundle-Version: 1.4.0
+Bundle-Version: 1.6
 Bundle-Vendor: Apache Software Foundation
diff --git a/branches/sca-java-1.x/tools/eclipse/features/core/feature.xml b/branches/sca-java-1.x/tools/eclipse/features/core/feature.xml
index 6dbeeec280..8dfcc5c36b 100644
--- a/branches/sca-java-1.x/tools/eclipse/features/core/feature.xml
+++ b/branches/sca-java-1.x/tools/eclipse/features/core/feature.xml
@@ -20,7 +20,7 @@
 <feature
       id="org.apache.tuscany.sca.feature.core"
       label="Apache Tuscany SCA Tools Core Feature"
-      version="1.4.0"
+      version="1.6"
       provider-name="Apache Software Foundation">
    <install-handler handler="org.eclipse.update.core.DefaultInstallHandler"/>
 
@@ -56,7 +56,7 @@ Unless required by applicable law or agreed to in writing, software distributed
          id="org.apache.tuscany.sca.core"
          download-size="0"
          install-size="0"
-         version="1.4.0"
+         version="1.6"
          unpack="false"/>
 
    <data
diff --git a/branches/sca-java-1.x/tools/eclipse/plugins/core/META-INF/MANIFEST.MF b/branches/sca-java-1.x/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
index 3096b99e66..d9e5b2ae16 100644
--- a/branches/sca-java-1.x/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
+++ b/branches/sca-java-1.x/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Apache Tuscany SCA Tools Core Plugin
 Bundle-SymbolicName: org.apache.tuscany.sca.core;singleton:=true
-Bundle-Version: 1.4.0
+Bundle-Version: 1.6
 Import-Package: org.eclipse.core.resources,
  org.eclipse.core.runtime,
  org.eclipse.core.runtime.jobs,
diff --git a/branches/sca-java-1.x/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java b/branches/sca-java-1.x/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java
index 46abe6f99c..9eee96833f 100644
--- a/branches/sca-java-1.x/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java
+++ b/branches/sca-java-1.x/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java
@@ -47,7 +47,7 @@ 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.core";
-    private static final String TUSCANY_VERSION = "1.5.0";
+    private static final String TUSCANY_VERSION = "1.6";
     
     /**
      * Return the installed runtime classpath entries.
diff --git a/branches/sca-java-1.x/tools/eclipse/site/updatesite/site.xml b/branches/sca-java-1.x/tools/eclipse/site/updatesite/site.xml
index 25db01fe5c..9d83433882 100644
--- a/branches/sca-java-1.x/tools/eclipse/site/updatesite/site.xml
+++ b/branches/sca-java-1.x/tools/eclipse/site/updatesite/site.xml
@@ -22,15 +22,15 @@
       Apache Tuscany SCA Tools.
    </description>
    
-   <feature id="org.apache.tuscany.sca.feature.core" version="1.4.0"
+   <feature id="org.apache.tuscany.sca.feature.core" version="1.5.1"
       url="features/org.apache.tuscany.sca.feature.core-1.6-SNAPSHOT.jar"/>
    
-   <archive path="plugins/org.apache.tuscany.sca.core_1.4.0.jar"
+   <archive path="plugins/org.apache.tuscany.sca.core_1.5.1.jar"
       url="plugins/org.apache.tuscany.sca.core-1.6-SNAPSHOT.jar"/>
 
-   <archive path="features/org.apache.tuscany.sca.feature.core_1.4.0/runtime/apache-tuscany-sca-1.6-SNAPSHOT.jar"
+   <archive path="features/org.apache.tuscany.sca.feature.core_1.5.1/runtime/apache-tuscany-sca-1.6-SNAPSHOT.jar"
       url="../apache-tuscany-sca-1.6-SNAPSHOT.zip"/>
 
-   <archive path="features/org.apache.tuscany.sca.feature.core_1.4.0/src/apache-tuscany-sca-1.6-SNAPSHOT-src.zip"
+   <archive path="features/org.apache.tuscany.sca.feature.core_1.5.1/src/apache-tuscany-sca-1.6-SNAPSHOT-src.zip"
       url="../apache-tuscany-sca-1.6-SNAPSHOT-src.zip"/>   
 </site>
diff --git a/branches/sca-java-1.x/tools/pom.xml b/branches/sca-java-1.x/tools/pom.xml
index 6e920335af..77b35a11d6 100644
--- a/branches/sca-java-1.x/tools/pom.xml
+++ b/branches/sca-java-1.x/tools/pom.xml
@@ -41,7 +41,7 @@
                 <module>java2wsdl</module>
                 <module>maven</module>
                 <module>wsdl2java</module>
-		<module>wsdl2java-cxf</module>
+		<module>./databinding/sdo</module>
             </modules>
         </profile>
     </profiles>
-- 
cgit v1.2.3