You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2010/11/02 15:30:59 UTC
svn commit: r1030063 - in /tuscany/sca-java-1.x/branches/sca-java-1.6.1:
distribution/ distribution/src/main/assembly/ tools/eclipse/
tools/eclipse/features/core/ tools/eclipse/features/core/META-INF/
tools/eclipse/plugins/core/ tools/eclipse/plugins/c...
Author: nash
Date: Tue Nov 2 14:30:58 2010
New Revision: 1030063
URL: http://svn.apache.org/viewvc?rev=1030063&view=rev
Log:
TUSCANY-3762: Fix Eclipse feature/plugin installation issues
Added:
tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/src/main/assembly/featurecore.xml
tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/src/main/assembly/updatesite.xml
tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about.html
tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about.ini
tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about_files/
tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about_files/LICENSE
- copied, changed from r1026272, tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/LICENSE
tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about_files/NOTICE
- copied, changed from r1026272, tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/NOTICE
tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/feature.version
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/pom.xml
tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/META-INF/MANIFEST.MF
tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/feature.xml
tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/pom.xml
tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java
tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/pom.xml
tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/pom.xml
tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/pom.xml
tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/site.xml
tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
Modified: tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/pom.xml?rev=1030063&r1=1030062&r2=1030063&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/pom.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/pom.xml Tue Nov 2 14:30:58 2010
@@ -36,8 +36,10 @@
</properties>
<modules>
+ <!--
<module>bundle</module>
<module>manifest</module>
+ -->
</modules>
<dependencies>
@@ -351,7 +353,39 @@
<finalName>apache-tuscany-sca-${pom.version}</finalName>
</configuration>
</execution>
- </executions>
+ <execution>
+ <id>distribution-updatesite</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/updatesite.xml</descriptor>
+ </descriptors>
+ <finalName>apache-tuscany-sca-${pom.version}</finalName>
+ </configuration>
+ </execution>
+ <execution>
+ <id>distribution-featurecore</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/featurecore.xml</descriptor>
+ </descriptors>
+ <archive>
+ <manifestFile>../tools/eclipse/features/core/target/classes/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ <outputDirectory>target/apache-tuscany-sca-${tuscany.version}-updatesite.dir/tuscany-sca-${tuscany.version}-updatesite/features</outputDirectory>
+ <finalName>org.apache.tuscany.sca.feature.core-${pom.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <attach>false</attach>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
Added: tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/src/main/assembly/featurecore.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/src/main/assembly/featurecore.xml?rev=1030063&view=auto
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/src/main/assembly/featurecore.xml (added)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/src/main/assembly/featurecore.xml Tue Nov 2 14:30:58 2010
@@ -0,0 +1,62 @@
+<?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.
+-->
+<assembly>
+ <!--
+ id typically identifies the "type" (src vs bin etc) of the assembly
+ -->
+ <id>featurecore</id>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <formats>
+ <format>jar</format>
+ </formats>
+
+ <fileSets>
+ <fileSet>
+ <directory>../tools/eclipse/features/core/target/classes</directory>
+ <outputDirectory></outputDirectory>
+ <excludes>
+ <exclude>LICENSE</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/release/bin</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>LICENSE</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/apache-tuscany-sca-${tuscany.version}.dir</directory>
+ <outputDirectory>runtime/apache-tuscany-sca-${tuscany.version}</outputDirectory>
+ <excludes>
+ <exclude>tuscany-sca-${tuscany.version}/demos/**</exclude>
+ <exclude>tuscany-sca-${tuscany.version}/samples/**</exclude>
+ <exclude>tuscany-sca-${tuscany.version}/tutorials/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>src</outputDirectory>
+ <includes>
+ <include>apache-tuscany-sca-${tuscany.version}-src.zip</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
Added: tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/src/main/assembly/updatesite.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/src/main/assembly/updatesite.xml?rev=1030063&view=auto
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/src/main/assembly/updatesite.xml (added)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/src/main/assembly/updatesite.xml Tue Nov 2 14:30:58 2010
@@ -0,0 +1,47 @@
+<?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.
+-->
+<assembly>
+ <!--
+ id typically identifies the "type" (src vs bin etc) of the assembly
+ -->
+ <id>updatesite</id>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <formats>
+ <format>dir</format>
+ </formats>
+
+ <fileSets>
+ <fileSet>
+ <directory>../tools/eclipse/site/updatesite/target/apache-tuscany-sca-${tuscany.version}-updatesite.dir</directory>
+ <outputDirectory></outputDirectory>
+ <excludes>
+ <exclude>tuscany-sca-${tuscany.version}-updatesite/LICENSE</exclude>
+ <exclude>tuscany-sca-${tuscany.version}-updatesite/features/*</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/release/bin</directory>
+ <outputDirectory>tuscany-sca-${tuscany.version}-updatesite</outputDirectory>
+ <includes>
+ <include>LICENSE</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
Modified: tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/META-INF/MANIFEST.MF?rev=1030063&r1=1030062&r2=1030063&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/META-INF/MANIFEST.MF (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/META-INF/MANIFEST.MF Tue Nov 2 14:30:58 2010
@@ -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
Modified: tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/feature.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/feature.xml?rev=1030063&r1=1030062&r2=1030063&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/feature.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/feature.xml Tue Nov 2 14:30:58 2010
@@ -19,21 +19,46 @@
-->
<feature
id="org.apache.tuscany.sca.feature.core"
- label="Apache Tuscany SCA Tools Core Feature"
- version="1.6.1-SNAPSHOT"
- 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 "License"); 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 "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.
+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.
+
+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 agr
id="org.apache.tuscany.sca.core"
download-size="0"
install-size="0"
- version="1.6.1-SNAPSHOT"
+ version="${tuscany.eclipse.version}"
unpack="false"/>
- <data
- id="runtime/apache-tuscany-sca-1.6.1-SNAPSHOT.jar"
- download-size="0"
- install-size="0"/>
-
- <data
- id="src/apache-tuscany-sca-1.6.1-SNAPSHOT-src.zip"
- download-size="0"
- install-size="0"/>
-
</feature>
Modified: tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/pom.xml?rev=1030063&r1=1030062&r2=1030063&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/pom.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/pom.xml Tue Nov 2 14:30:58 2010
@@ -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.6.1-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>
Modified: tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/META-INF/MANIFEST.MF?rev=1030063&r1=1030062&r2=1030063&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/META-INF/MANIFEST.MF (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/META-INF/MANIFEST.MF Tue Nov 2 14:30:58 2010
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Apache Tuscany SCA Tools Core Plugin
+Bundle-Name: Apache Tuscany SCA Eclipse Tools Core
Bundle-SymbolicName: org.apache.tuscany.sca.core;singleton:=true
-Bundle-Version: 1.6
+Bundle-Version: ${tuscany.eclipse.version}
Import-Package: org.eclipse.core.resources,
org.eclipse.core.runtime,
org.eclipse.core.runtime.jobs,
Added: tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about.html
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about.html?rev=1030063&view=auto
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about.html (added)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about.html Tue Nov 2 14:30:58 2010
@@ -0,0 +1,56 @@
+<!--
+ * 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.
+-->
+<html>
+<head>
+<title>About</title>
+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+</head>
+<body>
+<h2>About Apache Tuscany SCA Eclipse Tools Core Plug-in</h2>
+
+<h3>Copyright</h3>
+
+<p>Copyright (c) 2005 - 2010 The Apache Software Foundation</p>
+
+<p>This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).</p>
+
+<h3>License</h3>
+
+<p>Apache Tuscany SCA Eclipse Tools Core Plug-in is provided to you under the terms and conditions of the
+Apache License Version 2.0. A copy of the Apache Licence is provided in the
+<a href="about_files/LICENSE">LICENSE</a> file in this distribution and is also available at
+<a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>.
+See also the <a href="about_files/NOTICE">NOTICE</a> file in this distribution.</p>
+
+<h3>Third Party Content</h3>
+
+<p>The Content includes items that have been sourced from third parties as follows:</p>
+
+<h4>SCA Collaboration</h4>
+
+<p>
+This product also includes software under the SCA Collaboration license
+(see the <a href="about_files/LICENSE">LICENSE</a> file in this distribution),
+with the following copyright:</p>
+
+<p>(c) Copyright SCA Collaboration 2006, 2007</p>
+
+</body>
+</html>
Added: tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about.ini
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about.ini?rev=1030063&view=auto
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about.ini (added)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about.ini Tue Nov 2 14:30:58 2010
@@ -0,0 +1,32 @@
+#
+# 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.
+#
+aboutText=Apache Tuscany SCA Eclipse Tools Core\n\
+\n\
+Copyright (c) 2005 - 2010 The Apache Software Foundation\n\
+Visit http://tuscany.apache.org/\n\
+\n\
+This product includes software developed by The Apache Software Foundation http://www.apache.org/\n\
+\n\
+Apache Tuscany SCA for Java includes a number of subcomponents with separate copyright notices and license\n\
+terms. Your use of these subcomponents is subject to the terms and conditions of the licenses shown at\n\
+http://www.apache.org/dist/tuscany/java/sca/${pom.version}/tuscany-sca-${pom.version}-updatesite/LICENSE
+
+aboutImage=icons/tuscany.gif
+windowImage=icons/t.gif
+featureImage=icons/t.gif
Copied: tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about_files/LICENSE (from r1026272, tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/LICENSE)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about_files/LICENSE?p2=tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about_files/LICENSE&p1=tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/LICENSE&r1=1026272&r2=1030063&rev=1030063&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/LICENSE (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about_files/LICENSE Tue Nov 2 14:30:58 2010
@@ -202,4 +202,57 @@
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 following licenses.
+
+================================================================================
+
+This module includes XSD files under the following SCA Collaboration license:
+
+(c) Copyright SCA Collaboration 2006, 2007
+
+License for the Service Component Architecture JavaDoc, Interface
+Definition files and XSD files.
+
+The Service Component Architecture JavaDoc, Interface Definition files,
+and XSD files are being provided by the copyright holders under the
+following license. By using and/or copying this work, you agree that
+you have read, understood and will comply with the following terms and
+conditions:
+
+Permission to copy, display, make derivative works of, and distribute
+the Service Component Architecture JavaDoc, Interface Definition Files
+and XSD files (the "Artifacts") in any medium without fee or royalty is
+hereby granted, provided that you include the following on ALL copies
+of the Artifacts, or portions thereof, that you make:
+
+1. A link or URL to the Artifacts at this location:
+http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
+
+2. The full text of this copyright notice as shown in the Artifacts.
+
+THE ARTIFACTS ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO
+REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THE
+ARTIFACTS AND THE IMPLEMENTATION OF THEIR CONTENTS, INCLUDING, BUT NOT
+LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE, NON-INFRINGEMENT OR TITLE.
+
+THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL,
+INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY
+USE OR DISTRIBUTION OF THE ARTIFACTS.
+
+The name and trademarks of the Authors may NOT be used in any manner,
+including advertising or publicity pertaining to the Service Component
+Architecture Specification or its contents without specific, written
+prior permission. Title to copyright in the Service Component
+Architecture Specification and the JavaDoc, Interface Definition Files
+and XSD Files will at all times remain with the Authors.
+
+No other rights are granted by implication, estoppel or otherwise.
+
+Revision level 1.1, last updated on 2007/11/19
Copied: tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about_files/NOTICE (from r1026272, tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/NOTICE)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about_files/NOTICE?p2=tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about_files/NOTICE&p1=tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/NOTICE&r1=1026272&r2=1030063&rev=1030063&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/NOTICE (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about_files/NOTICE Tue Nov 2 14:30:58 2010
@@ -4,9 +4,3 @@ Copyright (c) 2005 - 2010 The Apache Sof
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
-This product also includes software under the SCA Collaboration license
-(see the LICENSE file contained in this distribution), with the following
-copyright:
-
-(c) Copyright SCA Collaboration 2006, 2007
-
Modified: tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java?rev=1030063&r1=1030062&r2=1030063&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java Tue Nov 2 14:30:58 2010
@@ -21,8 +21,11 @@ package org.apache.tuscany.sca.core.clas
import static org.apache.tuscany.sca.core.log.LogUtil.error;
+import java.io.BufferedReader;
import java.io.File;
import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
@@ -46,8 +49,8 @@ public class ClasspathUtil {
private static final String TUSCANY_RUNTIME_LIBRARIES = "org.apache.tuscany.sca.core.runtimeLibraries";
+ private static final String VERSION_RESOURCE = "/org/apache/tuscany/sca/core/feature.version";
private static final String TUSCANY_FEATURE = "org.apache.tuscany.sca.feature.core";
- private static final String TUSCANY_VERSION = "1.6.1-SNAPSHOT";
/**
* Return the installed runtime classpath entries.
@@ -84,12 +87,26 @@ public class ClasspathUtil {
* @return
*/
static IPath feature() {
+ Path featurePath = null;
+ Exception ex = null;
try {
- URL location = Platform.getInstallLocation().getURL();
- File feature = new File(location.getPath() + "/features/" + TUSCANY_FEATURE + "_" + TUSCANY_VERSION);
- return new Path(feature.getPath());
+ InputStream resourceStream = ClasspathUtil.class.getResourceAsStream(VERSION_RESOURCE);
+ if (resourceStream != null) {
+ BufferedReader reader = new BufferedReader(new InputStreamReader(resourceStream, "UTF-8"));
+ String featureVersion = reader.readLine().trim();
+ reader.close();
+ URL location = Platform.getInstallLocation().getURL();
+ File feature = new File(location.getPath() + "/features/" + TUSCANY_FEATURE + "_" + featureVersion);
+ featurePath = new Path(feature.getPath());
+ }
} catch (Exception e) {
- error("Tuscany runtime feature not found", e);
+ ex = e;
+ }
+
+ if (featurePath != null) {
+ return featurePath;
+ } else {
+ error("Tuscany runtime feature not found", ex);
return null;
}
}
Added: tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/feature.version
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/feature.version?rev=1030063&view=auto
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/feature.version (added)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/feature.version Tue Nov 2 14:30:58 2010
@@ -0,0 +1 @@
+${tuscany.eclipse.version}
Modified: tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/pom.xml?rev=1030063&r1=1030062&r2=1030063&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/pom.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/pom.xml Tue Nov 2 14:30:58 2010
@@ -21,15 +21,21 @@
<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.core</artifactId>
- <name>Apache Tuscany SCA Eclipse Tools Core Plugin</name>
+ <name>Apache Tuscany SCA Eclipse Tools Core Plug-in</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>
+ <dependency>
<groupId>org.eclipse.jdt.debug</groupId>
<artifactId>ui</artifactId>
<version>3.2.100-v20070531-1800</version>
@@ -62,29 +68,35 @@
</dependencies>
<build>
- <sourceDirectory>${basedir}</sourceDirectory>
- <resources>
- <resource>
- <directory>${basedir}</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- <exclude>**/.*/**</exclude>
- <exclude>pom.xml</exclude>
- <exclude>build.*</exclude>
- <exclude>target/**</exclude>
- </excludes>
- </resource>
- </resources>
+ <sourceDirectory>${basedir}</sourceDirectory>
+
+ <filters>
+ <filter>../../target/filter.properties</filter>
+ </filters>
+
+ <resources>
+ <resource>
+ <directory>${basedir}</directory>
+ <filtering>true</filtering>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ <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>
Modified: tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/pom.xml?rev=1030063&r1=1030062&r2=1030063&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/pom.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/pom.xml Tue Nov 2 14:30:58 2010
@@ -44,4 +44,28 @@
</profile>
</profiles>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <tstamp/>
+ <mkdir dir="target"/>
+ <echo file="target/filter.properties" message="tuscany.eclipse.version=${pom.version}.v${DSTAMP}-${TSTAMP}"/>
+ <replace file="target/filter.properties" token="-SNAPSHOT"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/pom.xml?rev=1030063&r1=1030062&r2=1030063&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/pom.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/pom.xml Tue Nov 2 14:30:58 2010
@@ -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>
Modified: tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/site.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/site.xml?rev=1030063&r1=1030062&r2=1030063&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/site.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/site.xml Tue Nov 2 14:30:58 2010
@@ -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>
Modified: tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml?rev=1030063&r1=1030062&r2=1030063&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml Tue Nov 2 14:30:58 2010
@@ -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>