diff options
Diffstat (limited to 'branches')
80 files changed, 328 insertions, 100 deletions
diff --git a/branches/sca-equinox/demos/bigbank-stockquote/pom.xml b/branches/sca-equinox/demos/bigbank-stockquote/pom.xml index c8d0b95257..4749c73c26 100644 --- a/branches/sca-equinox/demos/bigbank-stockquote/pom.xml +++ b/branches/sca-equinox/demos/bigbank-stockquote/pom.xml @@ -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> diff --git a/branches/sca-equinox/demos/workpool-distributed/pom.xml b/branches/sca-equinox/demos/workpool-distributed/pom.xml index 01a8900d52..4280a23cc1 100644 --- a/branches/sca-equinox/demos/workpool-distributed/pom.xml +++ b/branches/sca-equinox/demos/workpool-distributed/pom.xml @@ -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> diff --git a/branches/sca-equinox/distribution/features/all/pom.xml b/branches/sca-equinox/distribution/features/all/pom.xml index e720a2e331..905c67d066 100644 --- a/branches/sca-equinox/distribution/features/all/pom.xml +++ b/branches/sca-equinox/distribution/features/all/pom.xml @@ -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> diff --git a/branches/sca-equinox/distribution/features/all/src/main/components/src-modules.xml b/branches/sca-equinox/distribution/features/all/src/main/components/src-modules.xml index b886263676..75cd0d81fb 100644 --- a/branches/sca-equinox/distribution/features/all/src/main/components/src-modules.xml +++ b/branches/sca-equinox/distribution/features/all/src/main/components/src-modules.xml @@ -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> diff --git a/branches/sca-equinox/distribution/features/core/pom.xml b/branches/sca-equinox/distribution/features/core/pom.xml index 53f01acf49..ea5b99be05 100644 --- a/branches/sca-equinox/distribution/features/core/pom.xml +++ b/branches/sca-equinox/distribution/features/core/pom.xml @@ -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> diff --git a/branches/sca-equinox/distribution/features/core/src/main/components/bin-filtered-dependencies.xml b/branches/sca-equinox/distribution/features/core/src/main/components/bin-filtered-dependencies.xml index 58d8ca1407..5fb826d7fc 100644 --- a/branches/sca-equinox/distribution/features/core/src/main/components/bin-filtered-dependencies.xml +++ b/branches/sca-equinox/distribution/features/core/src/main/components/bin-filtered-dependencies.xml @@ -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> diff --git a/branches/sca-equinox/distribution/features/core/src/main/components/src-modules.xml b/branches/sca-equinox/distribution/features/core/src/main/components/src-modules.xml index f3e34d10f3..20cd6c0e4f 100644 --- a/branches/sca-equinox/distribution/features/core/src/main/components/src-modules.xml +++ b/branches/sca-equinox/distribution/features/core/src/main/components/src-modules.xml @@ -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> diff --git a/branches/sca-equinox/distribution/features/ejava/pom.xml b/branches/sca-equinox/distribution/features/ejava/pom.xml index 1ff6baa336..0ccbff2063 100644 --- a/branches/sca-equinox/distribution/features/ejava/pom.xml +++ b/branches/sca-equinox/distribution/features/ejava/pom.xml @@ -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> diff --git a/branches/sca-equinox/distribution/features/ejava/src/main/components/src-modules.xml b/branches/sca-equinox/distribution/features/ejava/src/main/components/src-modules.xml index 2b4bd22d87..757c65d141 100644 --- a/branches/sca-equinox/distribution/features/ejava/src/main/components/src-modules.xml +++ b/branches/sca-equinox/distribution/features/ejava/src/main/components/src-modules.xml @@ -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> diff --git a/branches/sca-equinox/distribution/features/manager/pom.xml b/branches/sca-equinox/distribution/features/manager/pom.xml index cc594256c9..e184a3a123 100644 --- a/branches/sca-equinox/distribution/features/manager/pom.xml +++ b/branches/sca-equinox/distribution/features/manager/pom.xml @@ -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> diff --git a/branches/sca-equinox/distribution/features/manager/src/main/components/src-modules.xml b/branches/sca-equinox/distribution/features/manager/src/main/components/src-modules.xml index 9a68e7a938..b8d9cd1b2c 100644 --- a/branches/sca-equinox/distribution/features/manager/src/main/components/src-modules.xml +++ b/branches/sca-equinox/distribution/features/manager/src/main/components/src-modules.xml @@ -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> diff --git a/branches/sca-equinox/distribution/features/process/pom.xml b/branches/sca-equinox/distribution/features/process/pom.xml index 4310034a0f..35caba4adc 100644 --- a/branches/sca-equinox/distribution/features/process/pom.xml +++ b/branches/sca-equinox/distribution/features/process/pom.xml @@ -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> diff --git a/branches/sca-equinox/distribution/features/process/src/main/components/src-modules.xml b/branches/sca-equinox/distribution/features/process/src/main/components/src-modules.xml index dfcf7d4ca0..ad0e954902 100644 --- a/branches/sca-equinox/distribution/features/process/src/main/components/src-modules.xml +++ b/branches/sca-equinox/distribution/features/process/src/main/components/src-modules.xml @@ -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> diff --git a/branches/sca-equinox/distribution/features/repository/pom.xml b/branches/sca-equinox/distribution/features/repository/pom.xml index cfee564971..40ec381b2c 100644 --- a/branches/sca-equinox/distribution/features/repository/pom.xml +++ b/branches/sca-equinox/distribution/features/repository/pom.xml @@ -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> diff --git a/branches/sca-equinox/distribution/features/repository/src/main/components/src-modules.xml b/branches/sca-equinox/distribution/features/repository/src/main/components/src-modules.xml index a893bf5ce8..e7a59dee83 100644 --- a/branches/sca-equinox/distribution/features/repository/src/main/components/src-modules.xml +++ b/branches/sca-equinox/distribution/features/repository/src/main/components/src-modules.xml @@ -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> diff --git a/branches/sca-equinox/distribution/features/web20/pom.xml b/branches/sca-equinox/distribution/features/web20/pom.xml index 58fe78edd4..ea87daa207 100644 --- a/branches/sca-equinox/distribution/features/web20/pom.xml +++ b/branches/sca-equinox/distribution/features/web20/pom.xml @@ -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> diff --git a/branches/sca-equinox/distribution/features/web20/src/main/components/src-modules.xml b/branches/sca-equinox/distribution/features/web20/src/main/components/src-modules.xml index 99082280ad..7c5f00ed36 100644 --- a/branches/sca-equinox/distribution/features/web20/src/main/components/src-modules.xml +++ b/branches/sca-equinox/distribution/features/web20/src/main/components/src-modules.xml @@ -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> diff --git a/branches/sca-equinox/distribution/features/webservice/pom.xml b/branches/sca-equinox/distribution/features/webservice/pom.xml index 7768813b0d..35890516a7 100644 --- a/branches/sca-equinox/distribution/features/webservice/pom.xml +++ b/branches/sca-equinox/distribution/features/webservice/pom.xml @@ -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> diff --git a/branches/sca-equinox/distribution/features/webservice/src/main/components/src-modules.xml b/branches/sca-equinox/distribution/features/webservice/src/main/components/src-modules.xml index e551ca97ba..29226bee5c 100644 --- a/branches/sca-equinox/distribution/features/webservice/src/main/components/src-modules.xml +++ b/branches/sca-equinox/distribution/features/webservice/src/main/components/src-modules.xml @@ -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> diff --git a/branches/sca-equinox/itest/bpel/helloworld-reference/pom.xml b/branches/sca-equinox/itest/bpel/helloworld-reference/pom.xml index 3a61b820d1..946486b2e7 100644 --- a/branches/sca-equinox/itest/bpel/helloworld-reference/pom.xml +++ b/branches/sca-equinox/itest/bpel/helloworld-reference/pom.xml @@ -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> diff --git a/branches/sca-equinox/itest/bpel/helloworld-ws/pom.xml b/branches/sca-equinox/itest/bpel/helloworld-ws/pom.xml index eb11a6ad7e..40646822a6 100644 --- a/branches/sca-equinox/itest/bpel/helloworld-ws/pom.xml +++ b/branches/sca-equinox/itest/bpel/helloworld-ws/pom.xml @@ -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> diff --git a/branches/sca-equinox/itest/callablereferences-ws/pom.xml b/branches/sca-equinox/itest/callablereferences-ws/pom.xml index bd373b2ae6..8eecd714bf 100644 --- a/branches/sca-equinox/itest/callablereferences-ws/pom.xml +++ b/branches/sca-equinox/itest/callablereferences-ws/pom.xml @@ -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>
diff --git a/branches/sca-equinox/itest/callablereferences/pom.xml b/branches/sca-equinox/itest/callablereferences/pom.xml index 323ee9c076..31883ba146 100644 --- a/branches/sca-equinox/itest/callablereferences/pom.xml +++ b/branches/sca-equinox/itest/callablereferences/pom.xml @@ -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> diff --git a/branches/sca-equinox/itest/contribution-import-export/export-composite/pom.xml b/branches/sca-equinox/itest/contribution-import-export/export-composite/pom.xml index 4aea1320f3..60d1b3af0c 100644 --- a/branches/sca-equinox/itest/contribution-import-export/export-composite/pom.xml +++ b/branches/sca-equinox/itest/contribution-import-export/export-composite/pom.xml @@ -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>
diff --git a/branches/sca-equinox/itest/contribution-import-export/export-java/pom.xml b/branches/sca-equinox/itest/contribution-import-export/export-java/pom.xml index 24346c6d1c..4a855334b8 100644 --- a/branches/sca-equinox/itest/contribution-import-export/export-java/pom.xml +++ b/branches/sca-equinox/itest/contribution-import-export/export-java/pom.xml @@ -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>
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-composite/pom.xml b/branches/sca-equinox/itest/contribution-import-export/import-composite/pom.xml index 6decf86182..5f4e1bfd5e 100644 --- a/branches/sca-equinox/itest/contribution-import-export/import-composite/pom.xml +++ b/branches/sca-equinox/itest/contribution-import-export/import-composite/pom.xml @@ -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>
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-java/pom.xml b/branches/sca-equinox/itest/contribution-import-export/import-java/pom.xml index ee11269c71..ca5edde5d0 100644 --- a/branches/sca-equinox/itest/contribution-import-export/import-java/pom.xml +++ b/branches/sca-equinox/itest/contribution-import-export/import-java/pom.xml @@ -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>
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-resource/pom.xml b/branches/sca-equinox/itest/contribution-import-export/import-resource/pom.xml index d3ea4f42dd..428e3279ba 100644 --- a/branches/sca-equinox/itest/contribution-import-export/import-resource/pom.xml +++ b/branches/sca-equinox/itest/contribution-import-export/import-resource/pom.xml @@ -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> diff --git a/branches/sca-equinox/itest/contribution-import-export/import-wsdl/pom.xml b/branches/sca-equinox/itest/contribution-import-export/import-wsdl/pom.xml index 38e69bd152..22e3913dd8 100644 --- a/branches/sca-equinox/itest/contribution-import-export/import-wsdl/pom.xml +++ b/branches/sca-equinox/itest/contribution-import-export/import-wsdl/pom.xml @@ -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>
diff --git a/branches/sca-equinox/itest/conversations-ws/pom.xml b/branches/sca-equinox/itest/conversations-ws/pom.xml index 87827c86dd..88a247df0c 100644 --- a/branches/sca-equinox/itest/conversations-ws/pom.xml +++ b/branches/sca-equinox/itest/conversations-ws/pom.xml @@ -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>
diff --git a/branches/sca-equinox/itest/exceptions-simple-ws/pom.xml b/branches/sca-equinox/itest/exceptions-simple-ws/pom.xml index bd6646344d..b74a54aeb5 100644 --- a/branches/sca-equinox/itest/exceptions-simple-ws/pom.xml +++ b/branches/sca-equinox/itest/exceptions-simple-ws/pom.xml @@ -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> diff --git a/branches/sca-equinox/itest/interop-soap-service/pom.xml b/branches/sca-equinox/itest/interop-soap-service/pom.xml index 76285e3926..4aa2593665 100644 --- a/branches/sca-equinox/itest/interop-soap-service/pom.xml +++ b/branches/sca-equinox/itest/interop-soap-service/pom.xml @@ -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> diff --git a/branches/sca-equinox/itest/large-sdo-ws/pom.xml b/branches/sca-equinox/itest/large-sdo-ws/pom.xml index 64aba086cb..7d43c544a9 100644 --- a/branches/sca-equinox/itest/large-sdo-ws/pom.xml +++ b/branches/sca-equinox/itest/large-sdo-ws/pom.xml @@ -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> diff --git a/branches/sca-equinox/itest/late-reference-resolution/pom.xml b/branches/sca-equinox/itest/late-reference-resolution/pom.xml index f30931f309..3b3a41db41 100644 --- a/branches/sca-equinox/itest/late-reference-resolution/pom.xml +++ b/branches/sca-equinox/itest/late-reference-resolution/pom.xml @@ -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> diff --git a/branches/sca-equinox/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml b/branches/sca-equinox/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml index ea1c78fa2a..8d0105fbcb 100644 --- a/branches/sca-equinox/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml +++ b/branches/sca-equinox/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml @@ -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> diff --git a/branches/sca-equinox/itest/osgi-tuscany/tuscany-versioned/pom.xml b/branches/sca-equinox/itest/osgi-tuscany/tuscany-versioned/pom.xml index 88c5fae221..340bb3e158 100644 --- a/branches/sca-equinox/itest/osgi-tuscany/tuscany-versioned/pom.xml +++ b/branches/sca-equinox/itest/osgi-tuscany/tuscany-versioned/pom.xml @@ -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> diff --git a/branches/sca-equinox/itest/policy-security-basicauth/pom.xml b/branches/sca-equinox/itest/policy-security-basicauth/pom.xml index ca9257b827..6550e2f1dc 100644 --- a/branches/sca-equinox/itest/policy-security-basicauth/pom.xml +++ b/branches/sca-equinox/itest/policy-security-basicauth/pom.xml @@ -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> diff --git a/branches/sca-equinox/itest/policy-security-jsr250/pom.xml b/branches/sca-equinox/itest/policy-security-jsr250/pom.xml index 2bb8001486..da0e3a0fce 100644 --- a/branches/sca-equinox/itest/policy-security-jsr250/pom.xml +++ b/branches/sca-equinox/itest/policy-security-jsr250/pom.xml @@ -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> diff --git a/branches/sca-equinox/itest/policy-security/pom.xml b/branches/sca-equinox/itest/policy-security/pom.xml index e8100e9fa0..ba079444e1 100644 --- a/branches/sca-equinox/itest/policy-security/pom.xml +++ b/branches/sca-equinox/itest/policy-security/pom.xml @@ -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> diff --git a/branches/sca-equinox/itest/policy/pom.xml b/branches/sca-equinox/itest/policy/pom.xml index 68d03d72b6..d889b904a3 100644 --- a/branches/sca-equinox/itest/policy/pom.xml +++ b/branches/sca-equinox/itest/policy/pom.xml @@ -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> diff --git a/branches/sca-equinox/itest/pom.xml b/branches/sca-equinox/itest/pom.xml index 0f106ffd6e..d20ca025d1 100644 --- a/branches/sca-equinox/itest/pom.xml +++ b/branches/sca-equinox/itest/pom.xml @@ -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 --> <!-- diff --git a/branches/sca-equinox/itest/promotion-interface-missmatch/pom.xml b/branches/sca-equinox/itest/promotion-interface-missmatch/pom.xml index 0b3c3cf0c7..13d50c91fd 100644 --- a/branches/sca-equinox/itest/promotion-interface-missmatch/pom.xml +++ b/branches/sca-equinox/itest/promotion-interface-missmatch/pom.xml @@ -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> diff --git a/branches/sca-equinox/itest/serialization/pom.xml b/branches/sca-equinox/itest/serialization/pom.xml index 9a6c3ea1e3..7fbf29ced4 100644 --- a/branches/sca-equinox/itest/serialization/pom.xml +++ b/branches/sca-equinox/itest/serialization/pom.xml @@ -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> diff --git a/branches/sca-equinox/itest/ws-void-args-return/pom.xml b/branches/sca-equinox/itest/ws-void-args-return/pom.xml index 673a887758..db8d96b9e5 100644 --- a/branches/sca-equinox/itest/ws-void-args-return/pom.xml +++ b/branches/sca-equinox/itest/ws-void-args-return/pom.xml @@ -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>
diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java b/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java index 2679071ea8..3ee3b64e4d 100644 --- a/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java +++ b/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java @@ -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. * diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java b/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java index b9252d097a..cd17f48249 100644 --- a/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java +++ b/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java @@ -23,7 +23,7 @@ import java.io.InputStream; 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. diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerImpl.java b/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerImpl.java index 8da6977c2c..d52215b7ea 100644 --- a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerImpl.java +++ b/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerImpl.java @@ -37,15 +37,15 @@ public class CalendarConsumerImpl { 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); } diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerTest.java b/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerTest.java index 361b9b122d..211ae51ba2 100644 --- a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerTest.java +++ b/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerTest.java @@ -28,7 +28,7 @@ import com.google.gdata.data.extensions.When; 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; diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/CustomerCollectionImpl.java b/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/CustomerCollectionImpl.java index 8233d01dd9..b58bdb408f 100644 --- a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/CustomerCollectionImpl.java +++ b/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/CustomerCollectionImpl.java @@ -31,7 +31,7 @@ import java.util.Map; 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") diff --git a/branches/sca-equinox/modules/host-corba-jse/pom.xml b/branches/sca-equinox/modules/host-corba-jse/pom.xml index d0c4c53900..cde59fa5fe 100644 --- a/branches/sca-equinox/modules/host-corba-jse/pom.xml +++ b/branches/sca-equinox/modules/host-corba-jse/pom.xml @@ -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> diff --git a/branches/sca-equinox/modules/host-jetty/pom.xml b/branches/sca-equinox/modules/host-jetty/pom.xml index 1a4c19b69a..9d4570b9ec 100644 --- a/branches/sca-equinox/modules/host-jetty/pom.xml +++ b/branches/sca-equinox/modules/host-jetty/pom.xml @@ -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> diff --git a/branches/sca-equinox/modules/node-launcher-webapp/pom.xml b/branches/sca-equinox/modules/node-launcher-webapp/pom.xml index c0c911e63a..c8c9fe971e 100644 --- a/branches/sca-equinox/modules/node-launcher-webapp/pom.xml +++ b/branches/sca-equinox/modules/node-launcher-webapp/pom.xml @@ -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> diff --git a/branches/sca-equinox/modules/policy-security/pom.xml b/branches/sca-equinox/modules/policy-security/pom.xml index 640d131642..dc8ab87bef 100644 --- a/branches/sca-equinox/modules/policy-security/pom.xml +++ b/branches/sca-equinox/modules/policy-security/pom.xml @@ -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>
diff --git a/branches/sca-equinox/modules/policy-transaction/pom.xml b/branches/sca-equinox/modules/policy-transaction/pom.xml index 42f4005306..c51ac0d180 100644 --- a/branches/sca-equinox/modules/policy-transaction/pom.xml +++ b/branches/sca-equinox/modules/policy-transaction/pom.xml @@ -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> diff --git a/branches/sca-equinox/modules/pom.xml b/branches/sca-equinox/modules/pom.xml index a5029efaa7..113055a5e6 100644 --- a/branches/sca-equinox/modules/pom.xml +++ b/branches/sca-equinox/modules/pom.xml @@ -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> diff --git a/branches/sca-equinox/samples/calculator-distributed/pom.xml b/branches/sca-equinox/samples/calculator-distributed/pom.xml index a0f04d4a1a..c517625300 100644 --- a/branches/sca-equinox/samples/calculator-distributed/pom.xml +++ b/branches/sca-equinox/samples/calculator-distributed/pom.xml @@ -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> diff --git a/branches/sca-equinox/samples/callback-ws-client/pom.xml b/branches/sca-equinox/samples/callback-ws-client/pom.xml index c45691febb..1fae308598 100644 --- a/branches/sca-equinox/samples/callback-ws-client/pom.xml +++ b/branches/sca-equinox/samples/callback-ws-client/pom.xml @@ -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>
diff --git a/branches/sca-equinox/samples/callback-ws-service/pom.xml b/branches/sca-equinox/samples/callback-ws-service/pom.xml index 789f981d49..7094c848c6 100644 --- a/branches/sca-equinox/samples/callback-ws-service/pom.xml +++ b/branches/sca-equinox/samples/callback-ws-service/pom.xml @@ -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>
diff --git a/branches/sca-equinox/samples/feed-aggregator/pom.xml b/branches/sca-equinox/samples/feed-aggregator/pom.xml index 5e869ba608..c20c79440e 100644 --- a/branches/sca-equinox/samples/feed-aggregator/pom.xml +++ b/branches/sca-equinox/samples/feed-aggregator/pom.xml @@ -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> diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/pom.xml b/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/pom.xml index 7d4fdd95e6..4b8f633640 100644 --- a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/pom.xml +++ b/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/pom.xml @@ -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> diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo/pom.xml b/branches/sca-equinox/samples/helloworld-ws-sdo/pom.xml index 58dc56828f..c1a8def8de 100644 --- a/branches/sca-equinox/samples/helloworld-ws-sdo/pom.xml +++ b/branches/sca-equinox/samples/helloworld-ws-sdo/pom.xml @@ -75,7 +75,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> diff --git a/branches/sca-equinox/samples/helloworld-ws-service-secure/pom.xml b/branches/sca-equinox/samples/helloworld-ws-service-secure/pom.xml index b47a865b63..4ceb6bceca 100644 --- a/branches/sca-equinox/samples/helloworld-ws-service-secure/pom.xml +++ b/branches/sca-equinox/samples/helloworld-ws-service-secure/pom.xml @@ -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>
diff --git a/branches/sca-equinox/samples/helloworld-ws-service/pom.xml b/branches/sca-equinox/samples/helloworld-ws-service/pom.xml index ebb56b9a7e..3b65eb860b 100644 --- a/branches/sca-equinox/samples/helloworld-ws-service/pom.xml +++ b/branches/sca-equinox/samples/helloworld-ws-service/pom.xml @@ -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> diff --git a/branches/sca-equinox/samples/pom.xml b/branches/sca-equinox/samples/pom.xml index cb4df0c47b..0b30db08d6 100644 --- a/branches/sca-equinox/samples/pom.xml +++ b/branches/sca-equinox/samples/pom.xml @@ -59,7 +59,9 @@ <module>calculator-ws-webapp</module> <module>callback-ws-client</module> <module>callback-ws-service</module> + <!-- <module>customer-dojo</module> + --> <module>databinding-echo</module> <module>domain-management</module> <module>feed-aggregator</module> @@ -99,7 +101,9 @@ <module>store-distributed</module> <module>supplychain</module> <module>web-resource</module> + <!-- <module>zipcode-jaxws</module> + --> </modules> </profile> </profiles> diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/pom.xml b/branches/sca-equinox/samples/simple-bigbank-spring/pom.xml index 9e5dc673b9..00a8c97304 100644 --- a/branches/sca-equinox/samples/simple-bigbank-spring/pom.xml +++ b/branches/sca-equinox/samples/simple-bigbank-spring/pom.xml @@ -170,7 +170,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> diff --git a/branches/sca-equinox/samples/simple-callback-ws/pom.xml b/branches/sca-equinox/samples/simple-callback-ws/pom.xml index d3482afb8b..1c3b4101cc 100644 --- a/branches/sca-equinox/samples/simple-callback-ws/pom.xml +++ b/branches/sca-equinox/samples/simple-callback-ws/pom.xml @@ -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> diff --git a/branches/sca-equinox/samples/spring-bigbank-stockquote/pom.xml b/branches/sca-equinox/samples/spring-bigbank-stockquote/pom.xml index 97cbc2d329..15786039e8 100644 --- a/branches/sca-equinox/samples/spring-bigbank-stockquote/pom.xml +++ b/branches/sca-equinox/samples/spring-bigbank-stockquote/pom.xml @@ -72,7 +72,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> diff --git a/branches/sca-equinox/samples/store-distributed/pom.xml b/branches/sca-equinox/samples/store-distributed/pom.xml index 1cd493807e..57f8cc5f98 100644 --- a/branches/sca-equinox/samples/store-distributed/pom.xml +++ b/branches/sca-equinox/samples/store-distributed/pom.xml @@ -98,7 +98,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> diff --git a/branches/sca-equinox/samples/store/pom.xml b/branches/sca-equinox/samples/store/pom.xml index ce00e13bb5..ad5709116e 100644 --- a/branches/sca-equinox/samples/store/pom.xml +++ b/branches/sca-equinox/samples/store/pom.xml @@ -85,7 +85,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> diff --git a/branches/sca-equinox/samples/web-resource/pom.xml b/branches/sca-equinox/samples/web-resource/pom.xml index 8c3f8d894c..25d0153aef 100644 --- a/branches/sca-equinox/samples/web-resource/pom.xml +++ b/branches/sca-equinox/samples/web-resource/pom.xml @@ -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> diff --git a/branches/sca-equinox/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleMojo.java b/branches/sca-equinox/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleMojo.java index a1189d91b7..6499b66892 100644 --- a/branches/sca-equinox/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleMojo.java +++ b/branches/sca-equinox/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleMojo.java @@ -220,7 +220,7 @@ public class LibraryBundleMojo extends AbstractMojo { } catch (IOException e) { throw new MojoExecutionException(e.getMessage(), e); } - if (bundleName == null) { + if (bundleName == null || true) { if (artifact.getFile().exists()) { log.info("Adding third party jar: " + artifact); jarFiles.add(artifact.getFile()); diff --git a/branches/sca-equinox/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleUtil.java b/branches/sca-equinox/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleUtil.java index 39c02bd2b4..2adef183c3 100644 --- a/branches/sca-equinox/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleUtil.java +++ b/branches/sca-equinox/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleUtil.java @@ -75,11 +75,19 @@ public final class LibraryBundleUtil { } static Pattern pattern = Pattern.compile("-([0-9.]+)"); + static Pattern pattern2 = Pattern.compile("_([0-9.]+)"); private static String version(String jarFile) { - Matcher matcher = pattern.matcher(jarFile); String version = "1.0.0"; + boolean found = false; + Matcher matcher = pattern2.matcher(jarFile); if (matcher.find()) { + found = true; + } else { + matcher = pattern.matcher(jarFile); + found = matcher.find(); + } + if (found) { version = matcher.group(); if (version.endsWith(".")) { version = version.substring(1, version.length() - 1); @@ -91,24 +99,31 @@ public final class LibraryBundleUtil { } private static void addPackages(File jarFile, Set<String> packages) throws IOException { - String version = ";version=" + version(jarFile.getPath()); - ZipInputStream is = new ZipInputStream(new FileInputStream(jarFile)); - ZipEntry entry; - while ((entry = is.getNextEntry()) != null) { - String entryName = entry.getName(); - if (!entry.isDirectory() && entryName != null - && entryName.length() > 0 - && !entryName.startsWith(".") - && entryName.endsWith(".class") // Exclude resources from Export-Package - && entryName.lastIndexOf("/") > 0 - && Character.isJavaIdentifierStart(entryName.charAt(0))) { - String pkg = entryName.substring(0, entryName.lastIndexOf("/")).replace('/', '.'); - if (!("org.apache.commons.lang.enum".equals(pkg))) { - packages.add(pkg + version); + if (getBundleName(jarFile) == null) { + String version = ";version=" + version(jarFile.getPath()); + ZipInputStream is = new ZipInputStream(new FileInputStream(jarFile)); + ZipEntry entry; + while ((entry = is.getNextEntry()) != null) { + String entryName = entry.getName(); + if (!entry.isDirectory() && entryName != null + && entryName.length() > 0 + && !entryName.startsWith(".") + && entryName.endsWith(".class") // Exclude resources from Export-Package + && entryName.lastIndexOf("/") > 0 + && Character.isJavaIdentifierStart(entryName.charAt(0))) { + String pkg = entryName.substring(0, entryName.lastIndexOf("/")).replace('/', '.'); + if (!("org.apache.commons.lang.enum".equals(pkg))) { + packages.add(pkg + version); + } } } + is.close(); + } else { + Set<String> exportedPackages = getExportedPackages(jarFile); + if (exportedPackages != null) { + packages.addAll(exportedPackages); + } } - is.close(); } static Manifest libraryManifest(Set<File> jarFiles, String name, String version, boolean copyJars) @@ -191,9 +206,9 @@ public final class LibraryBundleUtil { write(attributes, BUNDLE_NAME, dos); write(attributes, BUNDLE_VERSION, dos); write(attributes, DYNAMICIMPORT_PACKAGE, dos); - write(attributes, EXPORT_PACKAGE, dos); - write(attributes, IMPORT_PACKAGE, dos); write(attributes, BUNDLE_CLASSPATH, dos); + write(attributes, IMPORT_PACKAGE, dos); + write(attributes, EXPORT_PACKAGE, dos); dos.flush(); } @@ -249,6 +264,59 @@ public final class LibraryBundleUtil { return bundleName; } + /** + * Returns the packages exported by a bundle. + * + * @param file + * @return + * @throws IOException + */ + static Set<String> getExportedPackages(File file) throws IOException { + if (!file.exists()) { + return null; + } + String exports = null; + if (file.isDirectory()) { + File mf = new File(file, "META-INF/MANIFEST.MF"); + if (mf.isFile()) { + Manifest manifest = new Manifest(new FileInputStream(mf)); + exports = manifest.getMainAttributes().getValue(EXPORT_PACKAGE); + } + } else { + JarFile jar = new JarFile(file, false); + Manifest manifest = jar.getManifest(); + exports = manifest.getMainAttributes().getValue(EXPORT_PACKAGE); + jar.close(); + } + if (exports == null) { + return null; + } + System.out.println("##### Exports: " + exports); + Set<String> exportedPackages = new HashSet<String>(); + StringBuffer export = new StringBuffer(); + boolean q = false; + for (int i =0, n = exports.length(); i <n; i++) { + char c = exports.charAt(i); + if (c == '\"') { + q = !q; + } + if (!q) { + if (c == ',') { + exportedPackages.add(export.toString()); + System.out.println("##### Package: " + export); + export = new StringBuffer(); + continue; + } + } + export.append(c); + } + if (export.length() != 0) { + exportedPackages.add(export.toString()); + System.out.println("##### Package: " + export); + } + return exportedPackages; + } + public static String string(Bundle b, boolean verbose) { StringBuffer sb = new StringBuffer(); sb.append(b.getBundleId()).append(" ").append(b.getSymbolicName()); diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/pom.xml b/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/pom.xml index c2a276df13..7c23e099a4 100644 --- a/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/pom.xml +++ b/branches/sca-equinox/vtest/wsbinding/nowsdl/defaultbinding/pom.xml @@ -43,7 +43,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> diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/pom.xml b/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/pom.xml index 6cdab80d1d..bff44b8cb2 100644 --- a/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/pom.xml +++ b/branches/sca-equinox/vtest/wsbinding/nowsdl/multisoapbindings/pom.xml @@ -43,7 +43,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> diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/pom.xml b/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/pom.xml index ab19ed9034..a3768f0194 100644 --- a/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/pom.xml +++ b/branches/sca-equinox/vtest/wsbinding/nowsdl/promoted/pom.xml @@ -43,7 +43,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> diff --git a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/pom.xml b/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/pom.xml index 6345eec911..2da60e858b 100644 --- a/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/pom.xml +++ b/branches/sca-equinox/vtest/wsbinding/nowsdl/soapversion/pom.xml @@ -43,7 +43,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> diff --git a/branches/sca-equinox/vtest/wsbinding/service/pom.xml b/branches/sca-equinox/vtest/wsbinding/service/pom.xml index 3f0a2a4125..0db20c9123 100644 --- a/branches/sca-equinox/vtest/wsbinding/service/pom.xml +++ b/branches/sca-equinox/vtest/wsbinding/service/pom.xml @@ -43,7 +43,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> diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/pom.xml b/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/pom.xml index 205fbcc785..11a088ccc9 100644 --- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/pom.xml +++ b/branches/sca-equinox/vtest/wsbinding/wsdlelement/binding/pom.xml @@ -43,7 +43,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> diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/pom.xml b/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/pom.xml index 777e7cc210..f98f9d175a 100644 --- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/pom.xml +++ b/branches/sca-equinox/vtest/wsbinding/wsdlelement/port/pom.xml @@ -43,7 +43,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> diff --git a/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/pom.xml b/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/pom.xml index 149037cf4d..184b0ff889 100644 --- a/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/pom.xml +++ b/branches/sca-equinox/vtest/wsbinding/wsdlelement/service/pom.xml @@ -43,7 +43,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> |