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/09/15 01:51:26 UTC
svn commit: r695308 - in /tuscany/branches/sca-equinox: distribution/
distribution/bundle/ distribution/manifest/ distribution/src/
distribution/standalone/ distribution/tomcat/ distribution/war/
distribution/webapp/ modules/ modules/api/ modules/assem...
Author: jsdelfino
Date: Sun Sep 14 16:51:25 2008
New Revision: 695308
URL: http://svn.apache.org/viewvc?rev=695308&view=rev
Log:
Created a subset of the modules and samples to be ported and tested with Equinox initially.
Removed:
tuscany/branches/sca-equinox/distribution/bundle/
tuscany/branches/sca-equinox/distribution/manifest/
tuscany/branches/sca-equinox/distribution/src/
tuscany/branches/sca-equinox/distribution/standalone/
tuscany/branches/sca-equinox/distribution/tomcat/
tuscany/branches/sca-equinox/distribution/war/
tuscany/branches/sca-equinox/distribution/webapp/
tuscany/branches/sca-equinox/modules/api/
tuscany/branches/sca-equinox/modules/assembly-java-dsl/
tuscany/branches/sca-equinox/modules/binding-dwr/
tuscany/branches/sca-equinox/modules/binding-feed/
tuscany/branches/sca-equinox/modules/binding-notification/
tuscany/branches/sca-equinox/modules/binding-sca-jms/
tuscany/branches/sca-equinox/modules/contribution-groovy/
tuscany/branches/sca-equinox/modules/contribution-jee/
tuscany/branches/sca-equinox/modules/contribution-updater/
tuscany/branches/sca-equinox/modules/contribution-updater-impl/
tuscany/branches/sca-equinox/modules/core-spring/
tuscany/branches/sca-equinox/modules/databinding-job/
tuscany/branches/sca-equinox/modules/databinding-xstream/
tuscany/branches/sca-equinox/modules/extensibility-osgi/
tuscany/branches/sca-equinox/modules/host-osgi/
tuscany/branches/sca-equinox/modules/implementation-jee/
tuscany/branches/sca-equinox/modules/implementation-notification/
tuscany/branches/sca-equinox/modules/implementation-openjpa/
tuscany/branches/sca-equinox/modules/implementation-web/
tuscany/branches/sca-equinox/modules/implementation-web-runtime/
tuscany/branches/sca-equinox/modules/node-launcher-osgi/
tuscany/branches/sca-equinox/modules/osgi-runtime/
tuscany/branches/sca-equinox/modules/runtime/
tuscany/branches/sca-equinox/modules/runtime-standalone/
tuscany/branches/sca-equinox/modules/runtime-tomcat/
tuscany/branches/sca-equinox/modules/runtime-war/
tuscany/branches/sca-equinox/modules/runtime2/
tuscany/branches/sca-equinox/modules/scdl4j/
tuscany/branches/sca-equinox/samples/binding-notification-broker/
tuscany/branches/sca-equinox/samples/binding-notification-consumer/
tuscany/branches/sca-equinox/samples/binding-notification-producer/
tuscany/branches/sca-equinox/samples/chat-webapp/
tuscany/branches/sca-equinox/samples/chat2-webapp/
tuscany/branches/sca-equinox/samples/domain-webapp/
tuscany/branches/sca-equinox/samples/helloworld-distributed/
tuscany/branches/sca-equinox/samples/helloworld-jsp/
tuscany/branches/sca-equinox/samples/helloworld-servlet/
tuscany/branches/sca-equinox/samples/helloworld-web/
tuscany/branches/sca-equinox/samples/helloworld-web-callback/
tuscany/branches/sca-equinox/samples/helloworld-ws-deep-webapp/
tuscany/branches/sca-equinox/samples/implementation-notification/
tuscany/branches/sca-equinox/samples/spi-implementation-pojo/
tuscany/branches/sca-equinox/tools/eclipse/
tuscany/branches/sca-equinox/tools/runtime-inspector/
Modified:
tuscany/branches/sca-equinox/distribution/pom.xml
tuscany/branches/sca-equinox/modules/pom.xml
tuscany/branches/sca-equinox/samples/pom.xml
tuscany/branches/sca-equinox/tools/pom.xml
Modified: tuscany/branches/sca-equinox/distribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/pom.xml?rev=695308&r1=695307&r2=695308&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/pom.xml (original)
+++ tuscany/branches/sca-equinox/distribution/pom.xml Sun Sep 14 16:51:25 2008
@@ -30,301 +30,7 @@
<name>Apache Tuscany SCA Distribution</name>
<packaging>pom</packaging>
- <properties>
- <maven.test.skip>true</maven.test.skip>
- <tuscany.version>${pom.version}</tuscany.version>
- </properties>
-
<modules>
- <module>bundle</module>
- <module>manifest</module>
- <!--module>webapp</module-->
+ <module>features</module>
</modules>
-
- <dependencies>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-bundle</artifactId>
- <version>${pom.version}</version>
- <exclusions>
- <!-- exclude things that get dragged in from other dependencies that we don't need to distribute -->
- <!-- TODO: this should probably be done in the Tuscany module where the dependency is defined -->
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-launcher</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- </exclusion>
- <exclusion>
- <!-- exclude stax 1.0.1 as we're also pulling in javax\xml\stream\stax-api\1.0-2 -->
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </exclusion>
- <!--
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- -->
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.0.2_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-webapp</artifactId>
- <version>1.4-SNAPSHOT</version>
- </dependency>
- <!--don't put two servlet hosts in the classpath TUSCANY-1954 -->
- <!--include tomcat here so it is shipped in modules/ but not -->
- <!--in the all jar -->
- <!-- dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
- <version>1.4-SNAPSHOT</version>
- </dependency -->
- <dependency>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-impl</artifactId>
- <version>1.1-incubating</version>
- <exclusions>
- <exclusion>
- <!-- sdo 1.0 uses 3.2.0 but sca uses 3.2.1 -->
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- </exclusion>
- <exclusion>
- <!-- exclude stax 1.0.1 as we're also pulling in javax\xml\stream\stax-api\1.0-2 -->
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- <exclusion>
- <!-- exclude felix since we are using a later version -->
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.main</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>apache-activemq</artifactId>
- <version>4.1.1</version>
- <exclusions>
- <!-- TUSCANY-2168 -->
- <exclusion>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-console</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-optional</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-web</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-web-demo</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-jaas</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>servlet-api-2.5</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- </exclusion>
- <exclusion>
- <groupId>activesoap</groupId>
- <artifactId>jaxp-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>activemq</groupId>
- <artifactId>jmdns</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jrms</groupId>
- <artifactId>jrms</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xstream</groupId>
- <artifactId>xstream</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xmlpull</groupId>
- <artifactId>xmlpull</artifactId>
- </exclusion>
- <exclusion>
- <groupId>mx4j</groupId>
- <artifactId>mx4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-remote</artifactId>
- </exclusion>
- <exclusion>
- <!-- exclude backport-util-concurrent-2.2.jar since we are using version 3.0 -->
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-
- <build>
-
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- </resources>
-
- <plugins>
- <!-- Temporarily Remove Javadoc -->
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack-javadoc</id>
- <phase>package</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/javadoc</outputDirectory>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <classifier>javadoc</classifier>
- <version>${pom.version}</version>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-core-spi</artifactId>
- <classifier>javadoc</classifier>
- <version>${pom.version}</version>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- -->
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>distribution-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- <finalName>apache-tuscany-sca-${pom.version}</finalName>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
-
- </build>
-
</project>
Modified: tuscany/branches/sca-equinox/modules/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/pom.xml?rev=695308&r1=695307&r2=695308&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/pom.xml Sun Sep 14 16:51:25 2008
@@ -45,12 +45,8 @@
<module>assembly-xsd</module>
<module>binding-corba</module>
<module>binding-corba-runtime</module>
- <module>binding-dwr</module>
<module>binding-ejb</module>
<module>binding-ejb-runtime</module>
- <!-- obsolete -->
- <module>binding-feed</module>
- <!-- new bindings -->
<module>binding-atom</module>
<module>binding-atom-abdera</module>
<module>binding-gdata</module>
@@ -63,14 +59,12 @@
<module>binding-jms-runtime</module>
<module>binding-jsonrpc</module>
<module>binding-jsonrpc-runtime</module>
- <module>binding-notification</module>
<module>binding-rmi</module>
<module>binding-rss</module>
<module>binding-rss-rome</module>
<module>binding-sca</module>
<module>binding-sca-axis2</module>
<module>binding-sca-corba</module>
- <module>binding-sca-jms</module>
<module>binding-sca-xml</module>
<module>binding-ws</module>
<module>binding-ws-axis2</module>
@@ -78,17 +72,14 @@
<module>binding-ws-wsdlgen</module>
<module>binding-ws-xml</module>
<module>contribution</module>
- <module>contribution-groovy</module>
<module>contribution-namespace</module>
<module>contribution-java</module>
<module>contribution-impl</module>
- <module>contribution-osgi</module>
<module>contribution-resource</module>
<module>contribution-xml</module>
<module>core</module>
<module>core-databinding</module>
<module>core-spi</module>
- <module>core-spring</module>
<module>data-api</module>
<module>databinding</module>
<module>databinding-axiom</module>
@@ -100,14 +91,12 @@
<module>databinding-saxon</module>
<module>databinding-xmlbeans</module>
<module>databinding-fastinfoset</module>
- <module>databinding-xstream</module>
<module>data-engine-helper</module>
<module>definitions</module>
<module>definitions-xml</module>
<module>domain-manager</module>
<module>endpoint</module>
<module>extensibility</module>
- <module>extensibility-osgi</module>
<module>extensibility-equinox</module>
<module>extension-helper</module>
<module>host-corba</module>
@@ -140,14 +129,10 @@
<module>implementation-java-runtime</module>
<module>implementation-node</module>
<module>implementation-node-runtime</module>
- <module>implementation-notification</module>
- <module>implementation-osgi</module>
<module>implementation-resource</module>
<module>implementation-resource-runtime</module>
<module>implementation-script</module>
<module>implementation-spring</module>
- <module>implementation-web</module>
- <module>implementation-web-runtime</module>
<module>implementation-widget</module>
<module>implementation-widget-runtime</module>
<module>implementation-xquery</module>
@@ -158,10 +143,8 @@
<module>node-launcher</module>
<module>node-launcher-equinox</module>
<module>thirdparty-library</module>
- <module>node-launcher-osgi</module>
<module>node-launcher-webapp</module>
<module>node-manager</module>
- <module>osgi-runtime</module>
<module>policy</module>
<module>policy-xml</module>
<module>policy-xml-ws</module>
@@ -170,16 +153,13 @@
<module>policy-security-jsr250</module>
<module>policy-security-ws</module>
<module>policy-transaction</module>
- <module>runtime</module>
- <module>runtime-tomcat</module>
- <!--module>runtime-war</module-->
<module>sca-api</module>
+ <module>tracing-aspectj</module>
<module>workspace</module>
<module>workspace-impl</module>
<module>workspace-xml</module>
<module>xsd</module>
<module>xsd-xml</module>
- <module>tracing-aspectj</module>
</modules>
</profile>
Modified: tuscany/branches/sca-equinox/samples/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/pom.xml?rev=695308&r1=695307&r2=695308&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/pom.xml Sun Sep 14 16:51:25 2008
@@ -45,13 +45,13 @@
<modules>
<module>binding-echo</module>
<module>binding-echo-extension</module>
- <module>binding-notification-broker</module>
- <module>binding-notification-consumer</module>
- <module>binding-notification-producer</module>
<module>calculator</module>
- <module>calculator-lean</module>
+ <module>calculator2</module>
<module>calculator-distributed</module>
<module>calculator-implementation-policies</module>
+ <module>calculator-lean</module>
+ <module>calculator-osgi</module>
+ <module>calculator-rcp</module>
<module>calculator-rmi-reference</module>
<module>calculator-rmi-service</module>
<module>calculator-script</module>
@@ -60,44 +60,46 @@
<module>calculator-ws-webapp</module>
<module>callback-ws-client</module>
<module>callback-ws-service</module>
- <module>chat-webapp</module>
<module>customer-dojo</module>
<module>databinding-echo</module>
- <!--module>domain-webapp</module-->
<module>domain-management</module>
<module>feed-aggregator</module>
<module>feed-aggregator-webapp</module>
<module>helloworld-bpel</module>
+ <module>helloworld-bpel-ws</module>
<module>helloworld-dojo-webapp</module>
<module>helloworld-jms-webapp</module>
<module>helloworld-jsonrpc-webapp</module>
+ <module>helloworld-jsp</module>
<module>helloworld-reference-jms</module>
<module>helloworld-service-jms</module>
- <module>helloworld-ws-service</module>
- <module>helloworld-ws-service-jms</module>
- <module>helloworld-ws-service-secure</module>
+ <module>helloworld-servlet</module>
+ <module>helloworld-web</module>
+ <module>helloworld-web-callback</module>
<module>helloworld-ws-reference</module>
<module>helloworld-ws-reference-lean</module>
<module>helloworld-ws-reference-jms</module>
<module>helloworld-ws-reference-secure</module>
<module>helloworld-ws-sdo</module>
<module>helloworld-ws-sdo-webapp</module>
+ <module>helloworld-ws-service</module>
+ <module>helloworld-ws-service-jms</module>
+ <module>helloworld-ws-service-secure</module>
+ <module>helloworld-ws-service-webapp</module>
<module>implementation-composite</module>
<module>implementation-crud</module>
<module>implementation-crud-extension</module>
- <module>implementation-notification</module>
<module>implementation-pojo-extension</module>
<module>loanapplication</module>
- <module>osgi-supplychain</module>
<module>photo-gallery</module>
<module>quote-xquery</module>
<module>simple-bigbank</module>
<module>simple-bigbank-spring</module>
- <module>spring-bigbank-checkaccount</module>
- <module>spring-bigbank-calculator</module>
- <module>spring-bigbank-stockquote</module>
<module>simple-callback</module>
<module>simple-callback-ws</module>
+ <module>spring-bigbank-calculator</module>
+ <module>spring-bigbank-checkaccount</module>
+ <module>spring-bigbank-stockquote</module>
<module>store</module>
<module>store-distributed</module>
<module>supplychain</module>
Modified: tuscany/branches/sca-equinox/tools/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/tools/pom.xml?rev=695308&r1=695307&r2=695308&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/tools/pom.xml (original)
+++ tuscany/branches/sca-equinox/tools/pom.xml Sun Sep 14 16:51:25 2008
@@ -36,11 +36,10 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
- <module>eclipse</module>
+ <module>eclipse34</module>
<module>java2wsdl</module>
<module>maven</module>
<module>wsdl2java</module>
- <module>runtime-inspector</module>
</modules>
</profile>
</profiles>