diff options
author | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-11-02 14:30:58 +0000 |
---|---|---|
committer | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-11-02 14:30:58 +0000 |
commit | 14de34abd0f2deb2f67693e96c43157a61460fe2 (patch) | |
tree | 7a1603f223c5d8feb60b4848d8ce40f3e526cecd /sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite | |
parent | 54dcf777e655a94049d8000f8f7b15846f1d54e6 (diff) |
TUSCANY-3762: Fix Eclipse feature/plugin installation issues
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1030063 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite')
3 files changed, 45 insertions, 44 deletions
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/pom.xml index 95069f0c57..bba8c6a5a2 100644 --- a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/pom.xml @@ -21,9 +21,9 @@ <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.6.1-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../../../pom.xml</relativePath> </parent> <artifactId>org.apache.tuscany.sca.updatesite</artifactId> <name>Apache Tuscany SCA Eclipse Tools Update Site</name> @@ -46,19 +46,24 @@ </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> + <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> @@ -71,7 +76,7 @@ </goals> <configuration> <descriptors> - <descriptor>src/main/assembly/updatesite.xml</descriptor> + <descriptor>target/classes/src/main/assembly/updatesite.xml</descriptor> </descriptors> <tarLongFileMode>gnu</tarLongFileMode> <finalName>apache-tuscany-sca-${pom.version}</finalName> diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/site.xml b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/site.xml index e896946296..0a433ee065 100644 --- a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/site.xml +++ b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/site.xml @@ -19,18 +19,20 @@ --> <site> <description url="http://tuscany.apache.org"> - Apache Tuscany SCA Tools. + Apache Tuscany SCA Eclipse Tools </description> - <feature id="org.apache.tuscany.sca.feature.core" version="1.6.1-SNAPSHOT" - url="features/org.apache.tuscany.sca.feature.core-1.6.1-SNAPSHOT.jar"/> + <feature id="org.apache.tuscany.sca.feature.core" version="${tuscany.eclipse.version}" + url="features/org.apache.tuscany.sca.feature.core-${pom.version}.jar"> + <category name="Apache Tuscany SCA Eclipse Tools"/> + </feature> - <archive path="plugins/org.apache.tuscany.sca.core_1.6.1-SNAPSHOT.jar" - url="plugins/org.apache.tuscany.sca.core-1.6.1-SNAPSHOT.jar"/> + <archive path="plugins/org.apache.tuscany.sca.core_${tuscany.eclipse.version}" + url="plugins/org.apache.tuscany.sca.core_${tuscany.eclipse.version}.jar"/> - <archive path="features/org.apache.tuscany.sca.feature.core_1.6.1-SNAPSHOT/runtime/apache-tuscany-sca-1.6.1-SNAPSHOT.jar" - url="../apache-tuscany-sca-1.6.1-SNAPSHOT.zip"/> - - <archive path="features/org.apache.tuscany.sca.feature.core_1.6.1-SNAPSHOT/src/apache-tuscany-sca-1.6.1-SNAPSHOT-src.zip" - url="../apache-tuscany-sca-1.6.1-SNAPSHOT-src.zip"/> + <category-def name="Apache Tuscany SCA Eclipse Tools" label="Apache Tuscany SCA Eclipse Tools"> + <description> + The Apache Tuscany SCA Eclipse Tools category contains all features related to Apache Tuscany SCA. + </description> + </category-def> </site> diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml index 1ba06af971..6d11e978af 100644 --- a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml +++ b/sca-java-1.x/branches/sca-java-1.6.1/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> |