You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2008/06/16 13:50:48 UTC
svn commit: r668124 - in
/incubator/tuscany/branches/sca-java-1.3/tools/eclipse: features/feature/
features/feature/META-INF/ plugins/core/META-INF/
plugins/core/org/apache/tuscany/sca/core/classpath/ site/updatesite/
Author: antelder
Date: Mon Jun 16 04:50:48 2008
New Revision: 668124
URL: http://svn.apache.org/viewvc?rev=668124&view=rev
Log:
Update eclipse update site version from 1.2.0 to 1.3.0
Modified:
incubator/tuscany/branches/sca-java-1.3/tools/eclipse/features/feature/META-INF/MANIFEST.MF
incubator/tuscany/branches/sca-java-1.3/tools/eclipse/features/feature/feature.xml
incubator/tuscany/branches/sca-java-1.3/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
incubator/tuscany/branches/sca-java-1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java
incubator/tuscany/branches/sca-java-1.3/tools/eclipse/site/updatesite/site.xml
Modified: incubator/tuscany/branches/sca-java-1.3/tools/eclipse/features/feature/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.3/tools/eclipse/features/feature/META-INF/MANIFEST.MF?rev=668124&r1=668123&r2=668124&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.3/tools/eclipse/features/feature/META-INF/MANIFEST.MF (original)
+++ incubator/tuscany/branches/sca-java-1.3/tools/eclipse/features/feature/META-INF/MANIFEST.MF Mon Jun 16 04:50:48 2008
@@ -1,6 +1,6 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Apache Tuscany SCA Tools
-Bundle-SymbolicName: org.apache.tuscany.sca.feature
-Bundle-Version: 1.2.0
-Bundle-Vendor: Apache Software Foundation
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Apache Tuscany SCA Tools
+Bundle-SymbolicName: org.apache.tuscany.sca.feature
+Bundle-Version: 1.3.0
+Bundle-Vendor: Apache Software Foundation
Modified: incubator/tuscany/branches/sca-java-1.3/tools/eclipse/features/feature/feature.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.3/tools/eclipse/features/feature/feature.xml?rev=668124&r1=668123&r2=668124&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.3/tools/eclipse/features/feature/feature.xml (original)
+++ incubator/tuscany/branches/sca-java-1.3/tools/eclipse/features/feature/feature.xml Mon Jun 16 04:50:48 2008
@@ -20,7 +20,7 @@
<feature
id="org.apache.tuscany.sca.feature"
label="Apache Tuscany SCA Tools"
- version="1.2.0"
+ version="1.3.0"
provider-name="Apache Software Foundation">
<install-handler handler="org.eclipse.update.core.DefaultInstallHandler"/>
@@ -56,7 +56,7 @@
id="org.apache.tuscany.sca.core"
download-size="0"
install-size="0"
- version="1.2.0"
+ version="1.3.0"
unpack="false"/>
<data
Modified: incubator/tuscany/branches/sca-java-1.3/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.3/tools/eclipse/plugins/core/META-INF/MANIFEST.MF?rev=668124&r1=668123&r2=668124&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.3/tools/eclipse/plugins/core/META-INF/MANIFEST.MF (original)
+++ incubator/tuscany/branches/sca-java-1.3/tools/eclipse/plugins/core/META-INF/MANIFEST.MF Mon Jun 16 04:50:48 2008
@@ -1,31 +1,31 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Apache Tuscany SCA Tools
-Bundle-SymbolicName: org.apache.tuscany.sca.core;singleton:=true
-Bundle-Version: 1.2.0
-Import-Package: org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.core.runtime.jobs,
- org.eclipse.debug.core,
- org.eclipse.debug.core.model,
- org.eclipse.debug.ui,
- org.eclipse.debug.ui.sourcelookup,
- org.eclipse.jdt.core,
- org.eclipse.jdt.debug.ui.launchConfigurations,
- org.eclipse.jdt.launching,
- org.eclipse.jdt.ui.wizards,
- org.eclipse.jface.dialogs,
- org.eclipse.jface.operation,
- org.eclipse.jface.resource,
- org.eclipse.jface.viewers,
- org.eclipse.jface.wizard,
- org.eclipse.osgi.service.datalocation;version="1.0.0",
- org.eclipse.swt,
- org.eclipse.swt.graphics,
- org.eclipse.swt.widgets,
- org.eclipse.ui,
- org.eclipse.ui.progress,
- org.osgi.framework;version="1.3.0"
-Bundle-Vendor: Apache Software Foundation
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.ui.ide
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Apache Tuscany SCA Tools
+Bundle-SymbolicName: org.apache.tuscany.sca.core;singleton:=true
+Bundle-Version: 1.3.0
+Import-Package: org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+ org.eclipse.core.runtime.jobs,
+ org.eclipse.debug.core,
+ org.eclipse.debug.core.model,
+ org.eclipse.debug.ui,
+ org.eclipse.debug.ui.sourcelookup,
+ org.eclipse.jdt.core,
+ org.eclipse.jdt.debug.ui.launchConfigurations,
+ org.eclipse.jdt.launching,
+ org.eclipse.jdt.ui.wizards,
+ org.eclipse.jface.dialogs,
+ org.eclipse.jface.operation,
+ org.eclipse.jface.resource,
+ org.eclipse.jface.viewers,
+ org.eclipse.jface.wizard,
+ org.eclipse.osgi.service.datalocation;version="1.0.0",
+ org.eclipse.swt,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.widgets,
+ org.eclipse.ui,
+ org.eclipse.ui.progress,
+ org.osgi.framework;version="1.3.0"
+Bundle-Vendor: Apache Software Foundation
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.ui.ide
Modified: incubator/tuscany/branches/sca-java-1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java?rev=668124&r1=668123&r2=668124&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java (original)
+++ incubator/tuscany/branches/sca-java-1.3/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java Mon Jun 16 04:50:48 2008
@@ -1,170 +1,170 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.core.classpath;
-
-import static org.apache.tuscany.sca.core.log.LogUtil.error;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-
-/**
- * Utility functions to help determine the runtime classpath.
- *
- * @version $Rev: $ $Date: $
- */
-public class ClasspathUtil {
-
- private static final String TUSCANY_RUNTIME_LIBRARIES = "org.apache.tuscany.sca.core.runtimeLibraries";
-
- private static final String TUSCANY_FEATURE = "org.apache.tuscany.sca.feature";
- private static final String TUSCANY_VERSION = "1.2.0";
-
- /**
- * Return the installed runtime classpath entries.
- *
- * @return
- * @throws CoreException
- */
- public static String installedRuntimeClasspath() throws CoreException {
-
- List<IClasspathEntry> classpathEntries = new ArrayList<IClasspathEntry>();
- for (IExtension extension: Platform.getExtensionRegistry().getExtensionPoint(TUSCANY_RUNTIME_LIBRARIES).getExtensions()) {
- for (IConfigurationElement configuration: extension.getConfigurationElements()) {
- IClasspathContainer container = (IClasspathContainer)configuration.createExecutableExtension("class");
- classpathEntries.addAll(Arrays.asList(container.getClasspathEntries()));
- }
- }
-
- String separator = System.getProperty("path.separator");
- StringBuffer classpath = new StringBuffer();
- for (int i = 0, n = classpathEntries.size(); i < n; i++) {
- IClasspathEntry entry = classpathEntries.get(i);
- if (i >0) {
- classpath.append(separator);
- }
- classpath.append(entry.getPath().toFile().toURI().getPath());
- }
-
- return classpath.toString();
- }
-
- /**
- * Returns the Tuscany feature location.
- *
- * @return
- */
- static IPath feature() {
- try {
- URL location = Platform.getInstallLocation().getURL();
- File feature = new File(location.getPath() + "/features/" + TUSCANY_FEATURE + "_" + TUSCANY_VERSION);
- return new Path(feature.getPath());
- } catch (Exception e) {
- error("Tuscany runtime feature not found", e);
- return null;
- }
- }
-
- /**
- * Returns the location of the runtime distribution under the Tuscany feature.
- *
- * @param feature
- * @return
- */
- static IPath runtime(IPath feature) {
- IPath runtimePath = null;
- try {
-
- // Find the Tuscany distribution under the feature's runtime directory
- // Typically runtime/distro-archive-name/un-archived-distro-dir
- File file = new File(feature.toFile(), "runtime");
- if (file.exists()) {
- File distro = null;
- for (File f: file.listFiles()) {
- if (f.getName().contains("tuscany-sca")) {
- distro = f;
- break;
- }
- }
- if (distro != null) {
- for (File f: distro.listFiles()) {
- if (f.getName().contains("tuscany-sca")) {
- runtimePath = new Path(f.getPath());
- break;
- }
- }
- if (runtimePath == null) {
- error("Tuscany runtime distribution directory not found", new FileNotFoundException(distro.getAbsolutePath()));
- }
- } else {
- error("Tuscany runtime distribution archive not found", new FileNotFoundException(file.getAbsolutePath()));
- }
- } else {
- error("Tuscany runtime feature not found", new FileNotFoundException(file.getAbsolutePath()));
- }
- } catch (Exception e) {
- error("Tuscany runtime feature not found", e);
- }
- return runtimePath;
- }
-
- /**
- * Returns the location of the src distribution under the Tuscany feature.
- *
- * @param feature
- * @return
- */
- static IPath src(IPath feature) {
- IPath sourcePath = null;
- try {
-
- // Find the Tuscany source distribution under the feature's src directory
- // Typically src/distro-archive-src.zip
- File file = new File(feature.toFile(), "src");
- if (file.exists()) {
- File distro = null;
- for (File f: file.listFiles()) {
- if (f.getName().contains("tuscany-sca") && f.getName().endsWith("-src.zip")) {
- distro = f;
- break;
- }
- }
- if (distro != null) {
- sourcePath = new Path(distro.getPath());
- }
- }
- } catch (Exception e) {
- }
- return sourcePath;
- }
-
-}
+/*
+ * 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.
+ */
+
+package org.apache.tuscany.sca.core.classpath;
+
+import static org.apache.tuscany.sca.core.log.LogUtil.error;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtension;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jdt.core.IClasspathContainer;
+import org.eclipse.jdt.core.IClasspathEntry;
+
+/**
+ * Utility functions to help determine the runtime classpath.
+ *
+ * @version $Rev: $ $Date: $
+ */
+public class ClasspathUtil {
+
+ private static final String TUSCANY_RUNTIME_LIBRARIES = "org.apache.tuscany.sca.core.runtimeLibraries";
+
+ private static final String TUSCANY_FEATURE = "org.apache.tuscany.sca.feature";
+ private static final String TUSCANY_VERSION = "1.3.0";
+
+ /**
+ * Return the installed runtime classpath entries.
+ *
+ * @return
+ * @throws CoreException
+ */
+ public static String installedRuntimeClasspath() throws CoreException {
+
+ List<IClasspathEntry> classpathEntries = new ArrayList<IClasspathEntry>();
+ for (IExtension extension: Platform.getExtensionRegistry().getExtensionPoint(TUSCANY_RUNTIME_LIBRARIES).getExtensions()) {
+ for (IConfigurationElement configuration: extension.getConfigurationElements()) {
+ IClasspathContainer container = (IClasspathContainer)configuration.createExecutableExtension("class");
+ classpathEntries.addAll(Arrays.asList(container.getClasspathEntries()));
+ }
+ }
+
+ String separator = System.getProperty("path.separator");
+ StringBuffer classpath = new StringBuffer();
+ for (int i = 0, n = classpathEntries.size(); i < n; i++) {
+ IClasspathEntry entry = classpathEntries.get(i);
+ if (i >0) {
+ classpath.append(separator);
+ }
+ classpath.append(entry.getPath().toFile().toURI().getPath());
+ }
+
+ return classpath.toString();
+ }
+
+ /**
+ * Returns the Tuscany feature location.
+ *
+ * @return
+ */
+ static IPath feature() {
+ try {
+ URL location = Platform.getInstallLocation().getURL();
+ File feature = new File(location.getPath() + "/features/" + TUSCANY_FEATURE + "_" + TUSCANY_VERSION);
+ return new Path(feature.getPath());
+ } catch (Exception e) {
+ error("Tuscany runtime feature not found", e);
+ return null;
+ }
+ }
+
+ /**
+ * Returns the location of the runtime distribution under the Tuscany feature.
+ *
+ * @param feature
+ * @return
+ */
+ static IPath runtime(IPath feature) {
+ IPath runtimePath = null;
+ try {
+
+ // Find the Tuscany distribution under the feature's runtime directory
+ // Typically runtime/distro-archive-name/un-archived-distro-dir
+ File file = new File(feature.toFile(), "runtime");
+ if (file.exists()) {
+ File distro = null;
+ for (File f: file.listFiles()) {
+ if (f.getName().contains("tuscany-sca")) {
+ distro = f;
+ break;
+ }
+ }
+ if (distro != null) {
+ for (File f: distro.listFiles()) {
+ if (f.getName().contains("tuscany-sca")) {
+ runtimePath = new Path(f.getPath());
+ break;
+ }
+ }
+ if (runtimePath == null) {
+ error("Tuscany runtime distribution directory not found", new FileNotFoundException(distro.getAbsolutePath()));
+ }
+ } else {
+ error("Tuscany runtime distribution archive not found", new FileNotFoundException(file.getAbsolutePath()));
+ }
+ } else {
+ error("Tuscany runtime feature not found", new FileNotFoundException(file.getAbsolutePath()));
+ }
+ } catch (Exception e) {
+ error("Tuscany runtime feature not found", e);
+ }
+ return runtimePath;
+ }
+
+ /**
+ * Returns the location of the src distribution under the Tuscany feature.
+ *
+ * @param feature
+ * @return
+ */
+ static IPath src(IPath feature) {
+ IPath sourcePath = null;
+ try {
+
+ // Find the Tuscany source distribution under the feature's src directory
+ // Typically src/distro-archive-src.zip
+ File file = new File(feature.toFile(), "src");
+ if (file.exists()) {
+ File distro = null;
+ for (File f: file.listFiles()) {
+ if (f.getName().contains("tuscany-sca") && f.getName().endsWith("-src.zip")) {
+ distro = f;
+ break;
+ }
+ }
+ if (distro != null) {
+ sourcePath = new Path(distro.getPath());
+ }
+ }
+ } catch (Exception e) {
+ }
+ return sourcePath;
+ }
+
+}
Modified: incubator/tuscany/branches/sca-java-1.3/tools/eclipse/site/updatesite/site.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.3/tools/eclipse/site/updatesite/site.xml?rev=668124&r1=668123&r2=668124&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.3/tools/eclipse/site/updatesite/site.xml (original)
+++ incubator/tuscany/branches/sca-java-1.3/tools/eclipse/site/updatesite/site.xml Mon Jun 16 04:50:48 2008
@@ -22,15 +22,15 @@
Apache Tuscany SCA Tools.
</description>
- <feature id="org.apache.tuscany.sca.feature" version="1.2.0"
+ <feature id="org.apache.tuscany.sca.feature" version="1.3.0"
url="features/org.apache.tuscany.sca.feature-1.3-SNAPSHOT.jar"/>
- <archive path="plugins/org.apache.tuscany.sca.core_1.2.0.jar"
+ <archive path="plugins/org.apache.tuscany.sca.core_1.3.0.jar"
url="plugins/org.apache.tuscany.sca.core-1.3-SNAPSHOT.jar"/>
- <archive path="features/org.apache.tuscany.sca.feature_1.2.0/runtime/apache-tuscany-sca-1.3-SNAPSHOT.jar"
+ <archive path="features/org.apache.tuscany.sca.feature_1.3.0/runtime/apache-tuscany-sca-1.3-SNAPSHOT.jar"
url="../apache-tuscany-sca-1.3-SNAPSHOT.zip"/>
- <archive path="features/org.apache.tuscany.sca.feature_1.2.0/src/apache-tuscany-sca-1.3-SNAPSHOT-src.zip"
+ <archive path="features/org.apache.tuscany.sca.feature_1.3.0/src/apache-tuscany-sca-1.3-SNAPSHOT-src.zip"
url="../apache-tuscany-sca-1.3-SNAPSHOT-src.zip"/>
</site>