You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2008/03/21 22:00:46 UTC
svn commit: r639831 - in
/incubator/tuscany/branches/sca-java-1.2/tools/eclipse: ./
features/feature/ plugins/core/ plugins/core/.settings/
plugins/core/META-INF/ plugins/core/org/ plugins/core/org/apache/
plugins/core/org/apache/tuscany/ plugins/core/...
Author: jsdelfino
Date: Fri Mar 21 14:00:42 2008
New Revision: 639831
URL: http://svn.apache.org/viewvc?rev=639831&view=rev
Log:
Merged changes from trunk SVN revision r639824. Fixed plugin build to produce correct plugin JARs. Ported the plugin to use the latest node2 launcher.
Added:
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/org/
- copied from r639824, incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/org/apache/
- copied from r639824, incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/org/apache/tuscany/
- copied from r639824, incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/org/apache/tuscany/sca/
- copied from r639824, incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/
- copied from r639824, incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/
- copied from r639824, incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainer.java
- copied unchanged from r639824, incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainer.java
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainerInitializer.java
- copied unchanged from r639824, incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainerInitializer.java
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyLibraryEntryPage.java
- copied unchanged from r639824, incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyLibraryEntryPage.java
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/
- copied from r639824, incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchConfigurationDelegate.java
- copied unchanged from r639824, incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchConfigurationDelegate.java
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchConfigurationTabGroup.java
- copied unchanged from r639824, incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchConfigurationTabGroup.java
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchShortcut.java
- copied unchanged from r639824, incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchShortcut.java
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/
- copied from r639824, incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizard.java
- copied unchanged from r639824, incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizard.java
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizardPage.java
- copied unchanged from r639824, incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizardPage.java
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizard.java
- copied unchanged from r639824, incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizard.java
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizardPage.java
- copied unchanged from r639824, incubator/tuscany/java/sca/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizardPage.java
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/xsd/sca-contribution.xsd
- copied unchanged from r639824, incubator/tuscany/java/sca/tools/eclipse/plugins/core/xsd/sca-contribution.xsd
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/xsd/sca-implementation-ejb.xsd
- copied unchanged from r639824, incubator/tuscany/java/sca/tools/eclipse/plugins/core/xsd/sca-implementation-ejb.xsd
Removed:
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/.settings/
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/src/
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/runtime/
Modified:
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/features/feature/feature.xml
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/.classpath
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/.project
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/build.properties
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/pom.xml
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/xsd/sca-all.xsd
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/pom.xml
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/site/updatesite/pom.xml
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/site/updatesite/site.xml
incubator/tuscany/branches/sca-java-1.2/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
Modified: incubator/tuscany/branches/sca-java-1.2/tools/eclipse/features/feature/feature.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tools/eclipse/features/feature/feature.xml?rev=639831&r1=639830&r2=639831&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/tools/eclipse/features/feature/feature.xml (original)
+++ incubator/tuscany/branches/sca-java-1.2/tools/eclipse/features/feature/feature.xml Fri Mar 21 14:00:42 2008
@@ -20,7 +20,7 @@
<feature
id="org.apache.tuscany.sca.feature"
label="Apache Tuscany SCA Tools"
- version="1.1.0"
+ version="1.2.0"
provider-name="Apache Software Foundation">
<description url="http://incubator.apache.org/tuscany">
@@ -55,13 +55,7 @@
id="org.apache.tuscany.sca.core"
download-size="0"
install-size="0"
- version="1.1.0"
+ version="1.2.0"
unpack="false"/>
-
- <plugin
- id="org.apache.tuscany.sca.runtime"
- download-size="0"
- install-size="0"
- version="1.1.0"/>
</feature>
Modified: incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/.classpath
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/.classpath?rev=639831&r1=639830&r2=639831&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/.classpath (original)
+++ incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/.classpath Fri Mar 21 14:00:42 2008
@@ -1,6 +1,5 @@
<classpath>
- <classpathentry kind="src" path="." excluding="**/*.java|**/.*/**|pom.xml|build.*|**/*.java"/>
- <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="."/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/debug/ui/3.2.100-v20070531-1800/ui-3.2.100-v20070531-1800.jar"/>
Modified: incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/.project
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/.project?rev=639831&r1=639830&r2=639831&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/.project (original)
+++ incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/.project Fri Mar 21 14:00:42 2008
@@ -6,24 +6,8 @@
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
</buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- </buildCommand>
</buildSpec>
<natures>
- <nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
</natures>
</projectDescription>
Modified: incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/META-INF/MANIFEST.MF?rev=639831&r1=639830&r2=639831&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/META-INF/MANIFEST.MF (original)
+++ incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/META-INF/MANIFEST.MF Fri Mar 21 14:00:42 2008
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Apache Tuscany SCA Tools
Bundle-SymbolicName: org.apache.tuscany.sca.core;singleton:=true
-Bundle-Version: 1.1.0
+Bundle-Version: 1.2.0
Import-Package: org.eclipse.core.resources,
org.eclipse.core.runtime,
org.eclipse.core.runtime.jobs,
Modified: incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/build.properties
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/build.properties?rev=639831&r1=639830&r2=639831&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/build.properties (original)
+++ incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/build.properties Fri Mar 21 14:00:42 2008
@@ -6,10 +6,10 @@
.,\
DISCLAIMER,\
LICENSE,\
- NOTICE
+ NOTICE,\
+ org/
src.includes = xsd/,\
plugin.xml,\
- src/,\
.classpath,\
.project,\
DISCLAIMER,\
@@ -18,7 +18,8 @@
NOTICE,\
build.properties,\
icons/,\
- target/,\
- .settings/
+ .settings/,\
+ org/,\
+ pom.xml
jars.compile.order = .
-source.. = src/main/java/
+source.. = .
Modified: incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/pom.xml?rev=639831&r1=639830&r2=639831&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/pom.xml Fri Mar 21 14:00:42 2008
@@ -42,6 +42,7 @@
</dependencies>
<build>
+ <sourceDirectory>${basedir}</sourceDirectory>
<resources>
<resource>
<directory>${basedir}</directory>
Modified: incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/xsd/sca-all.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/xsd/sca-all.xsd?rev=639831&r1=639830&r2=639831&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/xsd/sca-all.xsd (original)
+++ incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/xsd/sca-all.xsd Fri Mar 21 14:00:42 2008
@@ -23,9 +23,12 @@
<include schemaLocation="sca.xsd"/>
+ <include schemaLocation="sca-contribution.xsd"/>
+
<include schemaLocation="sca-binding-ejb.xsd"/>
<include schemaLocation="sca-implementation-bpel.xsd"/>
<include schemaLocation="sca-implementation-spring.xsd"/>
+ <include schemaLocation="sca-implementation-ejb.xsd"/>
</schema>
Modified: incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd?rev=639831&r1=639830&r2=639831&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd (original)
+++ incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd Fri Mar 21 14:00:42 2008
@@ -34,6 +34,7 @@
<any namespace="##targetNamespace" processContents="lax" minOccurs="0"
maxOccurs="unbounded"/>
</sequence>
+ <attribute name="title" type="string" use="optional"/>
</extension>
</complexContent>
</complexType>
Modified: incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd?rev=639831&r1=639830&r2=639831&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd (original)
+++ incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd Fri Mar 21 14:00:42 2008
@@ -34,6 +34,7 @@
<any namespace="##targetNamespace" processContents="lax" minOccurs="0"
maxOccurs="unbounded"/>
</sequence>
+ <attribute name="title" type="string" use="optional"/>
</extension>
</complexContent>
</complexType>
Modified: incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd?rev=639831&r1=639830&r2=639831&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd (original)
+++ incubator/tuscany/branches/sca-java-1.2/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd Fri Mar 21 14:00:42 2008
@@ -34,6 +34,7 @@
<any namespace="##targetNamespace" processContents="lax"
minOccurs="0" maxOccurs="unbounded"/>
</sequence>
+ <attribute name="uri" type="string" use="required"/>
<attribute name="composite" type="QName" use="required"/>
</extension>
</complexContent>
Modified: incubator/tuscany/branches/sca-java-1.2/tools/eclipse/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tools/eclipse/pom.xml?rev=639831&r1=639830&r2=639831&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/tools/eclipse/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.2/tools/eclipse/pom.xml Fri Mar 21 14:00:42 2008
@@ -39,7 +39,6 @@
<modules>
<module>features/feature</module>
<module>plugins/core</module>
- <module>plugins/runtime</module>
<module>site/updatesite</module>
</modules>
</profile>
Modified: incubator/tuscany/branches/sca-java-1.2/tools/eclipse/site/updatesite/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tools/eclipse/site/updatesite/pom.xml?rev=639831&r1=639830&r2=639831&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/tools/eclipse/site/updatesite/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.2/tools/eclipse/site/updatesite/pom.xml Fri Mar 21 14:00:42 2008
@@ -38,11 +38,6 @@
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>org.apache.tuscany.sca.runtime</artifactId>
- <version>1.2-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
<artifactId>org.apache.tuscany.sca.feature</artifactId>
<version>1.2-incubating-SNAPSHOT</version>
</dependency>
Modified: incubator/tuscany/branches/sca-java-1.2/tools/eclipse/site/updatesite/site.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tools/eclipse/site/updatesite/site.xml?rev=639831&r1=639830&r2=639831&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/tools/eclipse/site/updatesite/site.xml (original)
+++ incubator/tuscany/branches/sca-java-1.2/tools/eclipse/site/updatesite/site.xml Fri Mar 21 14:00:42 2008
@@ -3,5 +3,5 @@
<description url="http://people.apache.org/~jsdelfino/tuscany/tools/updatesite">
Apache Tuscany SCA Tools.
</description>
- <feature url="features/org.apache.tuscany.sca.feature_1.1.0.jar" id="org.apache.tuscany.sca.feature" version="1.1.0"/>
+ <feature url="features/org.apache.tuscany.sca.feature_1.2.0.jar" id="org.apache.tuscany.sca.feature" version="1.2.0"/>
</site>
Modified: incubator/tuscany/branches/sca-java-1.2/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml?rev=639831&r1=639830&r2=639831&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml (original)
+++ incubator/tuscany/branches/sca-java-1.2/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml Fri Mar 21 14:00:42 2008
@@ -41,7 +41,6 @@
<unpack>false</unpack>
<includes>
<include>org.apache.tuscany.sca:org.apache.tuscany.sca.core</include>
- <include>org.apache.tuscany.sca:org.apache.tuscany.sca.runtime</include>
</includes>
<scope>runtime</scope>
<outputFileNameMapping>${artifactId}_1.1.0.${extension}</outputFileNameMapping>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org