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/16 19:16:51 UTC
svn commit: r695979 [1/2] - in /tuscany/branches/sca-equinox:
demos/bigbank-stockquote/ demos/workpool-distributed/
distribution/features/all/ distribution/features/all/src/main/components/
distribution/features/core/ distribution/features/core/src/mai...
Author: jsdelfino
Date: Tue Sep 16 10:16:37 2008
New Revision: 695979
URL: http://svn.apache.org/viewvc?rev=695979&view=rev
Log:
Started to fix module dependencies, OSGi manifest generation and a few references to obsolete classes to get a clean build.
Modified:
tuscany/branches/sca-equinox/demos/bigbank-stockquote/pom.xml
tuscany/branches/sca-equinox/demos/workpool-distributed/pom.xml
tuscany/branches/sca-equinox/distribution/features/all/pom.xml
tuscany/branches/sca-equinox/distribution/features/all/src/main/components/src-modules.xml
tuscany/branches/sca-equinox/distribution/features/core/pom.xml
tuscany/branches/sca-equinox/distribution/features/core/src/main/components/bin-filtered-dependencies.xml
tuscany/branches/sca-equinox/distribution/features/core/src/main/components/src-modules.xml
tuscany/branches/sca-equinox/distribution/features/ejava/pom.xml
tuscany/branches/sca-equinox/distribution/features/ejava/src/main/components/src-modules.xml
tuscany/branches/sca-equinox/distribution/features/manager/pom.xml
tuscany/branches/sca-equinox/distribution/features/manager/src/main/components/src-modules.xml
tuscany/branches/sca-equinox/distribution/features/process/pom.xml
tuscany/branches/sca-equinox/distribution/features/process/src/main/components/src-modules.xml
tuscany/branches/sca-equinox/distribution/features/repository/pom.xml
tuscany/branches/sca-equinox/distribution/features/repository/src/main/components/src-modules.xml
tuscany/branches/sca-equinox/distribution/features/web20/pom.xml
tuscany/branches/sca-equinox/distribution/features/web20/src/main/components/src-modules.xml
tuscany/branches/sca-equinox/distribution/features/webservice/pom.xml
tuscany/branches/sca-equinox/distribution/features/webservice/src/main/components/src-modules.xml
tuscany/branches/sca-equinox/itest/bpel/helloworld-reference/pom.xml
tuscany/branches/sca-equinox/itest/bpel/helloworld-ws/pom.xml
tuscany/branches/sca-equinox/itest/callablereferences-ws/pom.xml
tuscany/branches/sca-equinox/itest/callablereferences/pom.xml
tuscany/branches/sca-equinox/itest/contribution-import-export/export-composite/pom.xml
tuscany/branches/sca-equinox/itest/contribution-import-export/export-java/pom.xml
tuscany/branches/sca-equinox/itest/contribution-import-export/import-composite/pom.xml
tuscany/branches/sca-equinox/itest/contribution-import-export/import-java/pom.xml
tuscany/branches/sca-equinox/itest/contribution-import-export/import-resource/pom.xml
tuscany/branches/sca-equinox/itest/contribution-import-export/import-wsdl/pom.xml
tuscany/branches/sca-equinox/itest/conversations-ws/pom.xml
tuscany/branches/sca-equinox/itest/exceptions-simple-ws/pom.xml
tuscany/branches/sca-equinox/itest/interop-soap-service/pom.xml
tuscany/branches/sca-equinox/itest/large-sdo-ws/pom.xml
tuscany/branches/sca-equinox/itest/late-reference-resolution/pom.xml
tuscany/branches/sca-equinox/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
tuscany/branches/sca-equinox/itest/osgi-tuscany/tuscany-versioned/pom.xml
tuscany/branches/sca-equinox/itest/policy-security-basicauth/pom.xml
tuscany/branches/sca-equinox/itest/policy-security-jsr250/pom.xml
tuscany/branches/sca-equinox/itest/policy-security/pom.xml
tuscany/branches/sca-equinox/itest/policy/pom.xml
tuscany/branches/sca-equinox/itest/pom.xml
tuscany/branches/sca-equinox/itest/promotion-interface-missmatch/pom.xml
tuscany/branches/sca-equinox/itest/serialization/pom.xml
tuscany/branches/sca-equinox/itest/ws-void-args-return/pom.xml
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerImpl.java
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerTest.java
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/CustomerCollectionImpl.java
tuscany/branches/sca-equinox/modules/host-corba-jse/pom.xml
tuscany/branches/sca-equinox/modules/host-jetty/pom.xml
tuscany/branches/sca-equinox/modules/node-launcher-webapp/pom.xml
tuscany/branches/sca-equinox/modules/policy-security/pom.xml
tuscany/branches/sca-equinox/modules/policy-transaction/pom.xml
tuscany/branches/sca-equinox/modules/pom.xml
tuscany/branches/sca-equinox/samples/calculator-distributed/pom.xml
tuscany/branches/sca-equinox/samples/callback-ws-client/pom.xml
tuscany/branches/sca-equinox/samples/callback-ws-service/pom.xml
tuscany/branches/sca-equinox/samples/feed-aggregator/pom.xml
tuscany/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/pom.xml
tuscany/branches/sca-equinox/samples/helloworld-ws-sdo/pom.xml
tuscany/branches/sca-equinox/samples/helloworld-ws-service-secure/pom.xml
tuscany/branches/sca-equinox/samples/helloworld-ws-service/pom.xml
tuscany/branches/sca-equinox/samples/pom.xml
tuscany/branches/sca-equinox/samples/simple-bigbank-spring/pom.xml
tuscany/branches/sca-equinox/samples/simple-callback-ws/pom.xml
tuscany/branches/sca-equinox/samples/spring-bigbank-stockquote/pom.xml
tuscany/branches/sca-equinox/samples/store-distributed/pom.xml
tuscany/branches/sca-equinox/samples/store/pom.xml
tuscany/branches/sca-equinox/samples/web-resource/pom.xml
tuscany/branches/sca-equinox/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleMojo.java
tuscany/branches/sca-equinox/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleUtil.java
tuscany/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/pom.xml
tuscany/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/pom.xml
tuscany/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/pom.xml
tuscany/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/pom.xml
tuscany/branches/sca-equinox/vtest/wsbinding/service/pom.xml
tuscany/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/pom.xml
tuscany/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/pom.xml
tuscany/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/pom.xml
Modified: tuscany/branches/sca-equinox/demos/bigbank-stockquote/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/demos/bigbank-stockquote/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/demos/bigbank-stockquote/pom.xml (original)
+++ tuscany/branches/sca-equinox/demos/bigbank-stockquote/pom.xml Tue Sep 16 10:16:37 2008
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>1.4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/demos/workpool-distributed/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/demos/workpool-distributed/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/demos/workpool-distributed/pom.xml (original)
+++ tuscany/branches/sca-equinox/demos/workpool-distributed/pom.xml Tue Sep 16 10:16:37 2008
@@ -128,7 +128,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>1.4-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/distribution/features/all/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/all/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/all/pom.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/all/pom.xml Tue Sep 16 10:16:37 2008
@@ -38,30 +38,35 @@
<type>pom</type>
<version>1.4-SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-distribution-ejava</artifactId>
<type>pom</type>
<version>1.4-SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-distribution-manager</artifactId>
<type>pom</type>
<version>1.4-SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-distribution-process</artifactId>
<type>pom</type>
<version>1.4-SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-distribution-web20</artifactId>
<type>pom</type>
<version>1.4-SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-distribution-webservice</artifactId>
@@ -71,29 +76,37 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-maven-ant-generator</artifactId>
- <type>pom</type>
+ <artifactId>tuscany-binding-gdata-runtime</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-maven-java2wsdl</artifactId>
- <type>pom</type>
+ <artifactId>tuscany-binding-gdata-runtime-gsoc</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-maven-wsdl2java</artifactId>
- <type>pom</type>
+ <artifactId>tuscany-databinding-fastinfoset</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-maven-incremental-build</artifactId>
- <type>pom</type>
+ <artifactId>tuscany-databinding-xmlbeans</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-das</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-tracing-aspectj</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
@@ -147,12 +160,17 @@
<module>../../../modules/binding-corba-runtime</module>
<module>../../../modules/binding-ejb</module>
<module>../../../modules/binding-ejb-runtime</module>
+ <module>../../../modules/binding-gdata</module>
+ <module>../../../modules/binding-gdata-gsoc</module>
+ <module>../../../modules/binding-gdata-runtime</module>
+ <module>../../../modules/binding-gdata-runtime-gsoc</module>
<module>../../../modules/binding-http</module>
<module>../../../modules/binding-http-runtime</module>
<module>../../../modules/binding-jms</module>
<module>../../../modules/binding-jms-runtime</module>
<module>../../../modules/binding-jsonrpc</module>
<module>../../../modules/binding-jsonrpc-runtime</module>
+ <module>../../../modules/binding-rmi</module>
<module>../../../modules/binding-rss</module>
<module>../../../modules/binding-rss-rome</module>
<module>../../../modules/binding-sca</module>
@@ -174,12 +192,15 @@
<module>../../../modules/data-api</module>
<module>../../../modules/databinding</module>
<module>../../../modules/databinding-axiom</module>
+ <module>../../../modules/databinding-fastinfoset</module>
<module>../../../modules/databinding-jaxb</module>
<module>../../../modules/databinding-jaxb-axiom</module>
<module>../../../modules/databinding-json</module>
<module>../../../modules/databinding-saxon</module>
<module>../../../modules/databinding-sdo</module>
<module>../../../modules/databinding-sdo-axiom</module>
+ <module>../../../modules/databinding-xmlbeans</module>
+ <module>../../../modules/data-engine-helper</module>
<module>../../../modules/definitions</module>
<module>../../../modules/definitions-xml</module>
<module>../../../modules/domain-manager</module>
@@ -188,13 +209,17 @@
<module>../../../modules/extensibility-equinox</module>
<module>../../../modules/extension-helper</module>
<module>../../../modules/host-corba</module>
+ <module>../../../modules/host-corba-jee</module>
<module>../../../modules/host-corba-jse</module>
<module>../../../modules/host-ejb</module>
<module>../../../modules/host-embedded</module>
<module>../../../modules/host-http</module>
<module>../../../modules/host-jetty</module>
+ <module>../../../modules/host-openejb</module>
+ <module>../../../modules/host-rmi</module>
<module>../../../modules/implementation-bpel</module>
<module>../../../modules/implementation-bpel-ode</module>
+ <module>../../../modules/implementation-das</module>
<module>../../../modules/implementation-ejb</module>
<module>../../../modules/implementation-java</module>
<module>../../../modules/implementation-java-runtime</module>
@@ -224,10 +249,13 @@
<module>../../../modules/node-manager</module>
<module>../../../modules/policy</module>
<module>../../../modules/policy-security</module>
+ <module>../../../modules/policy-security-jsr250</module>
<module>../../../modules/policy-security-ws</module>
+ <module>../../../modules/policy-transaction</module>
<module>../../../modules/policy-xml</module>
<module>../../../modules/policy-xml-ws</module>
<module>../../../modules/sca-api</module>
+ <module>../../../modules/tracing-aspectj</module>
<module>../../../modules/workspace</module>
<module>../../../modules/workspace-impl</module>
<module>../../../modules/workspace-xml</module>
Modified: tuscany/branches/sca-equinox/distribution/features/all/src/main/components/src-modules.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/all/src/main/components/src-modules.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/all/src/main/components/src-modules.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/all/src/main/components/src-modules.xml Tue Sep 16 10:16:37 2008
@@ -33,12 +33,17 @@
<include>binding-corba-runtime/**/*</include>
<include>binding-ejb/**/*</include>
<include>binding-ejb-runtime/**/*</include>
+ <include>binding-gdata/**/*</include>
+ <include>binding-gdata-gsoc/**/*</include>
+ <include>binding-gdata-runtime/**/*</include>
+ <include>binding-gdata-runtime-gsoc/**/*</include>
<include>binding-http/**/*</include>
<include>binding-http-runtime/**/*</include>
<include>binding-jms/**/*</include>
<include>binding-jms-runtime/**/*</include>
<include>binding-jsonrpc/**/*</include>
<include>binding-jsonrpc-runtime/**/*</include>
+ <include>binding-rmi/**/*</include>
<include>binding-rss/**/*</include>
<include>binding-rss-rome/**/*</include>
<include>binding-sca/**/*</include>
@@ -60,12 +65,15 @@
<include>data-api/**/*</include>
<include>databinding/**/*</include>
<include>databinding-axiom/**/*</include>
+ <include>databinding-fastinfoset/**/*</include>
<include>databinding-jaxb/**/*</include>
<include>databinding-jaxb-axiom/**/*</include>
<include>databinding-json/**/*</include>
<include>databinding-saxon/**/*</include>
<include>databinding-sdo/**/*</include>
<include>databinding-sdo-axiom/**/*</include>
+ <include>databinding-xmlbeans/**/*</include>
+ <include>data-engine-helper/**/*</include>
<include>definitions/**/*</include>
<include>definitions-xml/**/*</include>
<include>distribution-core/**/*</include>
@@ -80,13 +88,17 @@
<include>extensibility-equinox/**/*</include>
<include>extension-helper/**/*</include>
<include>host-corba/**/*</include>
+ <include>host-corba-jee/**/*</include>
<include>host-corba-jse/**/*</include>
<include>host-ejb/**/*</include>
<include>host-embedded/**/*</include>
<include>host-http/**/*</include>
<include>host-jetty/**/*</include>
+ <include>host-openejb/**/*</include>
+ <include>host-rmi/**/*</include>
<include>implementation-bpel/**/*</include>
<include>implementation-bpel-ode/**/*</include>
+ <include>implementation-das/**/*</include>
<include>implementation-ejb/**/*</include>
<include>implementation-java/**/*</include>
<include>implementation-java-runtime/**/*</include>
@@ -121,10 +133,13 @@
<include>node-manager/**/*</include>
<include>policy/**/*</include>
<include>policy-security/**/*</include>
+ <include>policy-security-jsr250/**/*</include>
<include>policy-security-ws/**/*</include>
+ <include>policy-transaction/**/*</include>
<include>policy-xml/**/*</include>
<include>policy-xml-ws/**/*</include>
<include>sca-api/**/*</include>
+ <include>tracing-aspectj/**/*</include>
<include>workspace/**/*</include>
<include>workspace-impl/**/*</include>
<include>workspace-xml/**/*</include>
Modified: tuscany/branches/sca-equinox/distribution/features/core/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/core/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/core/pom.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/core/pom.xml Tue Sep 16 10:16:37 2008
@@ -219,6 +219,11 @@
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-policy-security-jsr250</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-policy-xml</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
@@ -307,7 +312,6 @@
<module>../../../modules/extensibility-equinox</module>
<module>../../../modules/host-corba</module>
<module>../../../modules/host-corba-jse</module>
- <module>../../../modules/host-embedded</module>
<module>../../../modules/host-http</module>
<module>../../../modules/implementation-java</module>
<module>../../../modules/implementation-java-runtime</module>
@@ -329,6 +333,7 @@
<module>../../../modules/node-launcher-webapp</module>
<module>../../../modules/policy</module>
<module>../../../modules/policy-security</module>
+ <module>../../../modules/policy-security-jsr250</module>
<module>../../../modules/policy-xml</module>
<module>../../../modules/sca-api</module>
<module>../../../modules/xsd</module>
Modified: tuscany/branches/sca-equinox/distribution/features/core/src/main/components/bin-filtered-dependencies.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/core/src/main/components/bin-filtered-dependencies.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/core/src/main/components/bin-filtered-dependencies.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/core/src/main/components/bin-filtered-dependencies.xml Tue Sep 16 10:16:37 2008
@@ -52,7 +52,6 @@
<exclude>org.apache.tuscany.sca:tuscany-extensibility-equinox</exclude>
<exclude>org.apache.tuscany.sca:tuscany-host-corba</exclude>
<exclude>org.apache.tuscany.sca:tuscany-host-corba-jse</exclude>
- <exclude>org.apache.tuscany.sca:tuscany-host-embedded</exclude>
<exclude>org.apache.tuscany.sca:tuscany-host-http</exclude>
<exclude>org.apache.tuscany.sca:tuscany-implementation-java</exclude>
<exclude>org.apache.tuscany.sca:tuscany-implementation-java-runtime</exclude>
@@ -74,6 +73,7 @@
<exclude>org.apache.tuscany.sca:tuscany-node-launcher-webapp</exclude>
<exclude>org.apache.tuscany.sca:tuscany-policy</exclude>
<exclude>org.apache.tuscany.sca:tuscany-policy-security</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-policy-security-jsr250</exclude>
<exclude>org.apache.tuscany.sca:tuscany-policy-xml</exclude>
<exclude>org.apache.tuscany.sca:tuscany-sca-api</exclude>
<exclude>org.apache.tuscany.sca:tuscany-xsd</exclude>
@@ -88,6 +88,7 @@
<excludes>
<exclude>asm:asm-all</exclude>
<exclude>cglib:cglib-nodep</exclude>
+ <exclude>com.sun:tools</exclude>
<exclude>com.sun.xml.bind:jaxb-impl</exclude>
<exclude>javax.activation:activation</exclude>
<exclude>javax.annotation:jsr250-api</exclude>
Modified: tuscany/branches/sca-equinox/distribution/features/core/src/main/components/src-modules.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/core/src/main/components/src-modules.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/core/src/main/components/src-modules.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/core/src/main/components/src-modules.xml Tue Sep 16 10:16:37 2008
@@ -49,7 +49,6 @@
<include>extensibility-equinox/**/*</include>
<include>host-corba/**/*</include>
<include>host-corba-jse/**/*</include>
- <include>host-embedded/**/*</include>
<include>host-http/**/*</include>
<include>implementation-java/**/*</include>
<include>implementation-java-runtime/**/*</include>
@@ -71,6 +70,7 @@
<include>node-launcher-webapp/**/*</include>
<include>policy/**/*</include>
<include>policy-security/**/*</include>
+ <include>policy-security-jsr250/**/*</include>
<include>policy-xml/**/*</include>
<include>sca-api/**/*</include>
<include>xsd/**/*</include>
Modified: tuscany/branches/sca-equinox/distribution/features/ejava/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/ejava/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/ejava/pom.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/ejava/pom.xml Tue Sep 16 10:16:37 2008
@@ -51,13 +51,33 @@
<artifactId>tuscany-binding-jms-runtime</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-rmi</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
<!-- Hosts -->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-corba-jee</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-ejb</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-openejb</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-rmi</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
<!-- Implementations -->
<dependency>
@@ -70,6 +90,13 @@
<artifactId>tuscany-implementation-spring</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
+
+ <!-- Policies -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-policy-transaction</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
</dependencies>
<profiles>
@@ -120,8 +147,11 @@
<module>../../../modules/binding-ejb-runtime</module>
<module>../../../modules/binding-jms</module>
<module>../../../modules/binding-jms-runtime</module>
+ <module>../../../modules/binding-rmi</module>
<module>../../../modules/binding-sca</module>
<module>../../../modules/binding-sca-xml</module>
+ <module>../../../modules/binding-ws</module>
+ <module>../../../modules/binding-ws-wsdlgen</module>
<module>../../../modules/contribution</module>
<module>../../../modules/contribution-impl</module>
<module>../../../modules/contribution-java</module>
@@ -141,10 +171,13 @@
<module>../../../modules/extensibility-equinox</module>
<module>../../../modules/extension-helper</module>
<module>../../../modules/host-corba</module>
+ <module>../../../modules/host-corba-jee</module>
<module>../../../modules/host-corba-jse</module>
<module>../../../modules/host-ejb</module>
<module>../../../modules/host-embedded</module>
<module>../../../modules/host-http</module>
+ <module>../../../modules/host-openejb</module>
+ <module>../../../modules/host-rmi</module>
<module>../../../modules/implementation-ejb</module>
<module>../../../modules/implementation-java</module>
<module>../../../modules/implementation-java-runtime</module>
@@ -168,6 +201,9 @@
<module>../../../modules/node-launcher-webapp</module>
<module>../../../modules/policy</module>
<module>../../../modules/policy-security</module>
+ <module>../../../modules/policy-security-jsr250</module>
+ <module>../../../modules/policy-security-ws</module>
+ <module>../../../modules/policy-transaction</module>
<module>../../../modules/policy-xml</module>
<module>../../../modules/sca-api</module>
<module>../../../modules/xsd</module>
Modified: tuscany/branches/sca-equinox/distribution/features/ejava/src/main/components/src-modules.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/ejava/src/main/components/src-modules.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/ejava/src/main/components/src-modules.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/ejava/src/main/components/src-modules.xml Tue Sep 16 10:16:37 2008
@@ -33,8 +33,11 @@
<include>binding-ejb-runtime/**/*</include>
<include>binding-jms/**/*</include>
<include>binding-jms-runtime/**/*</include>
+ <include>binding-rmi/**/*</include>
<include>binding-sca/**/*</include>
<include>binding-sca-xml/**/*</include>
+ <include>binding-ws/**/*</include>
+ <include>binding-ws-wsdlgen/**/*</include>
<include>contribution/**/*</include>
<include>contribution-impl/**/*</include>
<include>contribution-java/**/*</include>
@@ -55,10 +58,13 @@
<include>extensibility-equinox/**/*</include>
<include>extension-helper/**/*</include>
<include>host-corba/**/*</include>
+ <include>host-corba-jee/**/*</include>
<include>host-corba-jse/**/*</include>
<include>host-ejb/**/*</include>
<include>host-embedded/**/*</include>
<include>host-http/**/*</include>
+ <include>host-openejb/**/*</include>
+ <include>host-rmi/**/*</include>
<include>implementation-ejb/**/*</include>
<include>implementation-java/**/*</include>
<include>implementation-java-runtime/**/*</include>
@@ -82,6 +88,9 @@
<include>node-launcher-webapp/**/*</include>
<include>policy/**/*</include>
<include>policy-security/**/*</include>
+ <include>policy-security-jsr250/**/*</include>
+ <include>policy-security-ws/**/*</include>
+ <include>policy-transaction/**/*</include>
<include>policy-xml/**/*</include>
<include>sca-api/**/*</include>
<include>xsd/**/*</include>
Modified: tuscany/branches/sca-equinox/distribution/features/manager/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/manager/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/manager/pom.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/manager/pom.xml Tue Sep 16 10:16:37 2008
@@ -244,6 +244,7 @@
<module>../../../modules/node-manager</module>
<module>../../../modules/policy</module>
<module>../../../modules/policy-security</module>
+ <module>../../../modules/policy-security-jsr250</module>
<module>../../../modules/policy-security-ws</module>
<module>../../../modules/policy-xml</module>
<module>../../../modules/sca-api</module>
Modified: tuscany/branches/sca-equinox/distribution/features/manager/src/main/components/src-modules.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/manager/src/main/components/src-modules.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/manager/src/main/components/src-modules.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/manager/src/main/components/src-modules.xml Tue Sep 16 10:16:37 2008
@@ -91,6 +91,7 @@
<include>node-manager/**/*</include>
<include>policy/**/*</include>
<include>policy-security/**/*</include>
+ <include>policy-security-jsr250/**/*</include>
<include>policy-security-ws/**/*</include>
<include>policy-xml/**/*</include>
<include>sca-api/**/*</include>
Modified: tuscany/branches/sca-equinox/distribution/features/process/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/process/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/process/pom.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/process/pom.xml Tue Sep 16 10:16:37 2008
@@ -144,6 +144,7 @@
<module>../../../modules/node-launcher-webapp</module>
<module>../../../modules/policy</module>
<module>../../../modules/policy-security</module>
+ <module>../../../modules/policy-security-jsr250</module>
<module>../../../modules/policy-xml</module>
<module>../../../modules/sca-api</module>
<module>../../../modules/xsd</module>
Modified: tuscany/branches/sca-equinox/distribution/features/process/src/main/components/src-modules.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/process/src/main/components/src-modules.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/process/src/main/components/src-modules.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/process/src/main/components/src-modules.xml Tue Sep 16 10:16:37 2008
@@ -77,6 +77,7 @@
<include>node-launcher-webapp/**/*</include>
<include>policy/**/*</include>
<include>policy-security/**/*</include>
+ <include>policy-security-jsr250/**/*</include>
<include>policy-xml/**/*</include>
<include>sca-api/**/*</include>
<include>xsd/**/*</include>
Modified: tuscany/branches/sca-equinox/distribution/features/repository/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/repository/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/repository/pom.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/repository/pom.xml Tue Sep 16 10:16:37 2008
@@ -87,12 +87,17 @@
<module>../../../modules/binding-corba-runtime</module>
<module>../../../modules/binding-ejb</module>
<module>../../../modules/binding-ejb-runtime</module>
+ <module>../../../modules/binding-gdata</module>
+ <module>../../../modules/binding-gdata-gsoc</module>
+ <module>../../../modules/binding-gdata-runtime</module>
+ <module>../../../modules/binding-gdata-runtime-gsoc</module>
<module>../../../modules/binding-http</module>
<module>../../../modules/binding-http-runtime</module>
<module>../../../modules/binding-jms</module>
<module>../../../modules/binding-jms-runtime</module>
<module>../../../modules/binding-jsonrpc</module>
<module>../../../modules/binding-jsonrpc-runtime</module>
+ <module>../../../modules/binding-rmi</module>
<module>../../../modules/binding-rss</module>
<module>../../../modules/binding-rss-rome</module>
<module>../../../modules/binding-sca</module>
@@ -114,12 +119,15 @@
<module>../../../modules/data-api</module>
<module>../../../modules/databinding</module>
<module>../../../modules/databinding-axiom</module>
+ <module>../../../modules/databinding-fastinfoset</module>
<module>../../../modules/databinding-jaxb</module>
<module>../../../modules/databinding-jaxb-axiom</module>
<module>../../../modules/databinding-json</module>
<module>../../../modules/databinding-saxon</module>
<module>../../../modules/databinding-sdo</module>
<module>../../../modules/databinding-sdo-axiom</module>
+ <module>../../../modules/databinding-xmlbeans</module>
+ <module>../../../modules/data-engine-helper</module>
<module>../../../modules/definitions</module>
<module>../../../modules/definitions-xml</module>
<module>../../../modules/domain-manager</module>
@@ -128,13 +136,17 @@
<module>../../../modules/extensibility-equinox</module>
<module>../../../modules/extension-helper</module>
<module>../../../modules/host-corba</module>
+ <module>../../../modules/host-corba-jee</module>
<module>../../../modules/host-corba-jse</module>
<module>../../../modules/host-ejb</module>
<module>../../../modules/host-embedded</module>
<module>../../../modules/host-http</module>
<module>../../../modules/host-jetty</module>
+ <module>../../../modules/host-openejb</module>
+ <module>../../../modules/host-rmi</module>
<module>../../../modules/implementation-bpel</module>
<module>../../../modules/implementation-bpel-ode</module>
+ <module>../../../modules/implementation-das</module>
<module>../../../modules/implementation-ejb</module>
<module>../../../modules/implementation-java</module>
<module>../../../modules/implementation-java-runtime</module>
@@ -164,10 +176,13 @@
<module>../../../modules/node-manager</module>
<module>../../../modules/policy</module>
<module>../../../modules/policy-security</module>
+ <module>../../../modules/policy-security-jsr250</module>
<module>../../../modules/policy-security-ws</module>
+ <module>../../../modules/policy-transaction</module>
<module>../../../modules/policy-xml</module>
<module>../../../modules/policy-xml-ws</module>
<module>../../../modules/sca-api</module>
+ <module>../../../modules/tracing-aspectj</module>
<module>../../../modules/workspace</module>
<module>../../../modules/workspace-impl</module>
<module>../../../modules/workspace-xml</module>
Modified: tuscany/branches/sca-equinox/distribution/features/repository/src/main/components/src-modules.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/repository/src/main/components/src-modules.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/repository/src/main/components/src-modules.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/repository/src/main/components/src-modules.xml Tue Sep 16 10:16:37 2008
@@ -33,12 +33,17 @@
<include>binding-corba-runtime/**/*</include>
<include>binding-ejb/**/*</include>
<include>binding-ejb-runtime/**/*</include>
+ <include>binding-gdata/**/*</include>
+ <include>binding-gdata-gsoc/**/*</include>
+ <include>binding-gdata-runtime/**/*</include>
+ <include>binding-gdata-runtime-gsoc/**/*</include>
<include>binding-http/**/*</include>
<include>binding-http-runtime/**/*</include>
<include>binding-jms/**/*</include>
<include>binding-jms-runtime/**/*</include>
<include>binding-jsonrpc/**/*</include>
<include>binding-jsonrpc-runtime/**/*</include>
+ <include>binding-rmi/**/*</include>
<include>binding-rss/**/*</include>
<include>binding-rss-rome/**/*</include>
<include>binding-sca/**/*</include>
@@ -60,12 +65,15 @@
<include>data-api/**/*</include>
<include>databinding/**/*</include>
<include>databinding-axiom/**/*</include>
+ <include>databinding-fastinfoset/**/*</include>
<include>databinding-jaxb/**/*</include>
<include>databinding-jaxb-axiom/**/*</include>
<include>databinding-json/**/*</include>
<include>databinding-saxon/**/*</include>
<include>databinding-sdo/**/*</include>
<include>databinding-sdo-axiom/**/*</include>
+ <include>databinding-xmlbeans/**/*</include>
+ <include>data-engine-helper/**/*</include>
<include>definitions/**/*</include>
<include>definitions-xml/**/*</include>
<include>distribution-all/**/*</include>
@@ -81,13 +89,17 @@
<include>extensibility-equinox/**/*</include>
<include>extension-helper/**/*</include>
<include>host-corba/**/*</include>
+ <include>host-corba-jee/**/*</include>
<include>host-corba-jse/**/*</include>
<include>host-ejb/**/*</include>
<include>host-embedded/**/*</include>
<include>host-http/**/*</include>
<include>host-jetty/**/*</include>
+ <include>host-openejb/**/*</include>
+ <include>host-rmi/**/*</include>
<include>implementation-bpel/**/*</include>
<include>implementation-bpel-ode/**/*</include>
+ <include>implementation-das/**/*</include>
<include>implementation-ejb/**/*</include>
<include>implementation-java/**/*</include>
<include>implementation-java-runtime/**/*</include>
@@ -122,10 +134,13 @@
<include>node-manager/**/*</include>
<include>policy/**/*</include>
<include>policy-security/**/*</include>
+ <include>policy-security-jsr250/**/*</include>
<include>policy-security-ws/**/*</include>
+ <include>policy-transaction/**/*</include>
<include>policy-xml/**/*</include>
<include>policy-xml-ws/**/*</include>
<include>sca-api/**/*</include>
+ <include>tracing-aspectj/**/*</include>
<include>workspace/**/*</include>
<include>workspace-impl/**/*</include>
<include>workspace-xml/**/*</include>
Modified: tuscany/branches/sca-equinox/distribution/features/web20/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/web20/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/web20/pom.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/web20/pom.xml Tue Sep 16 10:16:37 2008
@@ -170,7 +170,6 @@
<module>../../../modules/extensibility-equinox</module>
<module>../../../modules/host-corba</module>
<module>../../../modules/host-corba-jse</module>
- <module>../../../modules/host-embedded</module>
<module>../../../modules/host-http</module>
<module>../../../modules/host-jetty</module>
<module>../../../modules/implementation-java</module>
@@ -197,6 +196,7 @@
<module>../../../modules/node-launcher-webapp</module>
<module>../../../modules/policy</module>
<module>../../../modules/policy-security</module>
+ <module>../../../modules/policy-security-jsr250</module>
<module>../../../modules/policy-xml</module>
<module>../../../modules/sca-api</module>
<module>../../../modules/xsd</module>
Modified: tuscany/branches/sca-equinox/distribution/features/web20/src/main/components/src-modules.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/web20/src/main/components/src-modules.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/web20/src/main/components/src-modules.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/web20/src/main/components/src-modules.xml Tue Sep 16 10:16:37 2008
@@ -60,7 +60,6 @@
<include>extensibility-equinox/**/*</include>
<include>host-corba/**/*</include>
<include>host-corba-jse/**/*</include>
- <include>host-embedded/**/*</include>
<include>host-http/**/*</include>
<include>host-jetty/**/*</include>
<include>implementation-java/**/*</include>
@@ -87,6 +86,7 @@
<include>node-launcher-webapp/**/*</include>
<include>policy/**/*</include>
<include>policy-security/**/*</include>
+ <include>policy-security-jsr250/**/*</include>
<include>policy-xml/**/*</include>
<include>sca-api/**/*</include>
<include>xsd/**/*</include>
Modified: tuscany/branches/sca-equinox/distribution/features/webservice/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/webservice/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/webservice/pom.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/webservice/pom.xml Tue Sep 16 10:16:37 2008
@@ -216,6 +216,7 @@
<module>../../../modules/node-launcher-webapp</module>
<module>../../../modules/policy</module>
<module>../../../modules/policy-security</module>
+ <module>../../../modules/policy-security-jsr250</module>
<module>../../../modules/policy-security-ws</module>
<module>../../../modules/policy-xml</module>
<module>../../../modules/policy-xml-ws</module>
Modified: tuscany/branches/sca-equinox/distribution/features/webservice/src/main/components/src-modules.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/webservice/src/main/components/src-modules.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/webservice/src/main/components/src-modules.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/webservice/src/main/components/src-modules.xml Tue Sep 16 10:16:37 2008
@@ -82,6 +82,7 @@
<include>node-launcher-webapp/**/*</include>
<include>policy/**/*</include>
<include>policy-security/**/*</include>
+ <include>policy-security-jsr250/**/*</include>
<include>policy-security-ws/**/*</include>
<include>policy-xml/**/*</include>
<include>policy-xml-ws/**/*</include>
Modified: tuscany/branches/sca-equinox/itest/bpel/helloworld-reference/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/bpel/helloworld-reference/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/bpel/helloworld-reference/pom.xml (original)
+++ tuscany/branches/sca-equinox/itest/bpel/helloworld-reference/pom.xml Tue Sep 16 10:16:37 2008
@@ -58,7 +58,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>1.4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/itest/bpel/helloworld-ws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/bpel/helloworld-ws/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/bpel/helloworld-ws/pom.xml (original)
+++ tuscany/branches/sca-equinox/itest/bpel/helloworld-ws/pom.xml Tue Sep 16 10:16:37 2008
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>1.4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/itest/callablereferences-ws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/callablereferences-ws/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/callablereferences-ws/pom.xml (original)
+++ tuscany/branches/sca-equinox/itest/callablereferences-ws/pom.xml Tue Sep 16 10:16:37 2008
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>1.4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/itest/callablereferences/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/callablereferences/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/callablereferences/pom.xml (original)
+++ tuscany/branches/sca-equinox/itest/callablereferences/pom.xml Tue Sep 16 10:16:37 2008
@@ -58,7 +58,7 @@
-->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>1.4-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/itest/contribution-import-export/export-composite/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/contribution-import-export/export-composite/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/contribution-import-export/export-composite/pom.xml (original)
+++ tuscany/branches/sca-equinox/itest/contribution-import-export/export-composite/pom.xml Tue Sep 16 10:16:37 2008
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>1.4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/itest/contribution-import-export/export-java/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/contribution-import-export/export-java/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/contribution-import-export/export-java/pom.xml (original)
+++ tuscany/branches/sca-equinox/itest/contribution-import-export/export-java/pom.xml Tue Sep 16 10:16:37 2008
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>1.4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/itest/contribution-import-export/import-composite/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/contribution-import-export/import-composite/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/contribution-import-export/import-composite/pom.xml (original)
+++ tuscany/branches/sca-equinox/itest/contribution-import-export/import-composite/pom.xml Tue Sep 16 10:16:37 2008
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>1.4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/itest/contribution-import-export/import-java/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/contribution-import-export/import-java/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/contribution-import-export/import-java/pom.xml (original)
+++ tuscany/branches/sca-equinox/itest/contribution-import-export/import-java/pom.xml Tue Sep 16 10:16:37 2008
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>1.4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/itest/contribution-import-export/import-resource/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/contribution-import-export/import-resource/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/contribution-import-export/import-resource/pom.xml (original)
+++ tuscany/branches/sca-equinox/itest/contribution-import-export/import-resource/pom.xml Tue Sep 16 10:16:37 2008
@@ -86,7 +86,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>1.4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/itest/contribution-import-export/import-wsdl/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/contribution-import-export/import-wsdl/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/contribution-import-export/import-wsdl/pom.xml (original)
+++ tuscany/branches/sca-equinox/itest/contribution-import-export/import-wsdl/pom.xml Tue Sep 16 10:16:37 2008
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>1.4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/itest/conversations-ws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/conversations-ws/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/conversations-ws/pom.xml (original)
+++ tuscany/branches/sca-equinox/itest/conversations-ws/pom.xml Tue Sep 16 10:16:37 2008
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>1.4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/itest/exceptions-simple-ws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/exceptions-simple-ws/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/exceptions-simple-ws/pom.xml (original)
+++ tuscany/branches/sca-equinox/itest/exceptions-simple-ws/pom.xml Tue Sep 16 10:16:37 2008
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>1.4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/itest/interop-soap-service/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/interop-soap-service/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/interop-soap-service/pom.xml (original)
+++ tuscany/branches/sca-equinox/itest/interop-soap-service/pom.xml Tue Sep 16 10:16:37 2008
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>1.4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/itest/large-sdo-ws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/large-sdo-ws/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/large-sdo-ws/pom.xml (original)
+++ tuscany/branches/sca-equinox/itest/large-sdo-ws/pom.xml Tue Sep 16 10:16:37 2008
@@ -73,7 +73,7 @@
</dependencies>
- <!-- Declare tuscany-host-tomcat dependency in the default profile so that it can be replaced -->
+ <!-- Declare tuscany-host-jetty dependency in the default profile so that it can be replaced -->
<profiles>
<profile>
<id>default</id>
@@ -83,7 +83,7 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>1.4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/itest/late-reference-resolution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/late-reference-resolution/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/late-reference-resolution/pom.xml (original)
+++ tuscany/branches/sca-equinox/itest/late-reference-resolution/pom.xml Tue Sep 16 10:16:37 2008
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>1.4-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml (original)
+++ tuscany/branches/sca-equinox/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml Tue Sep 16 10:16:37 2008
@@ -445,7 +445,7 @@
<exclusions>
<exclusion>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -537,7 +537,7 @@
<exclusions>
<exclusion>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
</exclusion>
</exclusions>
</dependency>
Modified: tuscany/branches/sca-equinox/itest/osgi-tuscany/tuscany-versioned/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/osgi-tuscany/tuscany-versioned/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/osgi-tuscany/tuscany-versioned/pom.xml (original)
+++ tuscany/branches/sca-equinox/itest/osgi-tuscany/tuscany-versioned/pom.xml Tue Sep 16 10:16:37 2008
@@ -446,7 +446,7 @@
<exclusions>
<exclusion>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -538,7 +538,7 @@
<exclusions>
<exclusion>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
</exclusion>
</exclusions>
</dependency>
Modified: tuscany/branches/sca-equinox/itest/policy-security-basicauth/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/policy-security-basicauth/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/policy-security-basicauth/pom.xml (original)
+++ tuscany/branches/sca-equinox/itest/policy-security-basicauth/pom.xml Tue Sep 16 10:16:37 2008
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>1.4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/itest/policy-security-jsr250/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/policy-security-jsr250/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/policy-security-jsr250/pom.xml (original)
+++ tuscany/branches/sca-equinox/itest/policy-security-jsr250/pom.xml Tue Sep 16 10:16:37 2008
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>1.4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/itest/policy-security/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/policy-security/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/policy-security/pom.xml (original)
+++ tuscany/branches/sca-equinox/itest/policy-security/pom.xml Tue Sep 16 10:16:37 2008
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>1.4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/itest/policy/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/policy/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/policy/pom.xml (original)
+++ tuscany/branches/sca-equinox/itest/policy/pom.xml Tue Sep 16 10:16:37 2008
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>1.4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/itest/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/pom.xml (original)
+++ tuscany/branches/sca-equinox/itest/pom.xml Tue Sep 16 10:16:37 2008
@@ -251,7 +251,7 @@
<configuration>
<primaryArtifact>false</primaryArtifact>
<!-- Exclude a few jars to avoid conflicts -->
- <warSourceExcludes>WEB-INF/lib/tuscany-host-tomcat-*.jar,WEB-INF/lib/tuscany-host-jetty-*.jar,servlet-api-*.jar, WEB-INF/lib/catalina*.jar,WEB-INF/classes/META-INF/sca-contribution*.xml</warSourceExcludes>
+ <warSourceExcludes>WEB-INF/lib/tuscany-host-jetty-*.jar,WEB-INF/lib/tuscany-host-jetty-*.jar,servlet-api-*.jar, WEB-INF/lib/catalina*.jar,WEB-INF/classes/META-INF/sca-contribution*.xml</warSourceExcludes>
<webResources>
<!-- Add the tests jar into the WAR -->
<!--
Modified: tuscany/branches/sca-equinox/itest/promotion-interface-missmatch/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/promotion-interface-missmatch/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/promotion-interface-missmatch/pom.xml (original)
+++ tuscany/branches/sca-equinox/itest/promotion-interface-missmatch/pom.xml Tue Sep 16 10:16:37 2008
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>1.4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/itest/serialization/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/serialization/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/serialization/pom.xml (original)
+++ tuscany/branches/sca-equinox/itest/serialization/pom.xml Tue Sep 16 10:16:37 2008
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>1.4-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/itest/ws-void-args-return/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/ws-void-args-return/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/ws-void-args-return/pom.xml (original)
+++ tuscany/branches/sca-equinox/itest/ws-void-args-return/pom.xml Tue Sep 16 10:16:37 2008
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>1.4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java (original)
+++ tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java Tue Sep 16 10:16:37 2008
@@ -18,12 +18,12 @@
*/
package org.apache.tuscany.sca.binding.gdata.collection;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
+import org.osoa.sca.annotations.Remotable;
+
import com.google.gdata.data.BaseEntry;
import com.google.gdata.data.BaseFeed;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
-import org.osoa.sca.annotations.Remotable;
-
/**
* Provides access to a collection of resources using Atom.
*
Modified: tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java (original)
+++ tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java Tue Sep 16 10:16:37 2008
@@ -23,7 +23,7 @@
import org.osoa.sca.annotations.Remotable;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
/**
* Provides access to a collection of resources using Atom.
Modified: tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerImpl.java?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerImpl.java (original)
+++ tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerImpl.java Tue Sep 16 10:16:37 2008
@@ -37,15 +37,15 @@
return resourceCollection.post(entry);
}
- public BaseEntry get(String id) throws org.apache.tuscany.sca.implementation.data.collection.NotFoundException {
+ public BaseEntry get(String id) throws org.apache.tuscany.sca.data.collection.NotFoundException {
return resourceCollection.get(id);
}
- public BaseEntry put(String id, BaseEntry entry) throws org.apache.tuscany.sca.implementation.data.collection.NotFoundException {
+ public BaseEntry put(String id, BaseEntry entry) throws org.apache.tuscany.sca.data.collection.NotFoundException {
return resourceCollection.put(id, entry);
}
- public void delete(String id) throws org.apache.tuscany.sca.implementation.data.collection.NotFoundException {
+ public void delete(String id) throws org.apache.tuscany.sca.data.collection.NotFoundException {
resourceCollection.delete(id);
}
Modified: tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerTest.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerTest.java?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerTest.java (original)
+++ tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerTest.java Tue Sep 16 10:16:37 2008
@@ -28,7 +28,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
import org.junit.Test;
import org.junit.BeforeClass;
Modified: tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/CustomerCollectionImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/CustomerCollectionImpl.java?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/CustomerCollectionImpl.java (original)
+++ tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/CustomerCollectionImpl.java Tue Sep 16 10:16:37 2008
@@ -31,7 +31,7 @@
import java.util.TimeZone;
import java.util.UUID;
import org.apache.tuscany.sca.binding.gdata.collection.Collection;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
import org.osoa.sca.annotations.Scope;
@Scope("COMPOSITE")
Modified: tuscany/branches/sca-equinox/modules/host-corba-jse/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/host-corba-jse/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/host-corba-jse/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/host-corba-jse/pom.xml Tue Sep 16 10:16:37 2008
@@ -47,7 +47,7 @@
<Bundle-Version>${tuscany.version}</Bundle-Version>
<Bundle-SymbolicName>org.apache.tuscany.sca.host.corba.jse</Bundle-SymbolicName>
<Bundle-Description>${pom.name}</Bundle-Description>
- <Export-Package>org.apache.tuscany.sca.host.corba.jse*</Export-Package>
+ <Export-Package>org.apache.tuscany.sca.host.corba*</Export-Package>
</instructions>
</configuration>
</plugin>
Modified: tuscany/branches/sca-equinox/modules/host-jetty/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/host-jetty/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/host-jetty/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/host-jetty/pom.xml Tue Sep 16 10:16:37 2008
@@ -67,6 +67,16 @@
<Bundle-SymbolicName>org.apache.tuscany.sca.host.jetty</Bundle-SymbolicName>
<Bundle-Description>${pom.name}</Bundle-Description>
<Export-Package>org.apache.tuscany.sca.http.jetty*</Export-Package>
+ <Import-Package>
+ org.mortbay.jetty;version="6.1.7",
+ org.mortbay.jetty.handler;version="6.1.7",
+ org.mortbay.jetty.nio;version="6.1.7",
+ org.mortbay.jetty.security;version="6.1.7",
+ org.mortbay.jetty.servlet;version="6.1.7",
+ org.mortbay.log;version="6.1.7",
+ org.mortbay.resource;version="6.1.7",
+ org.mortbay.thread;version="6.1.7"
+ </Import-Package>
</instructions>
</configuration>
</plugin>
Modified: tuscany/branches/sca-equinox/modules/node-launcher-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/node-launcher-webapp/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/node-launcher-webapp/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/node-launcher-webapp/pom.xml Tue Sep 16 10:16:37 2008
@@ -44,6 +44,22 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.5.1</version>
+ <configuration>
+ <buildcommands>
+ <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
+ </buildcommands>
+ <projectnatures>
+ <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+ </projectnatures>
+ <classpathContainers>
+ <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+ </classpathContainers>
+ </configuration>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -57,6 +73,7 @@
</configuration>
</plugin>
</plugins>
+
</build>
</project>
Modified: tuscany/branches/sca-equinox/modules/policy-security/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-security/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/policy-security/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/policy-security/pom.xml Tue Sep 16 10:16:37 2008
@@ -60,7 +60,7 @@
<Bundle-Version>${tuscany.version}</Bundle-Version>
<Bundle-SymbolicName>org.apache.tuscany.sca.policy.security</Bundle-SymbolicName>
<Bundle-Description>${pom.name}</Bundle-Description>
- <Export-Package>org.apache.tuscany.sca.policy.security*</Export-Package>
+ <Export-Package>org.apache.tuscany.sca.policy*</Export-Package>
</instructions>
</configuration>
</plugin>
Modified: tuscany/branches/sca-equinox/modules/policy-transaction/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-transaction/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/policy-transaction/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/policy-transaction/pom.xml Tue Sep 16 10:16:37 2008
@@ -118,6 +118,7 @@
<Bundle-SymbolicName>org.apache.tuscany.sca.policy.transaction</Bundle-SymbolicName>
<Bundle-Description>${pom.name}</Bundle-Description>
<Export-Package>org.apache.tuscany.sca.policy.transaction*</Export-Package>
+ <Import-Package>javax.transaction;version="1.0",*</Import-Package>
</instructions>
</configuration>
</plugin>
Modified: tuscany/branches/sca-equinox/modules/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/pom.xml Tue Sep 16 10:16:37 2008
@@ -111,7 +111,9 @@
<module>host-webapp</module>
<module>host-webapp-junit</module>
<module>host-jetty</module>
- <module>host-tomcat</module>
+ <!--
+ <module>host-jetty</module>
+ -->
<module>interface</module>
<module>interface-java</module>
<module>interface-java-jaxws</module>
@@ -122,7 +124,6 @@
<module>implementation-bpel-ode</module>
<module>implementation-bpel-jbpm</module>
<module>implementation-das</module>
- <module>implementation-data-xml</module>
<module>implementation-ejb</module>
<module>implementation-java</module>
<module>implementation-java-xml</module>
@@ -198,9 +199,6 @@
</projectnatures>
<classpathContainers>
<classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
- <!--
- <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
- -->
</classpathContainers>
</configuration>
</plugin>
Modified: tuscany/branches/sca-equinox/samples/calculator-distributed/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/calculator-distributed/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/calculator-distributed/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/calculator-distributed/pom.xml Tue Sep 16 10:16:37 2008
@@ -99,7 +99,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>1.4-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/callback-ws-client/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/callback-ws-client/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/callback-ws-client/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/callback-ws-client/pom.xml Tue Sep 16 10:16:37 2008
@@ -58,7 +58,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>1.4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/callback-ws-service/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/callback-ws-service/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/callback-ws-service/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/callback-ws-service/pom.xml Tue Sep 16 10:16:37 2008
@@ -58,7 +58,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>1.4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/feed-aggregator/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/feed-aggregator/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/feed-aggregator/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/feed-aggregator/pom.xml Tue Sep 16 10:16:37 2008
@@ -63,7 +63,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>1.4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/pom.xml?rev=695979&r1=695978&r2=695979&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/pom.xml Tue Sep 16 10:16:37 2008
@@ -89,7 +89,7 @@
<!--
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>1.4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>