diff options
Diffstat (limited to 'branches/sca-java-1.5.1/itest/osgi-tuscany')
5 files changed, 265 insertions, 265 deletions
diff --git a/branches/sca-java-1.5.1/itest/osgi-tuscany/osgi-tuscany-test/pom.xml b/branches/sca-java-1.5.1/itest/osgi-tuscany/osgi-tuscany-test/pom.xml index 34fefd68ac..362be7a577 100644 --- a/branches/sca-java-1.5.1/itest/osgi-tuscany/osgi-tuscany-test/pom.xml +++ b/branches/sca-java-1.5.1/itest/osgi-tuscany/osgi-tuscany-test/pom.xml @@ -1,99 +1,99 @@ -<?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-itest</artifactId>
- <version>1.6-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>itest-osgi-tuscany-test</artifactId>
- <name>Apache Tuscany OSGi-Based Tuscany Runtime Tests</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
- <version>3.3.2.R33x_v20080105</version>
- </dependency>
-
-
-<!-- Uncomment this section and comment out the Equinox dependency above to run tests using Felix.
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.main</artifactId>
- <version>1.0.4</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.0.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>javax.servlet</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr</artifactId>
- <version>1.0.2</version>
- </dependency>
-
-End Felix dependencies -->
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>pertest</forkMode>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <repositories>
- <repository>
- <id>ops4j-repository</id>
- <url>http://repository.ops4j.org/maven2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
-</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-itest</artifactId> + <version>1.5.1-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + <artifactId>itest-osgi-tuscany-test</artifactId> + <name>Apache Tuscany OSGi-Based Tuscany Runtime Tests</name> + + <dependencies> + + <dependency> + <groupId>org.eclipse</groupId> + <artifactId>osgi</artifactId> + <version>3.3.2.R33x_v20080105</version> + </dependency> + + +<!-- Uncomment this section and comment out the Equinox dependency above to run tests using Felix. + + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.main</artifactId> + <version>1.0.4</version> + </dependency> + + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.configadmin</artifactId> + <version>1.0.1</version> + <exclusions> + <exclusion> + <groupId>org.apache.felix</groupId> + <artifactId>javax.servlet</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.scr</artifactId> + <version>1.0.2</version> + </dependency> + +End Felix dependencies --> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.5</version> + <scope>test</scope> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkMode>pertest</forkMode> + </configuration> + </plugin> + </plugins> + </build> + + <repositories> + <repository> + <id>ops4j-repository</id> + <url>http://repository.ops4j.org/maven2</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> + +</project> diff --git a/branches/sca-java-1.5.1/itest/osgi-tuscany/pom.xml b/branches/sca-java-1.5.1/itest/osgi-tuscany/pom.xml index 1ed5bb001d..890b1645b7 100644 --- a/branches/sca-java-1.5.1/itest/osgi-tuscany/pom.xml +++ b/branches/sca-java-1.5.1/itest/osgi-tuscany/pom.xml @@ -1,39 +1,39 @@ -<?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-itest</artifactId>
- <version>1.6-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>itest-osgi-tuscany</artifactId>
- <packaging>pom</packaging>
- <name>Apache Tuscany OSGi-based Tuscany Runtime Integration Tests</name>
-
- <modules>
- <module>test-bundles</module>
- <module>tuscany-versioned</module>
- <module>tuscany-osgi-installer</module>
- <module>osgi-tuscany-test</module>
- </modules>
-
-</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-itest</artifactId> + <version>1.5.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <artifactId>itest-osgi-tuscany</artifactId> + <packaging>pom</packaging> + <name>Apache Tuscany OSGi-based Tuscany Runtime Integration Tests</name> + + <modules> + <module>test-bundles</module> + <module>tuscany-versioned</module> + <module>tuscany-osgi-installer</module> + <module>osgi-tuscany-test</module> + </modules> + +</project> diff --git a/branches/sca-java-1.5.1/itest/osgi-tuscany/test-bundles/pom.xml b/branches/sca-java-1.5.1/itest/osgi-tuscany/test-bundles/pom.xml index ae651a75c1..f8a8a1df40 100644 --- a/branches/sca-java-1.5.1/itest/osgi-tuscany/test-bundles/pom.xml +++ b/branches/sca-java-1.5.1/itest/osgi-tuscany/test-bundles/pom.xml @@ -1,124 +1,124 @@ -<?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-itest</artifactId>
- <version>1.6-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>itest-osgi-tuscany-test-bundles</artifactId>
- <name>Apache Tuscany OSGi-Based Tuscany Runtime Test Bundles</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>1.6-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>1.6-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.main</artifactId>
- <version>1.0.4</version>
- </dependency>
-
-
- </dependencies>
-
- <build>
- <finalName>itest-osgi-tuscany-test-bundles</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
-
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.6.5</version>
- </dependency>
- </dependencies>
-
- <executions>
- <execution>
- <id>create-bundles</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target" />
- <property name="files.dir" value="target/classes" />
- <property name="jar.file.name" value="SupplyChain.jar" />
- <property name="manifest.file.name" value="META-INF/SupplyChain.mf" />
- <property name="files.list"
- value="supplychain/customer/* \
- supplychain/retailer/* \
- supplychain/warehouse/* \
- supplychain/shipper/* \
- supplychain/supplychain.composite \
- META-INF/sca-contribution.xml" />
-
- </ant>
- <ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target" />
- <property name="files.dir" value="target/classes" />
- <property name="jar.file.name" value="SupplyChainClient.jar" />
- <property name="manifest.file.name" value="META-INF/SupplyChainClient.mf" />
- <property name="files.list"
- value="supplychain/client/*" />
- </ant>
- <ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target" />
- <property name="files.dir" value="target/classes" />
- <property name="jar.file.name" value="SupplyChainWS.jar" />
- <property name="manifest.file.name" value="META-INF/SupplyChain.mf" />
- <property name="files.list"
- value="supplychain/customer/* \
- supplychain/retailer/* \
- supplychain/warehouse/* \
- supplychain/shipper/* \
- supplychain/ws/supplychain.composite \
- supplychain/ws/Customer.wsdl \
- META-INF/sca-contribution.xml" />
-
- </ant>
-
- </tasks>
- </configuration>
- </execution>
- </executions>
- </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-itest</artifactId> + <version>1.5.1-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + <artifactId>itest-osgi-tuscany-test-bundles</artifactId> + <name>Apache Tuscany OSGi-Based Tuscany Runtime Test Bundles</name> + + <dependencies> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-sca-api</artifactId> + <version>1.5.1-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-host-embedded</artifactId> + <version>1.5.1-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.main</artifactId> + <version>1.0.4</version> + </dependency> + + + </dependencies> + + <build> + <finalName>itest-osgi-tuscany-test-bundles</finalName> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.1</version> + + <dependencies> + <dependency> + <groupId>ant</groupId> + <artifactId>ant-trax</artifactId> + <version>1.6.5</version> + </dependency> + </dependencies> + + <executions> + <execution> + <id>create-bundles</id> + <phase>generate-test-sources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <ant antfile="./build-bundles.xml" target="create-bundles"> + <property name="jar.dir" value="target" /> + <property name="files.dir" value="target/classes" /> + <property name="jar.file.name" value="SupplyChain.jar" /> + <property name="manifest.file.name" value="META-INF/SupplyChain.mf" /> + <property name="files.list" + value="supplychain/customer/* \ + supplychain/retailer/* \ + supplychain/warehouse/* \ + supplychain/shipper/* \ + supplychain/supplychain.composite \ + META-INF/sca-contribution.xml" /> + + </ant> + <ant antfile="./build-bundles.xml" target="create-bundles"> + <property name="jar.dir" value="target" /> + <property name="files.dir" value="target/classes" /> + <property name="jar.file.name" value="SupplyChainClient.jar" /> + <property name="manifest.file.name" value="META-INF/SupplyChainClient.mf" /> + <property name="files.list" + value="supplychain/client/*" /> + </ant> + <ant antfile="./build-bundles.xml" target="create-bundles"> + <property name="jar.dir" value="target" /> + <property name="files.dir" value="target/classes" /> + <property name="jar.file.name" value="SupplyChainWS.jar" /> + <property name="manifest.file.name" value="META-INF/SupplyChain.mf" /> + <property name="files.list" + value="supplychain/customer/* \ + supplychain/retailer/* \ + supplychain/warehouse/* \ + supplychain/shipper/* \ + supplychain/ws/supplychain.composite \ + supplychain/ws/Customer.wsdl \ + META-INF/sca-contribution.xml" /> + + </ant> + + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> diff --git a/branches/sca-java-1.5.1/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml b/branches/sca-java-1.5.1/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml index 3232784c33..f0fb52f7a8 100644 --- a/branches/sca-java-1.5.1/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml +++ b/branches/sca-java-1.5.1/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-itest</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <artifactId>itest-osgi-tuscany-installer</artifactId> diff --git a/branches/sca-java-1.5.1/itest/osgi-tuscany/tuscany-versioned/pom.xml b/branches/sca-java-1.5.1/itest/osgi-tuscany/tuscany-versioned/pom.xml index 8bb73d1f18..7ce3fffa9a 100644 --- a/branches/sca-java-1.5.1/itest/osgi-tuscany/tuscany-versioned/pom.xml +++ b/branches/sca-java-1.5.1/itest/osgi-tuscany/tuscany-versioned/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-itest</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <artifactId>itest-osgi-tuscany-versioned</artifactId> @@ -626,7 +626,7 @@ <plugin> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-maven-bundle-plugin</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.1-SNAPSHOT</version> <extensions>true</extensions> <executions> <execution> |