Merge r1030063 TUSCANY-3762: Fix Eclipse feature/plugin installation issues

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1030068 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 72 insertions, 43 deletions

diff --git a/sca-java-1.x/trunk/tools/eclipse/features/core/META-INF/MANIFEST.MF b/sca-java-1.x/trunk/tools/eclipse/features/core/META-INF/MANIFEST.MF
index c3ba542745..c259c8c6d8 100644
--- a/sca-java-1.x/trunk/tools/eclipse/features/core/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/trunk/tools/eclipse/features/core/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0

 Bundle-ManifestVersion: 2

-Bundle-Name: Apache Tuscany SCA Tools Core Feature

+Bundle-Name: Apache Tuscany SCA Eclipse Tools Core

 Bundle-SymbolicName: org.apache.tuscany.sca.feature.core

-Bundle-Version: 1.6

+Bundle-Version: ${tuscany.eclipse.version}

 Bundle-Vendor: Apache Software Foundation

diff --git a/sca-java-1.x/trunk/tools/eclipse/features/core/feature.xml b/sca-java-1.x/trunk/tools/eclipse/features/core/feature.xml
index 7b43a015b2..649bffe695 100644
--- a/sca-java-1.x/trunk/tools/eclipse/features/core/feature.xml
+++ b/sca-java-1.x/trunk/tools/eclipse/features/core/feature.xml
@@ -19,21 +19,46 @@
 -->
 <feature
       id="org.apache.tuscany.sca.feature.core"
-      label="Apache Tuscany SCA Tools Core Feature"
-      version="1.6"
-      provider-name="Apache Software Foundation">
-   <install-handler handler="org.eclipse.update.core.DefaultInstallHandler"/>
+      label="Apache Tuscany SCA Eclipse Tools Core"
+      version="${tuscany.eclipse.version}"
+      provider-name="Apache Software Foundation"
+      plugin="org.apache.tuscany.sca.core">
 
    <description url="http://tuscany.apache.org">
-      Apache Tuscany SCA Tools Core Feature.
+      Apache Tuscany SCA Eclipse Tools Core
    </description>
 
-   <license url="http://www.apache.org/licenses/LICENSE-2.0">
-      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 &quot;License&quot;); you may not use this file except in compliance with the License.  You may obtain a copy of the License at
+   <copyright>
+Copyright (c) 2005 - 2010 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+   </copyright>
+
+   <license url="LICENSE">
+Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+agreements. See the LICENSE and NOTICE files 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 &quot;License&quot;);
+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 &quot;AS IS&quot; 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.
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an &quot;AS IS&quot; 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.
+
+APACHE TUSCANY SCA SUBCOMPONENTS:
+
+Apache Tuscany SCA for Java includes a number of subcomponents with separate copyright
+notices and license terms. Your use of these subcomponents is subject to the terms and
+conditions of the licenses shown in the LICENSE file contained in this distribution
+and also available at
+
+http://www.apache.org/dist/tuscany/java/sca/${pom.version}/tuscany-sca-${pom.version}-updatesite/LICENSE
    </license>
 
    <requires>
@@ -56,17 +81,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.6"
+         version="${tuscany.eclipse.version}"
          unpack="false"/>
 
-   <data
-         id="runtime/apache-tuscany-sca-1.7-SNAPSHOT.jar"
-         download-size="0"
-         install-size="0"/>
-
-   <data
-         id="src/apache-tuscany-sca-1.7-SNAPSHOT-src.zip"
-         download-size="0"
-         install-size="0"/>
-
 </feature>
diff --git a/sca-java-1.x/trunk/tools/eclipse/features/core/pom.xml b/sca-java-1.x/trunk/tools/eclipse/features/core/pom.xml
index 823ad07698..8ca96f1556 100644
--- a/sca-java-1.x/trunk/tools/eclipse/features/core/pom.xml
+++ b/sca-java-1.x/trunk/tools/eclipse/features/core/pom.xml
@@ -21,35 +21,49 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca-eclipse-tools</artifactId>
+        <artifactId>tuscany-sca-tools</artifactId>
         <version>1.7-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>org.apache.tuscany.sca.feature.core</artifactId>
     <name>Apache Tuscany SCA Eclipse Tools Core Feature</name>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-eclipse-tools</artifactId>
+            <version>1.6.1-SNAPSHOT</version>
+            <type>pom</type>
+        </dependency>
+    </dependencies>
+
     <build>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.*</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
+        <filters>
+            <filter>../../target/filter.properties</filter>
+        </filters>
+
+        <resources>
+           <resource>
+               <directory>${basedir}</directory>
+               <filtering>true</filtering>
+               <excludes>
+                   <exclude>**/.*/**</exclude>
+                   <exclude>pom.xml</exclude>
+                   <exclude>build.*</exclude>
+                   <exclude>target/**</exclude>
+               </excludes>
+           </resource>
+        </resources>
 
-       <plugins>
-           <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-jar-plugin</artifactId>
-               <configuration>
-                   <archive>
-                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                   </archive>
-               </configuration>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
+                    </archive>
+                </configuration>
             </plugin>
         </plugins>
     </build>