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/plugins/core | |
| 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/plugins/core')
8 files changed, 414 insertions, 32 deletions
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/META-INF/MANIFEST.MF index d9e5b2ae16..df88abf138 100644 --- a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/META-INF/MANIFEST.MF +++ b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/META-INF/MANIFEST.MF @@ -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,
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about.html b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about.html new file mode 100644 index 0000000000..635798576f --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about.html @@ -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> diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about.ini b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about.ini new file mode 100644 index 0000000000..40f7cb3437 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about.ini @@ -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 diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about_files/LICENSE b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about_files/LICENSE new file mode 100644 index 0000000000..b3600d1296 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about_files/LICENSE @@ -0,0 +1,258 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. + + +================================================================================ + +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 diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about_files/NOTICE b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about_files/NOTICE new file mode 100644 index 0000000000..ad2ba40961 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about_files/NOTICE @@ -0,0 +1,6 @@ +${pom.name} +Copyright (c) 2005 - 2010 The Apache Software Foundation + +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). + diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java index 167e9b3c2a..8dbe0c2804 100644 --- a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java +++ b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java @@ -21,8 +21,11 @@ package org.apache.tuscany.sca.core.classpath; 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;
}
}
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/feature.version b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/feature.version new file mode 100644 index 0000000000..6bcf8a724b --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/feature.version @@ -0,0 +1 @@ +${tuscany.eclipse.version}
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/pom.xml index 5ed62280dc..e23fda702c 100644 --- a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/pom.xml @@ -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> |