diff options
| -rw-r--r-- | java/sca/itest/bpel/helloworld-reference/pom.xml | 12 | ||||
| -rw-r--r-- | java/sca/itest/bpel/helloworld-ws/pom.xml | 199 | ||||
| -rw-r--r-- | java/sca/itest/bpel/helloworld/pom.xml | 170 | ||||
| -rw-r--r-- | java/sca/itest/bpel/pom.xml | 2 |
4 files changed, 201 insertions, 182 deletions
diff --git a/java/sca/itest/bpel/helloworld-reference/pom.xml b/java/sca/itest/bpel/helloworld-reference/pom.xml index 7f36ef03f4..ea044f7416 100644 --- a/java/sca/itest/bpel/helloworld-reference/pom.xml +++ b/java/sca/itest/bpel/helloworld-reference/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>itest-bpel</artifactId> - <version>1.6-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <artifactId>itest-bpel-helloworld-reference</artifactId> @@ -39,34 +39,34 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-host-embedded</artifactId> - <version>1.6-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.6-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-ws-axis2</artifactId> - <version>1.6-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-host-tomcat</artifactId> - <version>1.6-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-bpel-ode</artifactId> - <version>1.6-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> diff --git a/java/sca/itest/bpel/helloworld-ws/pom.xml b/java/sca/itest/bpel/helloworld-ws/pom.xml index 6b241ea748..de84bec40c 100644 --- a/java/sca/itest/bpel/helloworld-ws/pom.xml +++ b/java/sca/itest/bpel/helloworld-ws/pom.xml @@ -1,103 +1,105 @@ <?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. ---> + <!-- + * 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>itest-bpel</artifactId> - <version>1.6-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - <artifactId>itest-bpel-helloworld-ws</artifactId> - <name>Apache Tuscany SCA iTest HelloWorld BPEL Over Web Services</name> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-bpel</artifactId> + <version>2.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + <artifactId>itest-bpel-helloworld-ws + </artifactId> + <name>Apache Tuscany SCA iTest HelloWorld BPEL Over Web Services + </name> - <repositories> - <repository> - <id>apache.incubator</id> - <url>http://people.apache.org/repo/m2-incubating-repository</url> - </repository> - </repositories> + <repositories> + <repository> + <id>apache.incubator</id> + <url>http://people.apache.org/repo/m2-incubating-repository + </url> + </repository> + </repositories> - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> - <version>1.6-SNAPSHOT</version> - </dependency> + <dependencies> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-host-embedded</artifactId> + <version>2.0-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-implementation-java-runtime + </artifactId> + <version>2.0-SNAPSHOT</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-implementation-bpel-ode + </artifactId> + <version>2.0-SNAPSHOT</version> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.6-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-binding-ws-axis2 + </artifactId> + <version>2.0-SNAPSHOT</version> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-bpel-ode</artifactId> - <version>1.6-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.apache.tuscany.sdo</groupId> + <artifactId>tuscany-sdo-impl</artifactId> + <version>1.1.1</version> + </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> - <version>1.6-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sdo</groupId> - <artifactId>tuscany-sdo-impl</artifactId> - <version>1.1.1</version> - </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.8.1</version> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-host-tomcat</artifactId> + <version>1.6-SNAPSHOT</version> + <scope>runtime</scope> + </dependency> <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.8.1</version> - </dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.5</version> + <scope>test</scope> + </dependency> + </dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-tomcat</artifactId> - <version>1.6-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.5</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <finalName>${artifactId}</finalName> + <build> + <finalName>${artifactId}</finalName> <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> + <!-- http://jira.codehaus.org/browse/SUREFIRE-322 --> + <version>2.3.1</version> <configuration> <useFile>false</useFile> <trimStackTrace>false</trimStackTrace> @@ -106,7 +108,8 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> + <artifactId>maven-dependency-plugin + </artifactId> <executions> <execution> <id>unpack</id> @@ -118,11 +121,13 @@ <artifactItems> <artifactItem> <groupId>org.apache.ode</groupId> - <artifactId>ode-dao-jpa-ojpa-derby</artifactId> + <artifactId>ode-dao-jpa-ojpa-derby + </artifactId> <version>1.1</version> <type>zip</type> <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/test-classes/</outputDirectory> + <outputDirectory>${project.build.directory}/test-classes/ + </outputDirectory> </artifactItem> </artifactItems> </configuration> @@ -138,8 +143,11 @@ <id>generate-bpel-helloworld</id> <phase>generate-sources</phase> <configuration> - <schemaFile>${basedir}/src/test/resources/helloworld/helloworld.wsdl</schemaFile> - <targetDirectory>${basedir}/target/wsdl2java-source</targetDirectory> + <schemaFile> + ${basedir}/src/test/resources/helloworld/helloworld.wsdl + </schemaFile> + <targetDirectory>${basedir}/target/wsdl2java-source + </targetDirectory> <prefix>HelloWorld</prefix> <noNotification>true</noNotification> <noContainer>true</noContainer> @@ -153,14 +161,17 @@ </plugin> <plugin> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-maven-wsdl2java</artifactId> + <artifactId>tuscany-maven-wsdl2java + </artifactId> <version>1.6-SNAPSHOT</version> <executions> <execution> <configuration> <wsdlFiles> <wsdlFile> - <fileName>${basedir}/src/test/resources/helloworld/helloworld.wsdl</fileName> + <fileName> + ${basedir}/src/test/resources/helloworld/helloworld.wsdl + </fileName> </wsdlFile> </wsdlFiles> </configuration> @@ -171,6 +182,6 @@ </executions> </plugin> </plugins> - </build> + </build> </project> diff --git a/java/sca/itest/bpel/helloworld/pom.xml b/java/sca/itest/bpel/helloworld/pom.xml index 638c0a3cb9..3254bc1383 100644 --- a/java/sca/itest/bpel/helloworld/pom.xml +++ b/java/sca/itest/bpel/helloworld/pom.xml @@ -1,89 +1,88 @@ <?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. ---> + <!-- + * 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>itest-bpel</artifactId> - <version>1.6-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - <artifactId>itest-bpel-helloworld</artifactId> - <name>Apache Tuscany SCA iTest HelloWorld BPEL</name> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>itest-bpel</artifactId> + <version>2.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + <artifactId>itest-bpel-helloworld</artifactId> + <name>Apache Tuscany SCA iTest HelloWorld BPEL</name> - <repositories> - <repository> - <id>apache.incubator</id> - <url>http://people.apache.org/repo/m2-incubating-repository</url> - </repository> - </repositories> + <repositories> + <repository> + <id>apache.incubator</id> + <url>http://people.apache.org/repo/m2-incubating-repository + </url> + </repository> + </repositories> - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> - <version>1.6-SNAPSHOT</version> - </dependency> + <dependencies> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-host-embedded</artifactId> + <version>2.0-SNAPSHOT</version> + </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.6-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-implementation-java-runtime + </artifactId> + <version>2.0-SNAPSHOT</version> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-bpel-ode</artifactId> - <version>1.6-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-implementation-bpel-ode + </artifactId> + <version>2.0-SNAPSHOT</version> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>org.apache.tuscany.sdo</groupId> - <artifactId>tuscany-sdo-impl</artifactId> - <version>1.1.1</version> - </dependency> + <dependency> + <groupId>org.apache.tuscany.sdo</groupId> + <artifactId>tuscany-sdo-impl</artifactId> + <version>1.1.1</version> + </dependency> <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.8.1</version> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.5</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <finalName>${artifactId}</finalName> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.8.1</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.5</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <finalName>${artifactId}</finalName> <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> + <!-- http://jira.codehaus.org/browse/SUREFIRE-322 --> + <version>2.3.1</version> <configuration> <useFile>false</useFile> <trimStackTrace>false</trimStackTrace> @@ -92,7 +91,8 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> + <artifactId>maven-dependency-plugin + </artifactId> <executions> <execution> <id>unpack</id> @@ -104,11 +104,13 @@ <artifactItems> <artifactItem> <groupId>org.apache.ode</groupId> - <artifactId>ode-dao-jpa-ojpa-derby</artifactId> + <artifactId>ode-dao-jpa-ojpa-derby + </artifactId> <version>1.1</version> <type>zip</type> <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/test-classes/</outputDirectory> + <outputDirectory>${project.build.directory}/test-classes/ + </outputDirectory> </artifactItem> </artifactItems> </configuration> @@ -124,8 +126,11 @@ <id>generate-bpel-helloworld</id> <phase>generate-sources</phase> <configuration> - <schemaFile>${basedir}/src/test/resources/helloworld/helloworld.wsdl</schemaFile> - <targetDirectory>${basedir}/target/wsdl2java-source</targetDirectory> + <schemaFile> + ${basedir}/src/test/resources/helloworld/helloworld.wsdl + </schemaFile> + <targetDirectory>${basedir}/target/wsdl2java-source + </targetDirectory> <prefix>HelloWorld</prefix> <noNotification>true</noNotification> <noContainer>true</noContainer> @@ -139,14 +144,17 @@ </plugin> <plugin> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-maven-wsdl2java</artifactId> + <artifactId>tuscany-maven-wsdl2java + </artifactId> <version>1.6-SNAPSHOT</version> <executions> <execution> <configuration> <wsdlFiles> <wsdlFile> - <fileName>${basedir}/src/test/resources/helloworld/helloworld.wsdl</fileName> + <fileName> + ${basedir}/src/test/resources/helloworld/helloworld.wsdl + </fileName> </wsdlFile> </wsdlFiles> </configuration> @@ -157,6 +165,6 @@ </executions> </plugin> </plugins> - </build> + </build> </project> diff --git a/java/sca/itest/bpel/pom.xml b/java/sca/itest/bpel/pom.xml index 85b0f79737..d6909735db 100644 --- a/java/sca/itest/bpel/pom.xml +++ b/java/sca/itest/bpel/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-itest</artifactId> - <version>1.6-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>itest-bpel</artifactId> |