Author: jsdelfino
Date: Tue Apr 1 01:25:52 2008
New Revision: 643319
URL: http://svn.apache.org/viewvc?rev=643319&view=rev
Log:
Fix for TUSCANY-2179. Changed name of archive referenced by plugin updatesite
from runtime.jar to runtime/apache-tuscany-1.2-incubating. Also made minor
fixes to the progress monitor text messages.
Modified:
incubator/tuscany/java/sca/tools/eclipse/features/feature/feature.xml
incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainer.java
incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchShortcut.java
incubator/tuscany/java/sca/tools/eclipse/site/updatesite/site.xml
Modified: incubator/tuscany/java/sca/tools/eclipse/features/feature/feature.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/eclipse/features/feature/feature.xml?rev=643319&r1=643318&r2=643319&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/eclipse/features/feature/feature.xml
(original)
+++ incubator/tuscany/java/sca/tools/eclipse/features/feature/feature.xml Tue
Apr 1 01:25:52 2008
@@ -60,7 +60,7 @@
unpack="false"/>
<data
- id="runtime.jar"
+ id="runtime/apache-tuscany-sca-1.2-incubating-SNAPSHOT.jar"
download-size="0"
install-size="0"/>
Modified:
incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainer.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainer.java?rev=643319&r1=643318&r2=643319&view=diff
==============================================================================
---
incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainer.java
(original)
+++
incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainer.java
Tue Apr 1 01:25:52 2008
@@ -41,9 +41,15 @@
private static final String TUSCANY_HOME = "TUSCANY_HOME";
private static final String TUSCANY_SRC = "TUSCANY_SRC";
- private static final String TUSCANY_FEATURE =
"features/org.apache.tuscany.sca.feature_1.2.0";
- private static final String TUSCANY_FEATURE_RUNTIME = TUSCANY_FEATURE +
"/runtime/tuscany-sca-1.2-incubating-SNAPSHOT";
- private static final String TUSCANY_FEATURE_SRC = TUSCANY_FEATURE +
"/src/apache-tuscany-sca-1.2-incubating-SNAPSHOT-src.zip";
+
+ private static final String TUSCANY_FEATURE =
+ "features/org.apache.tuscany.sca.feature_1.2.0";
+
+ private static final String TUSCANY_FEATURE_RUNTIME = TUSCANY_FEATURE +
+ "/runtime/apache-tuscany-sca-1.2-incubating-SNAPSHOT/" +
+ "tuscany-sca-1.2-incubating-SNAPSHOT";
+ private static final String TUSCANY_FEATURE_SRC = TUSCANY_FEATURE +
+ "/src/apache-tuscany-sca-1.2-incubating-SNAPSHOT-src.zip";
public TuscanyClasspathContainer() {
}
Modified:
incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchShortcut.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchShortcut.java?rev=643319&r1=643318&r2=643319&view=diff
==============================================================================
---
incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchShortcut.java
(original)
+++
incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchShortcut.java
Tue Apr 1 01:25:52 2008
@@ -84,7 +84,8 @@
}
// Run with a progress monitor
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().run(true,
true, new IRunnableWithProgress() {
+ //PlatformUI.getWorkbench().getActiveWorkbenchWindow().run(true,
true, new IRunnableWithProgress() {
+ PlatformUI.getWorkbench().getProgressService().run(true, true, new
IRunnableWithProgress() {
public void run(IProgressMonitor progressMonitor) throws
InvocationTargetException, InterruptedException {
try {
@@ -153,7 +154,7 @@
ILaunchManager launchManager,
ILaunchConfigurationType launchConfigurationType,
IProgressMonitor progressMonitor) throws
CoreException, JavaModelException, IOException {
- progressMonitor.subTask("- starting SCA node");
+ progressMonitor.subTask("Starting SCA node");
if (progressMonitor.isCanceled()) {
return;
}
@@ -204,7 +205,7 @@
ILaunchManager launchManager,
ILaunchConfigurationType launchConfigurationType,
IProgressMonitor progressMonitor) throws
CoreException, JavaModelException {
- progressMonitor.subTask("- starting SCA domain manager");
+ progressMonitor.subTask("Starting SCA domain manager");
if (progressMonitor.isCanceled()) {
return;
}
@@ -265,7 +266,7 @@
* @return
*/
private static boolean waitForDomainManager(IProgressMonitor
progressMonitor) throws InterruptedException {
- progressMonitor.subTask("- waiting for SCA domain manager");
+ progressMonitor.subTask("Contacting SCA domain manager");
for (int i = 0; i < 40; i++) {
if (progressMonitor.isCanceled()) {
return false;
@@ -381,7 +382,7 @@
*/
private static String configureNode(String contributionURI, String
contributionLocation, String compositeURI,
IProgressMonitor progressMonitor)
throws IOException, CoreException {
- progressMonitor.subTask("- configuring node");
+ progressMonitor.subTask("Configuring node");
// Send the request to configure the node
Socket client = new Socket("localhost", 9990);
@@ -423,7 +424,7 @@
return domainProject;
}
if (!domainProject.exists()) {
- progressMonitor.subTask("- creating SCA domain resources");
+ progressMonitor.subTask("Creating SCA domain resources");
domainProject.create(new SubProgressMonitor(progressMonitor, 5));
domainProject.open(new SubProgressMonitor(progressMonitor, 5));
Modified: incubator/tuscany/java/sca/tools/eclipse/site/updatesite/site.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/eclipse/site/updatesite/site.xml?rev=643319&r1=643318&r2=643319&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/eclipse/site/updatesite/site.xml (original)
+++ incubator/tuscany/java/sca/tools/eclipse/site/updatesite/site.xml Tue Apr
1 01:25:52 2008
@@ -10,8 +10,8 @@
<archive path="plugins/org.apache.tuscany.sca.core_1.2.0.jar"
url="plugins/org.apache.tuscany.sca.core-2.0-incubating-SNAPSHOT.jar"/>
- <archive path="features/org.apache.tuscany.sca.feature_1.2.0/runtime.jar"
- url="../apache-tuscany-sca-1.2-incubating-SNAPSHOT.zip"/>
+ <archive
path="features/org.apache.tuscany.sca.feature_1.2.0/runtime/apache-tuscany-sca-1.2-incubating-SNAPSHOT.jar"
+ url="../apache-tuscany-sca-1.2-incubating-SNAPSHOT.zip"/>
<archive
path="features/org.apache.tuscany.sca.feature_1.2.0/src/apache-tuscany-sca-1.2-incubating-SNAPSHOT-src.zip"
url="../apache-tuscany-sca-1.2-incubating-SNAPSHOT-src.zip"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
