diff options
| author | ramkumar <ramkumar@13f79535-47bb-0310-9956-ffa450edef68> | 2008-12-11 13:21:56 +0000 |
|---|---|---|
| committer | ramkumar <ramkumar@13f79535-47bb-0310-9956-ffa450edef68> | 2008-12-11 13:21:56 +0000 |
| commit | 34d3f52c0dd6b280901e02d195d31602e0dea5ce (patch) | |
| tree | dd23996864da816e441569d7636022dfa0f56300 /branches | |
| parent | 0340bbefeec0581bfd4920718c2cfd4914d0650c (diff) | |
Fixes for 1.4 release RC2
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@725682 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches')
8 files changed, 463 insertions, 467 deletions
diff --git a/branches/sca-java-1.4/demos/bigbank-account/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-1.4/demos/bigbank-account/src/main/resources/META-INF/sca-contribution.xml index c5532b879d..c050b550a5 100644 --- a/branches/sca-java-1.4/demos/bigbank-account/src/main/resources/META-INF/sca-contribution.xml +++ b/branches/sca-java-1.4/demos/bigbank-account/src/main/resources/META-INF/sca-contribution.xml @@ -19,7 +19,6 @@ --> <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://bigbank" xmlns:bb="http://bigbank" xmlns:bbck="http://bigbank/checkings" xmlns:bbsv="http://bigbank/savings" diff --git a/branches/sca-java-1.4/demos/bigbank/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-1.4/demos/bigbank/src/main/resources/META-INF/sca-contribution.xml index 154992c843..dc72a36cd4 100644 --- a/branches/sca-java-1.4/demos/bigbank/src/main/resources/META-INF/sca-contribution.xml +++ b/branches/sca-java-1.4/demos/bigbank/src/main/resources/META-INF/sca-contribution.xml @@ -19,7 +19,6 @@ --> <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://bigbank" xmlns:bb="http://bigbank"> <deployable composite="bb:BigBank"/> diff --git a/branches/sca-java-1.4/distribution/src/main/release/bin/LICENSE b/branches/sca-java-1.4/distribution/src/main/release/bin/LICENSE index 84c914edaa..a1eb109abe 100644 --- a/branches/sca-java-1.4/distribution/src/main/release/bin/LICENSE +++ b/branches/sca-java-1.4/distribution/src/main/release/bin/LICENSE @@ -229,10 +229,7 @@ The following components come under Apache Software License 2.0 abdera-parser-0.4.0-incubating.jar abdera-server-0.4.0-incubating.jar activeio-2.0-r118.jar - activeio-core-3.0.0-incubator.jar - activeio-core-3.1.0-tests.jar activemq-all-5.2.0.jar - activemq-core-5.2.0.jar addressing-1.3.mar annogen-0.1.0.jar aopalliance-1.0.jar @@ -240,7 +237,7 @@ The following components come under Apache Software License 2.0 axiom-dom-1.2.7.jar axiom-impl-1.2.7.jar axis2-adb-1.4.1.jar - axis2-ant-1.4.jar + axis-ant-1.4.jar axis2-codegen-1.4.1.jar axis2-java2wsdl-1.4.1.jar axis2-kernel-1.4.1.jar @@ -287,11 +284,12 @@ The following components come under Apache Software License 2.0 geronimo-util-1.2-beta.jar httpcore-4.0-beta1.jar httpcore-nio-4.0-beta1.jar + jakarta-regexp-1.4.jar jettison-1.0.1.jar jetty-6.1.7.jar jetty-util-6.1.7.jar json-rpc-1.0.jar - log4j-1.2.12.jar + log4j-1.2.13.jar mex-1.41-impl.jar neethi-2.0.4.jar ode-bpel-api-1.1.1.jar diff --git a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-contributions.xsd b/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-contributions.xsd index aab24a7ee2..d1e6f69f37 100644 --- a/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-contributions.xsd +++ b/branches/sca-java-1.4/modules/assembly-xsd/src/main/resources/sca-contributions.xsd @@ -11,10 +11,10 @@ <element name="contribution" type="sca:ContributionType"/> <complexType name="ContributionType"> - <sequence> - <element name="deployable" type="sca:DeployableType" minOccurs="0" maxOccurs="unbounded"/> + <sequence> <choice minOccurs="0" maxOccurs="unbounded"> - <element name="import" type="sca:ImportType"/> + <element name="deployable" type="sca:DeployableType" minOccurs="0" maxOccurs="unbounded"/> + <element name="import" type="sca:ImportType"/> <element name="export" type="sca:ExportType"/> <element name="import.java" type="t:ImportJavaType"/> <element name="export.java" type="t:ExportJavaType"/> diff --git a/branches/sca-java-1.4/modules/implementation-bpel-ode/pom.xml b/branches/sca-java-1.4/modules/implementation-bpel-ode/pom.xml index 8edbbaa938..a56776c308 100644 --- a/branches/sca-java-1.4/modules/implementation-bpel-ode/pom.xml +++ b/branches/sca-java-1.4/modules/implementation-bpel-ode/pom.xml @@ -1,450 +1,450 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-modules</artifactId> - <version>1.4</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>tuscany-implementation-bpel-ode</artifactId> - <name>Apache Tuscany SCA BPEL ODE Implementation Extension</name> - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-assembly</artifactId> - <version>1.4</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-bpel</artifactId> - <version>1.4</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-core</artifactId> - <version>1.4</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-interface</artifactId> - <version>1.4</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-assembly-xml</artifactId> - <version>1.4</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-contribution-impl</artifactId> - <version>1.4</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-sca-api</artifactId> - <version>1.4</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding</artifactId> - <version>1.4</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-sdo</artifactId> - <version>1.4</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.4</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> - <version>1.4</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-interface-wsdl</artifactId> - <version>1.4</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-interface-wsdl-xml</artifactId> - <version>1.4</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sdo</groupId> - <artifactId>tuscany-sdo-impl</artifactId> - <version>1.1.1</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - </exclusion> - <exclusion> - <groupId>backport-util-concurrent</groupId> - <artifactId>backport-util-concurrent</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>backport-util-concurrent</groupId> - <artifactId>backport-util-concurrent</artifactId> - <version>3.1</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.5</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <version>2.2</version> - <scope>test</scope> - </dependency> - - <!-- ODE Jars --> - <dependency> - <groupId>org.apache.ode</groupId> - <artifactId>ode-bpel-epr</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>org.apache.ode</groupId> - <artifactId>ode-bpel-store</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>org.apache.ode</groupId> - <artifactId>ode-bpel-dao</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>org.apache.ode</groupId> - <artifactId>ode-bpel-dao</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>org.apache.ode</groupId> - <artifactId>ode-dao-jpa</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>org.apache.ode</groupId> - <artifactId>ode-dao-jpa-ojpa-derby</artifactId> - <version>1.1.1</version> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.apache.ode</groupId> - <artifactId>ode-bpel-runtime</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>org.apache.ode</groupId> - <artifactId>ode-bpel-api</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>org.apache.ode</groupId> - <artifactId>ode-scheduler-simple</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>org.apache.ode</groupId> - <artifactId>ode-utils</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>org.apache.ode</groupId> - <artifactId>ode-bpel-compiler</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>org.apache.ode</groupId> - <artifactId>ode-bpel-schemas</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>org.apache.ode</groupId> - <artifactId>ode-bpel-obj</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>org.apache.ode</groupId> - <artifactId>ode-jacob</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>org.apache.ode</groupId> - <artifactId>ode-jacob-ap</artifactId> - <version>1.1.1</version> - </dependency> - - <!-- ODE Dependencies --> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.1</version> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.1</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jta_1.0.1B_spec</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.modules</groupId> - <artifactId>geronimo-kernel</artifactId> - <version>1.2-beta</version> - <exclusions> - <exclusion> - <groupId>mx4j</groupId> - <artifactId>mx4j</artifactId> - </exclusion> - <exclusion> - <groupId>xpp3</groupId> - <artifactId>xpp3</artifactId> - </exclusion> - <exclusion> - <groupId>xstream</groupId> - <artifactId>xstream</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.geronimo.modules</groupId> - <artifactId>geronimo-transaction</artifactId> - <version>1.2-beta</version> - <exclusions> - <exclusion> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-ejb_2.1_spec</artifactId> - </exclusion> - <exclusion> - <groupId>ognl</groupId> - <artifactId>ognl</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-ejb_3.0_spec</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.modules</groupId> - <artifactId>geronimo-connector</artifactId> - <version>1.2-beta</version> - <exclusions> - <exclusion> - <groupId>xmlbeans</groupId> - <artifactId>xbean</artifactId> - </exclusion> - <exclusion> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <version>10.3.1.4</version> - </dependency> - <dependency> - <groupId>tranql</groupId> - <artifactId>tranql-connector</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa-all</artifactId> - <version>0.9.7-incubating</version> - <exclusions> - <exclusion> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa-lib</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa-kernel</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa-kernel-5</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa-jdbc</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa-jdbc-5</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa-persistence-jdbc</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa-xmlstore</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>net.sourceforge.serp</groupId> - <artifactId>serp</artifactId> - <version>1.12.0</version> - </dependency> - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1.1</version> - <exclusions> - <exclusion> - <groupId>xom</groupId> - <artifactId>xom</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - <version>2.7.0</version> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.8.1</version> - </dependency> - <dependency> - <groupId>org.apache.xmlbeans</groupId> - <artifactId>xmlbeans</artifactId> - <version>2.3.0</version> - <exclusions> - <exclusion> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>net.sf.saxon</groupId> - <artifactId>saxon</artifactId> - <version>8.7</version> - <!--version>9.0.0.2</version--> - </dependency> - <dependency> - <groupId>net.sf.saxon</groupId> - <artifactId>saxon-dom</artifactId> - <version>8.7</version> - <!--version>9.0.0.2</version--> - </dependency> - <dependency> - <groupId>net.sf.saxon</groupId> - <artifactId>saxon-xpath</artifactId> - <version>8.7</version> - <!--version>9.0.0.2</version--> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.3</version> - <exclusions> - <exclusion> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.13</version> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <!-- http://jira.codehaus.org/browse/SUREFIRE-322 --> - <version>2.3.1</version> - <configuration> - <useFile>false</useFile> - <trimStackTrace>false</trimStackTrace> - <useSystemClassLoader>true</useSystemClassLoader> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>unpack</id> - <phase>generate-sources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.apache.ode</groupId> - <artifactId>ode-dao-jpa-ojpa-derby</artifactId> - <version>1.1.1</version> - <type>zip</type> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/test-classes/</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - - <configuration> - <instructions> - <Bundle-Version>${tuscany.version}</Bundle-Version> - <Bundle-SymbolicName>org.apache.tuscany.sca.implementation.bpel.ode</Bundle-SymbolicName> - <Bundle-Description>${pom.name}</Bundle-Description> - <Export-Package>org.apache.tuscany.sca.implementation.bpel.ode*</Export-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> -</project> +<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-modules</artifactId>
+ <version>1.4</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>tuscany-implementation-bpel-ode</artifactId>
+ <name>Apache Tuscany SCA BPEL ODE Implementation Extension</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-assembly</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-bpel</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-core</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-interface</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-assembly-xml</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-contribution-impl</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-sca-api</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding-sdo</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-embedded</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-interface-wsdl</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-interface-wsdl-xml</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-impl</artifactId>
+ <version>1.1.1</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>2.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- ODE Jars -->
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-epr</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-store</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-dao</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-dao</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-dao-jpa</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-dao-jpa-ojpa-derby</artifactId>
+ <version>1.1.1</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-runtime</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-api</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-scheduler-simple</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-utils</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-compiler</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-schemas</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-obj</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-jacob</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-jacob-ap</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+
+ <!-- ODE Dependencies -->
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ <version>1.2-beta</version>
+ <exclusions>
+ <exclusion>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xstream</groupId>
+ <artifactId>xstream</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-transaction</artifactId>
+ <version>1.2-beta</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_2.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ognl</groupId>
+ <artifactId>ognl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_3.0_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-connector</artifactId>
+ <version>1.2-beta</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.3.1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>tranql</groupId>
+ <artifactId>tranql-connector</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-all</artifactId>
+ <version>0.9.7-incubating</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-lib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-kernel</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-kernel-5</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-jdbc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-jdbc-5</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-persistence-jdbc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-xmlstore</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.serp</groupId>
+ <artifactId>serp</artifactId>
+ <version>1.12.0</version>
+ </dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xom</groupId>
+ <artifactId>xom</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
+ <version>2.3.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon</artifactId>
+ <version>8.7</version>
+ <!--version>9.0.0.2</version-->
+ </dependency>
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon-dom</artifactId>
+ <version>8.7</version>
+ <!--version>9.0.0.2</version-->
+ </dependency>
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon-xpath</artifactId>
+ <version>8.7</version>
+ <!--version>9.0.0.2</version-->
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.15</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <!-- http://jira.codehaus.org/browse/SUREFIRE-322 -->
+ <version>2.3.1</version>
+ <configuration>
+ <useFile>false</useFile>
+ <trimStackTrace>false</trimStackTrace>
+ <useSystemClassLoader>true</useSystemClassLoader>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-dao-jpa-ojpa-derby</artifactId>
+ <version>1.1.1</version>
+ <type>zip</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/test-classes/</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+
+ <configuration>
+ <instructions>
+ <Bundle-Version>${tuscany.version}</Bundle-Version>
+ <Bundle-SymbolicName>org.apache.tuscany.sca.implementation.bpel.ode</Bundle-SymbolicName>
+ <Bundle-Description>${pom.name}</Bundle-Description>
+ <Export-Package>org.apache.tuscany.sca.implementation.bpel.ode*</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/branches/sca-java-1.4/samples/helloworld-bpel-ws/build.xml b/branches/sca-java-1.4/samples/helloworld-bpel-ws/build.xml index 3ad74393c9..e4c889bfec 100644 --- a/branches/sca-java-1.4/samples/helloworld-bpel-ws/build.xml +++ b/branches/sca-java-1.4/samples/helloworld-bpel-ws/build.xml @@ -74,7 +74,7 @@ </jar>
</target>
- <target name="run">
+ <target name="run" depends="compile">
<java classname="${test.class}" fork="true">
<!-- jvmarg value="-Xdebug"/ -->
<!-- jvmarg value="-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y"/ -->
diff --git a/branches/sca-java-1.4/samples/helloworld-bpel/build.xml b/branches/sca-java-1.4/samples/helloworld-bpel/build.xml index 4f944dafdb..72624c1530 100644 --- a/branches/sca-java-1.4/samples/helloworld-bpel/build.xml +++ b/branches/sca-java-1.4/samples/helloworld-bpel/build.xml @@ -74,7 +74,7 @@ </jar> </target> - <target name="run"> + <target name="run" depends="compile"> <java classname="${test.class}" fork="true"> <!-- jvmarg value="-Xdebug"/ --> <!-- jvmarg value="-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y"/ --> diff --git a/branches/sca-java-1.4/samples/photo-gallery/build.xml b/branches/sca-java-1.4/samples/photo-gallery/build.xml index 765f853f38..f8606078ab 100644 --- a/branches/sca-java-1.4/samples/photo-gallery/build.xml +++ b/branches/sca-java-1.4/samples/photo-gallery/build.xml @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. --> -<project name="photo-gallary" default="compile"> +<project name="photo-gallery" default="compile"> <property name="test.class" value="launch.LaunchGallery" /> - <property name="test.jar" value="sample-photo-gallary.jar" /> + <property name="test.jar" value="sample-photo-gallery.jar" /> <target name="init"> <mkdir dir="target/classes"/> @@ -56,13 +56,13 @@ </java> </target> - <target name="run"> + <target name="run" depends="compile"> <java classname="${test.class}" fork="true"> <classpath> <pathelement path="target/classes"/> - <pathelement location="../../lib/tuscany-sca-manifest.jar"/> - <fileset refid="3rdparty.jars"/> + <pathelement location="../../lib/tuscany-sca-manifest.jar"/> + <fileset refid="3rdparty.jars"/> </classpath> </java> </target> |