From dff9ca4730357a685afdf69076f66fe3ce136541 Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 2 Nov 2010 14:46:14 +0000
Subject: 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
---
 .../updatesite/src/main/assembly/updatesite.xml    | 32 +++++++++-------------
 1 file changed, 13 insertions(+), 19 deletions(-)

(limited to 'sca-java-1.x/trunk/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml')

diff --git a/sca-java-1.x/trunk/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml b/sca-java-1.x/trunk/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
index 1ba06af971..6d11e978af 100644
--- a/sca-java-1.x/trunk/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
+++ b/sca-java-1.x/trunk/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
@@ -21,12 +21,13 @@
     <id>updatesite</id>
     <includeBaseDirectory>false</includeBaseDirectory>
     <formats>
-        <format>zip</format>
+        <format>dir</format>
     </formats>
 
     <fileSets>
         <fileSet>
-             <outputDirectory>tuscany-sca-${tuscany.version}-updatesite</outputDirectory>
+            <directory>target/classes</directory>
+            <outputDirectory>tuscany-sca-${tuscany.version}-updatesite</outputDirectory>
             <includes>
                 <include>LICENSE</include>
                 <include>NOTICE</include>
@@ -35,24 +36,17 @@
         </fileSet>
     </fileSets>
         
-    <dependencySets>
-        <dependencySet>
-             <outputDirectory>tuscany-sca-${tuscany.version}-updatesite/plugins</outputDirectory>
-            <unpack>false</unpack>
-            <includes>
-                <include>org.apache.tuscany.sca:org.apache.tuscany.sca.core</include>
-            </includes>
-            <scope>runtime</scope>
-        </dependencySet>
+    <files>
+        <file>
+            <source>../../plugins/core/target/org.apache.tuscany.sca.core-${tuscany.version}.jar</source>
+            <outputDirectory>tuscany-sca-${tuscany.version}-updatesite/plugins</outputDirectory>
+            <destName>org.apache.tuscany.sca.core_${tuscany.eclipse.version}.jar</destName>
+        </file>
 
-        <dependencySet>
+        <file>
+            <source>../../features/core/target/org.apache.tuscany.sca.feature.core-${tuscany.version}.jar</source>
             <outputDirectory>tuscany-sca-${tuscany.version}-updatesite/features</outputDirectory>
-            <unpack>false</unpack>
-            <includes>
-                <include>org.apache.tuscany.sca:org.apache.tuscany.sca.feature.core</include>
-            </includes>
-            <scope>runtime</scope>
-        </dependencySet>
-    </dependencySets>
+        </file>
+    </files>
 
 </assembly>
-- 
cgit v1.2.3