diff options
Diffstat (limited to 'branches/sca-java-0.99/itest/osgi-implementation')
198 files changed, 0 insertions, 9165 deletions
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/build-bundles.xml b/branches/sca-java-0.99/itest/osgi-implementation/build-bundles.xml deleted file mode 100644 index 450b14a463..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/build-bundles.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?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 name="OSGiBundleCreator"> - - <target name="create-bundles"> - - <mkdir dir="${jar.dir}"/> - - <jar jarfile="${jar.dir}/${jar.file.name}" manifest="${files.dir}/${manifest.file.name}" > - <fileset dir="${files.dir}" includes="${files.list}"> - <!-- include name="${files.list}"/--> - </fileset> - </jar> - </target> - - -</project> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/pom.xml b/branches/sca-java-0.99/itest/osgi-implementation/pom.xml deleted file mode 100644 index 2cbbedd463..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/pom.xml +++ /dev/null @@ -1,734 +0,0 @@ -<?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-sca</artifactId> - <version>0.99-incubating-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - <artifactId>itest-osgi-implementation</artifactId> - <name>Apache Tuscany OSGi-SCA Integration tests</name> - - <dependencies> - - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.main</artifactId> - <version>1.0.0</version> - </dependency> - - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.osgi.core</artifactId> - <version>1.0.0</version> - </dependency> - - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.configadmin</artifactId> - <version>0.9.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.log</artifactId> - <version>0.9.0-incubator-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.scr</artifactId> - <version>0.9.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> - <version>0.99-incubating-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>0.99-incubating-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-osgi</artifactId> - <version>0.99-incubating-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> - <version>0.99-incubating-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-http</artifactId> - <version>0.99-incubating-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-http-jetty</artifactId> - <version>0.99-incubating-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.2</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <finalName>itest-osgi-implementation</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/wiring"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Customer.jar"/> - <property name="manifest.file.name" value="osgi/wiring/Customer.mf"/> - <property name="files.list" - value="supplychain/customer/Customer.class \ - supplychain/OSGiBundleImpl.class \ - supplychain/customer/OSGiCustomerImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/wiring"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Retailer.jar"/> - <property name="manifest.file.name" value="osgi/wiring/Retailer.mf"/> - <property name="files.list" - value="supplychain/retailer/Retailer.class \ - supplychain/OSGiBundleImpl.class \ - supplychain/retailer/OSGiRetailerImpl.class \ - supplychain/retailer/OSGiRetailerServiceImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/wiring"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Shipper.jar"/> - <property name="manifest.file.name" value="osgi/wiring/Shipper.mf"/> - <property name="files.list" - value="supplychain/shipper/Shipper.class \ - supplychain/OSGiBundleImpl.class \ - supplychain/shipper/OSGiShipperImpl.class \ - supplychain/shipper/OSGiShipperServiceImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/wiring"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Warehouse.jar"/> - <property name="manifest.file.name" value="osgi/wiring/Warehouse.mf"/> - <property name="files.list" - value="supplychain/warehouse/Warehouse.class \ - supplychain/OSGiBundleImpl.class \ - supplychain/warehouse/OSGiWarehouseImpl.class \ - supplychain/warehouse/OSGiWarehouseServiceImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/wiring/ds"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Customer.jar"/> - <property name="manifest.file.name" value="osgi/wiring/ds/Customer.mf"/> - <property name="files.list" - value="supplychain/customer/Customer.class \ - osgi/wiring/ds/Customer.xml \ - supplychain/customer/OSGiCustomerComponentImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/wiring/ds"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Retailer.jar"/> - <property name="manifest.file.name" value="osgi/wiring/ds/Retailer.mf"/> - <property name="files.list" - value="supplychain/retailer/Retailer.class \ - osgi/wiring/ds/Retailer1.xml \ - osgi/wiring/ds/Retailer2.xml \ - supplychain/retailer/OSGiRetailerComponentImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/wiring/ds"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Shipper.jar"/> - <property name="manifest.file.name" value="osgi/wiring/ds/Shipper.mf"/> - <property name="files.list" - value="supplychain/shipper/Shipper.class \ - osgi/wiring/ds/Shipper1.xml \ - osgi/wiring/ds/Shipper2.xml \ - supplychain/shipper/OSGiShipperComponentImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/wiring/ds"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Warehouse.jar"/> - <property name="manifest.file.name" value="osgi/wiring/ds/Warehouse.mf"/> - <property name="files.list" - value="supplychain/warehouse/Warehouse.class \ - osgi/wiring/ds/Warehouse1.xml \ - osgi/wiring/ds/Warehouse2.xml \ - supplychain/warehouse/OSGiWarehouseComponentImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/factory"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Customer.jar"/> - <property name="manifest.file.name" value="osgi/factory/Customer.mf"/> - <property name="files.list" - value="supplychain/customer/Customer.class \ - supplychain/OSGiBundleImpl.class \ - supplychain/customer/OSGiCustomerImpl.class \ - supplychain/customer/OSGiCustomerFactoryImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/factory"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Retailer.jar"/> - <property name="manifest.file.name" value="osgi/factory/Retailer.mf"/> - <property name="files.list" - value="supplychain/retailer/Retailer.class \ - supplychain/OSGiBundleImpl.class \ - supplychain/retailer/OSGiRetailerImpl.class \ - supplychain/retailer/OSGiRetailerServiceImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/factory"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Shipper.jar"/> - <property name="manifest.file.name" value="osgi/factory/Shipper.mf"/> - <property name="files.list" - value="supplychain/shipper/Shipper.class \ - supplychain/OSGiBundleImpl.class \ - supplychain/shipper/OSGiShipperImpl.class \ - supplychain/shipper/OSGiShipperServiceImpl.class \ - supplychain/shipper/OSGiShipperFactoryImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/factory/ds"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Customer.jar"/> - <property name="manifest.file.name" value="osgi/factory/ds/Customer.mf"/> - <property name="files.list" - value="supplychain/customer/Customer.class \ - osgi/factory/ds/Customer.xml \ - supplychain/customer/OSGiCustomerComponentImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/factory/ds"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Retailer.jar"/> - <property name="manifest.file.name" value="osgi/factory/ds/Retailer.mf"/> - <property name="files.list" - value="supplychain/retailer/Retailer.class \ - osgi/factory/ds/Retailer1.xml \ - osgi/factory/ds/Retailer2.xml \ - supplychain/retailer/OSGiRetailerComponentImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/factory/ds"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Shipper.jar"/> - <property name="manifest.file.name" value="osgi/factory/ds/Shipper.mf"/> - <property name="files.list" - value="supplychain/shipper/Shipper.class \ - osgi/factory/ds/Shipper1.xml \ - osgi/factory/ds/Shipper2.xml \ - supplychain/shipper/OSGiShipperComponentImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/factory/ds"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Warehouse.jar"/> - <property name="manifest.file.name" value="osgi/factory/ds/Warehouse.mf"/> - <property name="files.list" - value="supplychain/warehouse/Warehouse.class \ - osgi/factory/ds/Warehouse.xml \ - supplychain/warehouse/OSGiWarehouseComponentImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/services"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Customer.jar"/> - <property name="manifest.file.name" value="osgi/services/Customer.mf"/> - <property name="files.list" - value="supplychain/customer/Customer.class \ - supplychain/OSGiBundleImpl.class \ - supplychain/customer/OSGiCustomerImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/services"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Retailer.jar"/> - <property name="manifest.file.name" value="osgi/services/Retailer.mf"/> - <property name="files.list" - value="supplychain/retailer/Retailer.class \ - supplychain/OSGiBundleImpl.class \ - supplychain/retailer/OSGiRetailerImpl.class \ - supplychain/retailer/OSGiRetailerServiceImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/services"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Shipper.jar"/> - <property name="manifest.file.name" value="osgi/services/Shipper.mf"/> - <property name="files.list" - value="supplychain/shipper/Shipper.class \ - supplychain/OSGiBundleImpl.class \ - supplychain/shipper/OSGiShipperImpl.class \ - supplychain/shipper/OSGiShipperServiceImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/services"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Warehouse.jar"/> - <property name="manifest.file.name" value="osgi/services/Warehouse.mf"/> - <property name="files.list" - value="supplychain/warehouse/Warehouse.class \ - supplychain/OSGiBundleImpl.class \ - supplychain/warehouse/OSGiWarehouseImpl.class \ - supplychain/warehouse/OSGiWarehouseServiceImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/services/ds"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Customer.jar"/> - <property name="manifest.file.name" value="osgi/services/ds/Customer.mf"/> - <property name="files.list" - value="supplychain/customer/Customer.class \ - osgi/services/ds/Customer.xml \ - supplychain/customer/OSGiCustomerComponentImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/services/ds"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Retailer.jar"/> - <property name="manifest.file.name" value="osgi/services/ds/Retailer.mf"/> - <property name="files.list" - value="supplychain/retailer/Retailer.class \ - osgi/services/ds/Retailer1.xml \ - osgi/services/ds/Retailer2.xml \ - supplychain/retailer/OSGiRetailerComponentImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/services/ds"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Shipper.jar"/> - <property name="manifest.file.name" value="osgi/services/ds/Shipper.mf"/> - <property name="files.list" - value="supplychain/shipper/Shipper.class \ - osgi/services/ds/Shipper1.xml \ - osgi/services/ds/Shipper2.xml \ - supplychain/shipper/OSGiShipperComponentImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/services/ds"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Warehouse.jar"/> - <property name="manifest.file.name" value="osgi/services/ds/Warehouse.mf"/> - <property name="files.list" - value="supplychain/warehouse/Warehouse.class \ - osgi/services/ds/Warehouse1.xml \ - osgi/services/ds/Warehouse2.xml \ - supplychain/warehouse/OSGiWarehouseComponentImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/interfaces"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Customer.jar"/> - <property name="manifest.file.name" value="osgi/interfaces/Customer.mf"/> - <property name="files.list" - value="supplychain/customer/Customer.class \ - supplychain/OSGiBundleImpl.class \ - supplychain/customer/OSGiCustomerWithQueryImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/interfaces"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Retailer.jar"/> - <property name="manifest.file.name" value="osgi/interfaces/Retailer.mf"/> - <property name="files.list" - value="supplychain/retailer/Retailer.class \ - supplychain/retailer/RetailerQuery.class \ - supplychain/OSGiBundleImpl.class \ - supplychain/retailer/OSGiRetailerWithQueryImpl.class" /> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/interfaces"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Shipper.jar"/> - <property name="manifest.file.name" value="osgi/interfaces/Shipper.mf"/> - <property name="files.list" - value="supplychain/shipper/Shipper.class \ - supplychain/OSGiBundleImpl.class \ - supplychain/shipper/OSGiShipperImpl.class \ - supplychain/shipper/OSGiShipperServiceImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/interfaces/ds"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Customer.jar"/> - <property name="manifest.file.name" value="osgi/interfaces/ds/Customer.mf"/> - <property name="files.list" - value="supplychain/customer/Customer.class \ - osgi/interfaces/ds/Customer.xml \ - supplychain/customer/OSGiCustomerWithQueryComponentImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/interfaces/ds"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Retailer.jar"/> - <property name="manifest.file.name" value="osgi/interfaces/ds/Retailer.mf"/> - <property name="files.list" - value="supplychain/retailer/Retailer.class \ - supplychain/retailer/RetailerQuery.class \ - osgi/interfaces/ds/Retailer.xml \ - supplychain/retailer/OSGiRetailerWithQueryComponentImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/interfaces/ds"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Shipper.jar"/> - <property name="manifest.file.name" value="osgi/interfaces/ds/Shipper.mf"/> - <property name="files.list" - value="supplychain/shipper/Shipper.class \ - osgi/interfaces/ds/Shipper.xml \ - supplychain/shipper/OSGiShipperComponentImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/version"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Customer1.jar"/> - <property name="manifest.file.name" value="osgi/version/Customer1.mf"/> - <property name="files.list" - value="supplychain/customer/Customer.class \ - supplychain/OSGiBundleImpl.class \ - supplychain/customer/OSGiVersionedCustomerImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/version"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Retailer1.jar"/> - <property name="manifest.file.name" value="osgi/version/Retailer1.mf"/> - <property name="files.list" - value="supplychain/retailer/Retailer.class \ - supplychain/OSGiBundleImpl.class \ - supplychain/retailer/OSGiVersionedRetailerImpl.class \ - supplychain/retailer/OSGiVersionedRetailerServiceImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/version"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Shipper1.jar"/> - <property name="manifest.file.name" value="osgi/version/Shipper1.mf"/> - <property name="files.list" - value="supplychain/shipper/Shipper.class \ - supplychain/OSGiBundleImpl.class \ - supplychain/shipper/OSGiVersionedShipperImpl.class \ - supplychain/shipper/OSGiVersionedShipperServiceImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/version"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Warehouse1.jar"/> - <property name="manifest.file.name" value="osgi/version/Warehouse1.mf"/> - <property name="files.list" - value="supplychain/warehouse/Warehouse.class \ - supplychain/OSGiBundleImpl.class \ - supplychain/warehouse/OSGiWarehouseImpl.class \ - supplychain/warehouse/OSGiWarehouseServiceImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/version"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Customer2.jar"/> - <property name="manifest.file.name" value="osgi/version/Customer2.mf"/> - <property name="files.list" - value="supplychain/customer/Customer.class \ - supplychain/OSGiBundleImpl.class \ - supplychain/customer/OSGiVersionedCustomerImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/version"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Retailer2.jar"/> - <property name="manifest.file.name" value="osgi/version/Retailer2.mf"/> - <property name="files.list" - value="supplychain/retailer/Retailer.class \ - supplychain/OSGiBundleImpl.class \ - supplychain/retailer/OSGiVersionedRetailerImpl.class \ - supplychain/retailer/OSGiVersionedRetailerServiceImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/version"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Shipper2.jar"/> - <property name="manifest.file.name" value="osgi/version/Shipper2.mf"/> - <property name="files.list" - value="supplychain/shipper/Shipper.class \ - supplychain/OSGiBundleImpl.class \ - supplychain/shipper/OSGiVersionedShipperImpl.class \ - supplychain/shipper/OSGiVersionedShipperServiceImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/version"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Warehouse2.jar"/> - <property name="manifest.file.name" value="osgi/version/Warehouse2.mf"/> - <property name="files.list" - value="supplychain/warehouse/Warehouse.class \ - supplychain/OSGiBundleImpl.class \ - supplychain/warehouse/OSGiWarehouseImpl.class \ - supplychain/warehouse/OSGiWarehouseServiceImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/version/ds"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Customer1.jar"/> - <property name="manifest.file.name" value="osgi/version/ds/Customer1.mf"/> - <property name="files.list" - value="supplychain/customer/Customer.class \ - osgi/version/ds/CustomerV1.xml \ - supplychain/customer/OSGiCustomerComponentImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/version/ds"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Customer2.jar"/> - <property name="manifest.file.name" value="osgi/version/ds/Customer2.mf"/> - <property name="files.list" - value="supplychain/customer/Customer.class \ - osgi/version/ds/CustomerV2.xml \ - supplychain/customer/OSGiCustomerComponentImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/version/ds"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Retailer1.jar"/> - <property name="manifest.file.name" value="osgi/version/ds/Retailer1.mf"/> - <property name="files.list" - value="supplychain/retailer/Retailer.class \ - osgi/version/ds/Retailer1V1.xml \ - osgi/version/ds/Retailer2V1.xml \ - supplychain/retailer/OSGiRetailerComponentImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/version/ds"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Retailer2.jar"/> - <property name="manifest.file.name" value="osgi/version/ds/Retailer2.mf"/> - <property name="files.list" - value="supplychain/retailer/Retailer.class \ - osgi/version/ds/Retailer1V2.xml \ - osgi/version/ds/Retailer2V2.xml \ - supplychain/retailer/OSGiRetailerComponentImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/version/ds"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Shipper1.jar"/> - <property name="manifest.file.name" value="osgi/version/ds/Shipper1.mf"/> - <property name="files.list" - value="supplychain/shipper/Shipper.class \ - osgi/version/ds/Shipper1V1.xml \ - osgi/version/ds/Shipper2V1.xml \ - supplychain/shipper/OSGiShipperComponentImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/version/ds"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Shipper2.jar"/> - <property name="manifest.file.name" value="osgi/version/ds/Shipper2.mf"/> - <property name="files.list" - value="supplychain/shipper/Shipper.class \ - osgi/version/ds/Shipper1V2.xml \ - osgi/version/ds/Shipper2V2.xml \ - supplychain/shipper/OSGiShipperComponentImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/version/ds"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Warehouse1.jar"/> - <property name="manifest.file.name" value="osgi/version/ds/Warehouse1.mf"/> - <property name="files.list" - value="supplychain/warehouse/Warehouse.class \ - osgi/version/ds/Warehouse1V1.xml \ - osgi/version/ds/Warehouse2V1.xml \ - supplychain/warehouse/OSGiWarehouseComponentImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/version/ds"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Warehouse2.jar"/> - <property name="manifest.file.name" value="osgi/version/ds/Warehouse2.mf"/> - <property name="files.list" - value="supplychain/warehouse/Warehouse.class \ - osgi/version/ds/Warehouse1V2.xml \ - osgi/version/ds/Warehouse2V2.xml \ - supplychain/warehouse/OSGiWarehouseComponentImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/ws"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="HelloWorld.jar"/> - <property name="manifest.file.name" value="osgi/ws/HelloWorld.mf"/> - <property name="files.list" - value="helloworld/HelloWorld.class \ - helloworld/OSGiHelloWorldImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/passbyref"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="Greetings.jar"/> - <property name="manifest.file.name" value="osgi/passbyref/Greetings.mf"/> - <property name="files.list" - value="helloworld/Greetings.class \ - helloworld/OSGiGreetingsImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/properties"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="StockQuote.jar"/> - <property name="manifest.file.name" value="osgi/properties/StockQuote.mf"/> - <property name="files.list" - value="stockquote/StockQuote.class \ - stockquote/OSGiStockQuoteImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/properties/ds"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="StockQuote.jar"/> - <property name="manifest.file.name" value="osgi/properties/ds/StockQuote.mf"/> - <property name="files.list" - value="stockquote/StockQuote.class \ - osgi/properties/ds/StockQuote.xml \ - stockquote/OSGiStockQuoteComponentImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/properties"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="StockQuoteFactory.jar"/> - <property name="manifest.file.name" value="osgi/properties/StockQuoteFactory.mf"/> - <property name="files.list" - value="stockquote/StockQuote.class \ - stockquote/OSGiStockQuoteImpl.class \ - stockquote/OSGiStockQuoteFactoryImpl.class"/> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/properties/ds"/> - <property name="files.dir" value="target/classes"/> - <property name="jar.file.name" value="StockQuoteFactory.jar"/> - <property name="manifest.file.name" value="osgi/properties/ds/StockQuoteFactory.mf"/> - <property name="files.list" - value="stockquote/StockQuote.class \ - osgi/properties/ds/StockQuoteFactory.xml \ - stockquote/OSGiStockQuoteComponentImpl.class"/> - - </ant> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/Greetings.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/Greetings.java deleted file mode 100644 index 9285c0a8d5..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/Greetings.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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. - */ - -package helloworld; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface Greetings { - - - public String[] getGreetingsFromJava(String[] s); - - public String[] getGreetingsFromOSGi(String[] s); - - public String[] getModifiedGreetingsFromJava(String[] s); - - public String[] getModifiedGreetingsFromOSGi(String[] s); - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java deleted file mode 100644 index 16d0eae990..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 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. - */ - -package helloworld; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface HelloWorld { - - public String getGreetings(String s); - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java deleted file mode 100644 index 3d0e045225..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * 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. - */ - -package helloworld; - -import org.osoa.sca.annotations.AllowsPassByReference; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -@Service(Greetings.class) -@Scope("COMPOSITE") -public class JavaGreetingsComponent implements Greetings { - - private Greetings greetingsService; - - @Reference - public void setGreetingsService(Greetings greetingsService) { - this.greetingsService = greetingsService; - } - - - public String[] getGreetingsFromJava(String s[]) { - for (int i = 0; i < s.length; i++) { - s[i] = "Hello " + s[i] + "(From Java)"; - } - - return greetingsService.getGreetingsFromJava(s); - } - - public String[] getGreetingsFromOSGi(String s[]) { - for (int i = 0; i < s.length; i++) { - s[i] = s[i] + "(From Java)"; - } - - return s; - } - - @AllowsPassByReference - public String[] getModifiedGreetingsFromJava(String s[]) { - for (int i = 0; i < s.length; i++) { - s[i] = "Hello " + s[i] + "(From Java)"; - } - - return greetingsService.getModifiedGreetingsFromJava(s); - } - - @AllowsPassByReference - public String[] getModifiedGreetingsFromOSGi(String s[]) { - for (int i = 0; i < s.length; i++) { - s[i] = s[i] + "(From Java)"; - } - - return s; - } - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java deleted file mode 100644 index c055aee142..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * 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. - */ - -package helloworld; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; - -@Scope("COMPOSITE") -public class JavaHelloWorldComponent implements HelloWorld { - - public helloworld.ws.HelloWorld helloWorldWS; - - @Reference - public void setHelloWorldWS(helloworld.ws.HelloWorld helloWorldWS) { - this.helloWorldWS = helloWorldWS; - } - - public String getGreetings(String s) { - return helloWorldWS.getGreetings(s); - } - - - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java deleted file mode 100644 index fb0313a313..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java +++ /dev/null @@ -1,109 +0,0 @@ -/* - * 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. - */ - -package helloworld; - -import java.util.Hashtable; - -import org.osgi.framework.BundleContext; -import org.osgi.framework.InvalidSyntaxException; -import org.osgi.framework.ServiceEvent; -import org.osgi.framework.ServiceListener; -import org.osgi.framework.ServiceReference; -import org.osgi.framework.BundleActivator; - - -public class OSGiGreetingsImpl implements Greetings, ServiceListener, BundleActivator { - - private Greetings greetingsService; - - private BundleContext bundleContext; - - public String[] getGreetingsFromOSGi(String s[]) { - for (int i = 0; i < s.length; i++) { - s[i] = "Hello " + s[i] + "(From OSGi)"; - } - - return greetingsService.getGreetingsFromOSGi(s); - } - - public String[] getGreetingsFromJava(String s[]) { - for (int i = 0; i < s.length; i++) { - s[i] = s[i] + "(From OSGi)"; - } - - return s; - } - - public String[] getModifiedGreetingsFromOSGi(String s[]) { - for (int i = 0; i < s.length; i++) { - s[i] = "Hello " + s[i] + "(From OSGi)"; - } - - return greetingsService.getModifiedGreetingsFromOSGi(s); - } - - public String[] getModifiedGreetingsFromJava(String s[]) { - for (int i = 0; i < s.length; i++) { - s[i] = s[i] + "(From OSGi)"; - } - - return s; - } - - public void start(BundleContext bc) { - - System.out.println("Started OsgiGreetingsImpl bundle "); - - this.bundleContext = bc; - - Hashtable<String, Object> serviceProps = new Hashtable<String, Object>(); - serviceProps.put("component.service.name", "OSGiGreetingsComponent/Greetings"); - bundleContext.registerService("helloworld.Greetings", this, serviceProps); - - - ServiceReference ref = bundleContext.getServiceReference("helloworld.Greetings"); - if (ref != null) - greetingsService = (helloworld.Greetings)bundleContext.getService(ref); - else { - try { - String filter = "(objectclass=helloworld.Greetings)"; - this.bundleContext.addServiceListener(this, filter); - - } catch (InvalidSyntaxException e) { - e.printStackTrace(); - } - } - - } - - public void stop(BundleContext bc) { - } - - public void serviceChanged(ServiceEvent event) { - try { - if (event.getType() == ServiceEvent.REGISTERED) { - ServiceReference ref = event.getServiceReference(); - greetingsService = (helloworld.Greetings) bundleContext.getService(ref); - } - } catch (Throwable e) { - e.printStackTrace(); - } - } -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java deleted file mode 100644 index 0588da9a85..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * 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. - */ - -package helloworld; - -import java.util.Hashtable; - -import org.osgi.framework.BundleContext; -import org.osgi.framework.InvalidSyntaxException; -import org.osgi.framework.ServiceEvent; -import org.osgi.framework.ServiceListener; -import org.osgi.framework.ServiceReference; -import org.osgi.framework.BundleActivator; - - -public class OSGiHelloWorldImpl implements HelloWorld, ServiceListener, BundleActivator { - - public helloworld.ws.HelloWorld helloWorldWS; - - private BundleContext bundleContext; - - public String getGreetings(String s) { - return helloWorldWS.getGreetings(s); - } - - - public void start(BundleContext bc) { - - System.out.println("Started OsgiHelloWorldImpl bundle "); - - this.bundleContext = bc; - - Hashtable<String, Object> serviceProps = new Hashtable<String, Object>(); - serviceProps.put("component.name", "HelloWorldComponent"); - bundleContext.registerService("helloworld.HelloWorld", this, serviceProps); - - ServiceReference ref = bundleContext.getServiceReference("helloworld.ws.HelloWorld"); - if (ref != null) - helloWorldWS = (helloworld.ws.HelloWorld)bundleContext.getService(ref); - else { - try { - String filter = "(objectclass=helloworld.ws.HelloWorld)"; - this.bundleContext.addServiceListener(this, filter); - - } catch (InvalidSyntaxException e) { - e.printStackTrace(); - } - } - - } - - public void stop(BundleContext bc) { - } - - public void serviceChanged(ServiceEvent event) { - try { - if (event.getType() == ServiceEvent.REGISTERED) { - ServiceReference ref = event.getServiceReference(); - helloWorldWS = (helloworld.ws.HelloWorld) bundleContext.getService(ref); - } - } catch (Throwable e) { - e.printStackTrace(); - } - } -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java deleted file mode 100644 index 039a214856..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 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. - */ - -package helloworld.ws; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface HelloWorld { - - public String getGreetings(String s); - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java deleted file mode 100644 index 4a3cd4aed2..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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. - */ - -package helloworld.ws; - -public class HelloWorldService implements HelloWorld { - - public String getGreetings(String s) { - return "Hello " + s; - } - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java deleted file mode 100644 index a69f325526..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * 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. - */ -package stockquote; - -import java.util.Dictionary; - -import org.osgi.service.component.ComponentContext; - -/** - * Declarative Stock quote with configurable properties. - */ -public class OSGiStockQuoteComponentImpl implements StockQuote { - - public double exchangeRate; - - private String currency; - - - public double configExchangeRate; - public String configCurrency; - - public void setCurrency(String currency) { - this.currency = currency; - } - - public double getQuote(String ticker) throws Exception { - - if (exchangeRate == 2.0 && !"USD".equals(currency)) { - throw new RuntimeException("Property exchangeRate not set correctly, exchangeRate= " + - exchangeRate + " currency=" + currency); - } - if (exchangeRate == 1.48 && !"EURO".equals(currency)) { - throw new RuntimeException("Property exchangeRate not set correctly, exchangeRate= " + - exchangeRate + " currency=" + currency); - } - - if (configExchangeRate == 2.0 && !"USD".equals(configCurrency)) { - throw new RuntimeException("ConfigAdmin Property exchangeRate not set correctly, exchangeRate= " + - configExchangeRate + " currency=" + configCurrency); - } - if (configExchangeRate == 1.48 && !"EURO".equals(configCurrency)) { - throw new RuntimeException("Property configExchangeRate not set correctly, exchangeRate= " + - configExchangeRate + " currency=" + configCurrency); - } - - return 52.81 * exchangeRate; - - } - - protected void activate(ComponentContext context){ - System.out.println("Activated OSGiStockQuoteComponentImpl bundle "); - Dictionary props = context.getProperties(); - Object prop = props.get("currency"); - if (prop instanceof String[]&& ((String [])prop).length > 0) - configCurrency = ((String [])prop)[0]; - prop = props.get("exchangeRate"); - if (prop instanceof Double[]&& ((Double [])prop).length > 0) - configExchangeRate = (double)((Double [])prop)[0]; - } - - protected void deactivate(ComponentContext context){ - System.out.println("Deactivated OSGiStockQuoteComponentImpl bundle "); - } - - - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java deleted file mode 100644 index e2d25bf47d..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * 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. - */ - -package stockquote; - -import java.util.Hashtable; - -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceFactory; -import org.osgi.framework.ServiceRegistration; - -/** - * - * OSGi service factory where service has configurable properties - * Only property injection is tested. ConfigurationAdmin is not used. - * - */ -public class OSGiStockQuoteFactoryImpl implements BundleActivator, ServiceFactory { - - - private BundleContext bundleContext; - - - public void start(BundleContext bc) throws Exception { - - bundleContext = bc; - - Hashtable<String, Object> props = new Hashtable<String, Object>(); - bc.registerService(StockQuote.class.getName(), this, props); - - } - - public void stop(BundleContext bc) throws Exception { - } - - - public Object getService(Bundle bundle, ServiceRegistration registration) { - return new OSGiStockQuoteImpl(bundleContext); - } - - - public void ungetService(Bundle bundle, ServiceRegistration registration, Object service) { - - } - - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java deleted file mode 100644 index 3f91f1e922..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java +++ /dev/null @@ -1,116 +0,0 @@ -/* - * 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. - */ - -package stockquote; - -import java.util.Dictionary; -import java.util.Hashtable; - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; -import org.osgi.service.cm.Configuration; -import org.osgi.service.cm.ConfigurationAdmin; - -/** - * - * Stock quote with configurable properties. - * - */ -public class OSGiStockQuoteImpl implements StockQuote, BundleActivator { - - public String pid; - - public double exchangeRate; - - private String currency; - - private BundleContext bundleContext; - - public OSGiStockQuoteImpl() { - this.pid = "stockQuote"; - } - - protected OSGiStockQuoteImpl(BundleContext bc) { - this.bundleContext = bc; - } - - public void setCurrency(String currency) { - this.currency = currency; - } - - - private void checkProperties() throws Exception { - - if (exchangeRate == 2.0 && !"USD".equals(currency)) { - throw new RuntimeException("Property exchangeRate not set correctly, exchangeRate= " + - exchangeRate + " currency=" + currency); - } - - if (exchangeRate == 1.48 && !"EURO".equals(currency)) { - throw new RuntimeException("Property exchangeRate not set correctly, exchangeRate= " + - exchangeRate + " currency=" + currency); - } - - ServiceReference configAdminReference = bundleContext.getServiceReference("org.osgi.service.cm.ConfigurationAdmin"); - if (configAdminReference != null && pid != null ) { - - ConfigurationAdmin cm = (ConfigurationAdmin)bundleContext.getService(configAdminReference); - - Configuration config = cm.getConfiguration("stockQuote", null); - - Dictionary props = config.getProperties(); - - if (exchangeRate != (double)(Double)props.get("exchangeRate")) { - throw new Exception("Config Property exchangeRate not set correctly, expected " - + props.get("exchangeRate") + " got " + exchangeRate); - } - - if (!currency.equals(props.get("currency"))) { - throw new Exception("Config Property currency not set correctly, expected " - + props.get("currency") + " got " + currency); - } - } - - } - - public double getQuote(String ticker) throws Exception { - - checkProperties(); - - return 52.81 * exchangeRate; - - } - - public void start(BundleContext bc) throws Exception { - - bundleContext = bc; - - Hashtable<String, Object> props = new Hashtable<String, Object>(); - props.put("service.pid", "stockQuote"); - - bc.registerService(StockQuote.class.getName(), this, props); - - } - - public void stop(BundleContext bc) throws Exception { - } - - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java deleted file mode 100644 index a47f68c579..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - */ - -package stockquote; - -/** - * - * Stock Quote interface - * - */ -public interface StockQuote { - - public double getQuote(String ticker) throws Exception ; - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java deleted file mode 100644 index 25d7bcf2ff..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java +++ /dev/null @@ -1,163 +0,0 @@ -/* - * 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. - */ - -package supplychain; - - - -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Hashtable; - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceEvent; -import org.osgi.framework.ServiceListener; -import org.osgi.framework.ServiceReference; - - -/** - * This class implements the Customer service component. - */ -public class OSGiBundleImpl implements ServiceListener, BundleActivator { - - - String name; - - String[] references; - Class<?>[] referenceClasses; - Field[] referenceFields; - String[] referenceFilters; - - Class myClass; - ArrayList<String> serviceNames = new ArrayList<String>(); - ArrayList<Object> serviceObjs = new ArrayList<Object>(); - ArrayList<Hashtable<String, Object>> serviceProperties = new ArrayList<Hashtable<String, Object>>(); - - - private BundleContext bundleContext; - - public OSGiBundleImpl() {} - - public OSGiBundleImpl(String[] references, String[] filters) { - - myClass = this.getClass(); - this.name = this.getClass().getSimpleName(); - this.references = references == null?new String[0] : references; - - - try { - referenceClasses = new Class[references.length]; - referenceFields = new Field[references.length]; - referenceFilters = new String[references.length]; - for (int i = 0; i < references.length; i++) { - referenceFields[i] = this.getClass().getDeclaredField(references[i]); - referenceFields[i].setAccessible(true); - referenceClasses[i] = referenceFields[i].getType(); - - if (filters != null && filters.length > i) - referenceFilters[i] = filters[i]; - } - - } catch (Exception e) { - throw new RuntimeException(e); - } - - } - - public void start(BundleContext bc) { - - System.out.println("Started bundle " + name); - - this.bundleContext = bc; - - boolean useSingleRegisterService = serviceNames.size() > 1; - for (int i = 1; i < serviceNames.size(); i++) { - if (serviceObjs.get(i) != serviceObjs.get(0) || - serviceProperties.get(i) != serviceProperties.get(0)) { - useSingleRegisterService = false; - break; - } - } - if (useSingleRegisterService) { - bundleContext.registerService(serviceNames.toArray(new String[serviceNames.size()]), - serviceObjs.get(0), serviceProperties.get(0)); - } - else { - for (int i = 0; i < serviceNames.size(); i++) { - bundleContext.registerService(serviceNames.get(i), serviceObjs.get(i), serviceProperties.get(i)); - } - } - - started(bc); - - for (int i = 0; i < references.length; i++) { - - try { - if (referenceFields[i].get(this) != null) - continue; - - ServiceReference[] refs = bundleContext.getServiceReferences(referenceClasses[i].getName(), referenceFilters[i]); - if (refs != null && refs.length > 0) { - Object obj = bundleContext.getService(refs[0]); - referenceFields[i].set(this, referenceClasses[i].cast(obj)); - } else { - String filter = "(objectclass=" + referenceClasses[i].getName() + ")"; - this.bundleContext.addServiceListener(this, filter); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - } - - public void stop(BundleContext bc) { - System.out.println("Stop bundle " + name); - - } - - protected void started(BundleContext bc) { - - } - - public void serviceChanged(ServiceEvent event) { - try { - if (event.getType() == ServiceEvent.REGISTERED) { - - ServiceReference ref = event.getServiceReference(); - Object obj = bundleContext.getService(ref); - for (int i = 0; i < references.length; i++) { - if (referenceClasses[i].isAssignableFrom(obj.getClass())) { - referenceFields[i].set(this, referenceClasses[i].cast(obj)); - } - } - } - } catch (Throwable e) { - e.printStackTrace(); - } - } - - - public void registerService(Object serviceObject, String serviceName, Hashtable<String, Object> props) { - serviceObjs.add(serviceObject); - serviceNames.add(serviceName); - serviceProperties.add(props == null? new Hashtable<String, Object>() : props); - } -} -
\ No newline at end of file diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java deleted file mode 100644 index 2762bc62be..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * 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. - */ -package supplychain.customer; - -import org.osoa.sca.annotations.OneWay; - -/** - * This is the business interface of the Customer service component. - */ -public interface Customer { - - public void purchaseBooks(); - - public void purchaseGames(); - - public void purchaseGoods(); - - @OneWay - public void notifyShipment(String order); - - public boolean hasOutstandingOrders(); - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java deleted file mode 100644 index 80346311b1..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * 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. - */ -package supplychain.customer; - -import java.util.ArrayList; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -import supplychain.retailer.Retailer; - -/** - * This class implements the Customer service component. - */ -@Service(Customer.class) -@Scope("COMPOSITE") -public class JavaCustomerComponentImpl implements Customer { - - private Retailer retailer1; - - private Retailer retailer2; - - private Retailer retailer3; - - private static ArrayList<String> outstandingOrders = new ArrayList<String>(); - - @Reference - public void setRetailer1(Retailer retailer1) { - this.retailer1 = retailer1; - } - - @Reference - public void setRetailer2(Retailer retailer2) { - this.retailer2 = retailer2; - } - - @Reference - public void setRetailer3(Retailer retailer3) { - this.retailer3 = retailer3; - } - - public void purchaseBooks() { - System.out.println("JavaCustomerComponentImpl.purchaseBooks"); - outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (ParcelForce)"); - retailer1.submitOrder("Order"); - } - - public void purchaseGames() { - System.out.println("JavaCustomerComponentImpl.purchaseGames"); - outstandingOrders.add("Order, submitted (play.com), fulfilled, shipped (ParcelForce)"); - - retailer2.submitOrder("Order"); - } - - public void purchaseGoods() { - retailer3.submitOrder("Order"); - } - - public void notifyShipment(String order) { - outstandingOrders.remove(order); - System.out.print("Work thread " + Thread.currentThread() + " - "); - System.out.println(order); - } - - public boolean hasOutstandingOrders() { - return outstandingOrders.size() != 0; - } - - - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java deleted file mode 100644 index 9717025a4f..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * 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. - */ -package supplychain.customer; - - -import java.util.ArrayList; - -import org.osgi.service.component.ComponentContext; - - -import supplychain.retailer.Retailer; - -/** - * This class implements the Customer service component. - */ -public class OSGiCustomerComponentImpl implements Customer { - - - private Retailer retailer1; - private Retailer retailer2; - private Retailer retailer3; - - private ArrayList<String> outstandingOrders = new ArrayList<String>(); - - public OSGiCustomerComponentImpl() { - System.out.println("Created OSGiCustomerComponentImpl " + this); - } - - protected void setRetailer1(Retailer retailer1) { - this.retailer1 = retailer1; - } - - protected void unsetRetailer1(Retailer retailer1) { - this.retailer1 = null; - } - - - protected void setRetailer2(Retailer retailer2) { - this.retailer2 = retailer2; - } - - protected void unsetRetailer2(Retailer retailer2) { - this.retailer2 = null; - } - - protected void setRetailer3(Retailer retailer2) { - this.retailer3 = retailer2; - } - - protected void unsetRetailer3(Retailer retailer2) { - this.retailer3 = null; - } - - public void purchaseBooks() { - System.out.println("OSGiCustomerComponentImpl.purchaseBooks"); - outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (ParcelForce)"); - retailer1.submitOrder("Order"); - } - - public void purchaseGames() { - System.out.println("OSGiCustomerComponentImpl.purchaseGames"); - outstandingOrders.add("Order, submitted (play.com), fulfilled, shipped (ParcelForce)"); - - retailer2.submitOrder("Order"); - } - - public void purchaseGoods() { - retailer3.submitOrder("Order"); - } - - public void notifyShipment(String order) { - outstandingOrders.remove(order); - System.out.print("Work thread " + Thread.currentThread() + " - "); - System.out.println(order); - } - - protected void activate(ComponentContext context){ - System.out.println("Activated OSGiCustomerComponentImpl bundle "); - } - - protected void deactivate(ComponentContext context){ - System.out.println("Deactivated OSGiCustomerComponentImpl bundle "); - } - - public boolean hasOutstandingOrders() { - return outstandingOrders.size() != 0; - } -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java deleted file mode 100644 index c8cb522cf4..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * 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. - */ -package supplychain.customer; - - -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceFactory; -import org.osgi.framework.ServiceRegistration; - -/** - * This class implements the Customer service component. - */ -public class OSGiCustomerFactoryImpl implements BundleActivator, ServiceFactory { - - private BundleContext bundleContext; - - public OSGiCustomerFactoryImpl() { - } - - - public void start(BundleContext bc) { - - this.bundleContext = bc; - bc.registerService(Customer.class.getName(), this, null); - } - - - - - public void stop(BundleContext context) throws Exception { - - } - - - public Object getService(Bundle bundle, ServiceRegistration registration) { - - OSGiCustomerImpl customer = new OSGiCustomerImpl(false); - customer.start(bundleContext); - return customer; - - } - - public void ungetService(Bundle bundle, ServiceRegistration registration, Object obj) { - } - - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java deleted file mode 100644 index 37077bad8b..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * 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. - */ -package supplychain.customer; - - -import java.util.ArrayList; - -import supplychain.OSGiBundleImpl; -import supplychain.retailer.Retailer; - -/** - * This class implements the Customer service component. - */ -public class OSGiCustomerImpl extends OSGiBundleImpl implements Customer { - - private ArrayList<String> outstandingOrders = new ArrayList<String>(); - - private Retailer retailer1; - private Retailer retailer2; - private Retailer retailer3; - - public OSGiCustomerImpl() { - super( new String[]{"retailer1", "retailer2", "retailer3"}, - new String[]{"(retailerName=amazon.com)", - "(retailerName=play.com)", - "(retailerName=ebay.com)" - }); - registerService(this, "supplychain.customer.Customer", null); - - } - - public OSGiCustomerImpl(boolean ignore) { // Used only to test service factories - super( new String[]{"retailer1", "retailer2", "retailer3"}, - new String[]{"(retailerName=amazon.com)", - "(retailerName=play.com)", - "(retailerName=ebay.com)" - }); - - } - - public void purchaseBooks() { - System.out.println("OSGiCustomerImpl.purchaseBooks, retailer is " + retailer1); - outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (ParcelForce)"); - - retailer1.submitOrder("Order"); - - } - - public void purchaseGames() { - System.out.println("OSGiCustomerImpl.purchaseGames, retailer is " + retailer2); - outstandingOrders.add("Order, submitted (play.com), fulfilled, shipped (ParcelForce)"); - - retailer2.submitOrder("Order"); - - } - - public void purchaseGoods() { - retailer3.submitOrder("Order"); - } - - public void notifyShipment(String order) { - - outstandingOrders.remove(order); - - System.out.print("Work thread " + Thread.currentThread() + " - "); - System.out.println(order); - } - - public boolean hasOutstandingOrders() { - return outstandingOrders.size() != 0; - } - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java deleted file mode 100644 index 02862bc5f6..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * 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. - */ -package supplychain.customer; - - -import java.util.ArrayList; - -import org.osgi.service.component.ComponentContext; - - -import supplychain.retailer.Retailer; -import supplychain.retailer.RetailerQuery; - -/** - * This class implements the Customer service component. - */ -public class OSGiCustomerWithQueryComponentImpl implements Customer { - - - private Retailer retailer; - private RetailerQuery retailerQuery; - - private static ArrayList<String> outstandingOrders = new ArrayList<String>(); - - public OSGiCustomerWithQueryComponentImpl() { - System.out.println("Created OSGiCustomerWithQueryComponentImpl " + this); - } - - protected void setRetailer(Retailer retailer) { - this.retailer = retailer; - } - - protected void unsetRetailer(Retailer retailer) { - this.retailer = null; - } - - - protected void setRetailerQuery(RetailerQuery retailerQuery) { - this.retailerQuery = retailerQuery; - } - - protected void unsetRetailerQuery(RetailerQuery retailerQuery) { - this.retailerQuery = null; - } - - public void purchaseBooks() { - System.out.println("OSGiCustomerWithQueryComponentImpl.purchaseBooks"); - outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (RoyalMail)"); - - if (retailerQuery.isAvailable("Order")) - retailer.submitOrder("Order"); - } - - public void purchaseGames() { - System.out.println("OSGiCustomerWithQueryComponentImpl.purchaseGames"); - outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (RoyalMail)"); - - if (retailerQuery.isAvailable("Order")) - retailer.submitOrder("Order"); - } - - public void purchaseGoods() { - if (retailerQuery.isAvailable("Order")) - retailer.submitOrder("Order"); - } - - public void notifyShipment(String order) { - outstandingOrders.remove(order); - System.out.print("Work thread " + Thread.currentThread() + " - "); - System.out.println(order); - } - - protected void activate(ComponentContext context){ - System.out.println("Activated OSGiCustomerWithQueryComponentImpl bundle "); - } - - protected void deactivate(ComponentContext context){ - System.out.println("Deactivated OSGiCustomerWithQueryComponentImpl bundle "); - } - - public boolean hasOutstandingOrders() { - return outstandingOrders.size() != 0; - } -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java deleted file mode 100644 index 981e3c7520..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * 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. - */ -package supplychain.customer; - - -import java.util.ArrayList; - -import supplychain.OSGiBundleImpl; -import supplychain.retailer.Retailer; -import supplychain.retailer.RetailerQuery; - -/** - * This class implements the Customer service component. - */ -public class OSGiCustomerWithQueryImpl extends OSGiBundleImpl implements Customer { - - private static ArrayList<String> outstandingOrders = new ArrayList<String>(); - - private Retailer retailer; - private RetailerQuery retailerQuery; - - public OSGiCustomerWithQueryImpl() { - super( new String[]{"retailer", "retailerQuery"}, - new String[]{"(retailerName=amazon.com)", - "(retailerName=amazon.com)" - }); - registerService(this, "supplychain.customer.Customer", null); - - } - - public void purchaseBooks() { - System.out.println("OSGiCustomerWithQueryImpl.purchaseBooks"); - outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (RoyalMail)"); - - if (retailerQuery.isAvailable("Order")) - retailer.submitOrder("Order"); - - } - - public void purchaseGames() { - System.out.println("OSGiCustomerWithQueryImpl.purchaseGames"); - outstandingOrders.add("Order, submitted (amazon.com), fulfilled, shipped (RoyalMail)"); - - if (retailerQuery.isAvailable("Order")) - retailer.submitOrder("Order"); - - } - - public void purchaseGoods() { - if (retailerQuery.isAvailable("Order")) - retailer.submitOrder("Order"); - } - - public void notifyShipment(String order) { - - outstandingOrders.remove(order); - - System.out.print("Work thread " + Thread.currentThread() + " - "); - System.out.println(order); - } - - public boolean hasOutstandingOrders() { - return outstandingOrders.size() != 0; - } - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java deleted file mode 100644 index 599ab51a50..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * 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. - */ -package supplychain.customer; - - -import java.util.ArrayList; -import java.util.Hashtable; - -import org.osgi.framework.BundleContext; - -import supplychain.OSGiBundleImpl; -import supplychain.retailer.Retailer; - -/** - * This class implements the Customer service component. - */ -public class OSGiVersionedCustomerImpl extends OSGiBundleImpl implements Customer { - - private static ArrayList<String> outstandingOrders = new ArrayList<String>(); - - private Retailer retailer1; - private Retailer retailer2; - private Retailer retailer3; - private int version; - - public OSGiVersionedCustomerImpl() { - super( new String[]{"retailer1", "retailer2", "retailer3"}, - new String[]{"(retailerName=amazon.com)", - "(retailerName=play.com)", - "(retailerName=ebay.com)" - }); - - } - - protected void started(BundleContext bc) { - - String jarFile = bc.getBundle().getLocation(); - if (jarFile.endsWith("1.jar")) version = 1; - else if (jarFile.endsWith("2.jar")) version = 2; - else version = 3; - - Hashtable<String, Object> props1 = new Hashtable<String, Object>(); - props1.put("component.name", "CustomerComponent" + version); - bc.registerService("supplychain.customer.Customer", this, props1); - - } - - public void purchaseBooks() { - System.out.println("OSGiVersionedCustomerImpl.purchaseBooks , retailer is " + retailer1); - outstandingOrders.add("Order, submitted (amazon.com v" + version + - "), fulfilled, shipped (ParcelForce)"); - - retailer1.submitOrder("Order"); - - } - - public void purchaseGames() { - System.out.println("OSGiCustomerImpl.purchaseGames"); - outstandingOrders.add("Order, submitted (play.com v" + version + - "), fulfilled, shipped (ParcelForce)"); - - retailer2.submitOrder("Order"); - - } - - public void purchaseGoods() { - retailer3.submitOrder("Order"); - } - - public void notifyShipment(String order) { - - outstandingOrders.remove(order); - - System.out.print("Work thread " + Thread.currentThread() + " - "); - System.out.println(order); - } - - public boolean hasOutstandingOrders() { - return outstandingOrders.size() != 0; - } - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java deleted file mode 100644 index df52c6c760..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * 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. - */ -package supplychain.retailer; - - -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -import supplychain.warehouse.Warehouse; - -/** - * This class implements the Customer service component. - */ -@Service(Retailer.class) -@Scope("COMPOSITE") -public class JavaRetailerComponentImpl implements Retailer { - - private Warehouse warehouse; - - private String retailerName; - - public JavaRetailerComponentImpl() { - System.out.println("Created RetailerComponentImpl"); - } - - @Reference - public void setWarehouse(Warehouse warehouse) { - System.out.println("retailer setWarehouse " + warehouse); - - this.warehouse = warehouse; - } - - @Property - public void setRetailerName(String retailerName) { - this.retailerName = retailerName; - } - - - public void submitOrder(String order) { - - System.out.println("JavaRetailerComponentImpl.submitOrder " + warehouse); - warehouse.fulfillOrder(order + ", submitted (" + retailerName + ")"); - - } - - - - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java deleted file mode 100644 index d4374e4315..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * 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. - */ -package supplychain.retailer; - -import org.osgi.service.component.ComponentContext; - -import supplychain.warehouse.Warehouse; - -/** - * This class implements the Customer service component. - */ -public class OSGiRetailerComponentImpl implements Retailer { - - private Warehouse warehouse; - private String retailerName; - - - protected void setWarehouse(Warehouse warehouse) { - this.warehouse = warehouse; - } - - protected void unsetWarehouse(Warehouse warehouse) { - this.warehouse = null; - } - - public void submitOrder(String order) { - - System.out.println("OSGiRetailerComponentImpl.submitOrder , warehouse is " + warehouse); - warehouse.fulfillOrder(order + ", submitted (" + retailerName + ")"); - - } - - protected void activate(ComponentContext context){ - System.out.println("Activated OSGiRetailerComponentImpl bundle "); - - Object prop = context.getProperties().get("retailerName"); - if (prop instanceof String[]) - retailerName = ((String [])prop)[0]; - - - } - - protected void deactivate(ComponentContext context){ - System.out.println("Deactivated OSGiRetailerComponentImpl bundle "); - } - - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java deleted file mode 100644 index e71c624f49..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * 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. - */ -package supplychain.retailer; - - -import java.util.Hashtable; - -import supplychain.OSGiBundleImpl; -import supplychain.warehouse.Warehouse; - -/** - * This class implements the Retailer service component. - */ -public class OSGiRetailerImpl extends OSGiBundleImpl { - - protected Warehouse warehouse; - - public OSGiRetailerImpl() { - - super(new String[]{"warehouse"}, - new String[]{"(component.service.name=WarehouseComponent1/Warehouse)"}); - - Hashtable<String, Object> props1 = new Hashtable<String, Object>(); - props1.put("retailerName", "amazon.com"); - registerService(new OSGiRetailerServiceImpl(this, "amazon.com"), - "supplychain.retailer.Retailer", props1); - - Hashtable<String, Object> props2 = new Hashtable<String, Object>(); - props2.put("retailerName", "play.com"); - registerService( - new OSGiRetailerServiceImpl(this, "play.com"), - "supplychain.retailer.Retailer", props2); - - Hashtable<String, Object> props3 = new Hashtable<String, Object>(); - props3.put("retailerName", "ebay.com"); - registerService( - new OSGiRetailerServiceImpl(this, "ebay.com"), - "supplychain.retailer.Retailer", props3); - } - - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java deleted file mode 100644 index a036ecfc76..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * 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. - */ -package supplychain.retailer; - - -/** - * This class implements the Retailer service. - */ -public class OSGiRetailerServiceImpl implements Retailer { - - private OSGiRetailerImpl retailerImpl; - - private String retailerName; - - OSGiRetailerServiceImpl(OSGiRetailerImpl retailerImpl, String retailerName) { - this.retailerImpl = retailerImpl; - this.retailerName = retailerName; - - } - - public void submitOrder(String order) { - - System.out.println("Retailer.submitOrder, warehouse is " + retailerImpl.warehouse); - retailerImpl.warehouse.fulfillOrder(order + ", submitted (" - + retailerName + ")"); - - } - -}
\ No newline at end of file diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java deleted file mode 100644 index 278a439540..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * 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. - */ -package supplychain.retailer; - -import org.osgi.service.component.ComponentContext; - -import supplychain.warehouse.Warehouse; -import supplychain.warehouse.WarehouseQuery; - -/** - * This class implements the Customer service component. - */ -public class OSGiRetailerWithQueryComponentImpl implements Retailer, RetailerQuery { - - private Warehouse warehouse; - private WarehouseQuery warehouseQuery; - private String retailerName; - - - protected void setWarehouse(Warehouse warehouse) { - this.warehouse = warehouse; - } - - protected void unsetWarehouse(Warehouse warehouse) { - this.warehouse = null; - } - - protected void setWarehouseQuery(WarehouseQuery warehouseQuery) { - this.warehouseQuery = warehouseQuery; - } - - protected void unsetWarehouseQuery(WarehouseQuery warehouse) { - this.warehouseQuery = null; - } - - public void submitOrder(String order) { - - System.out.println("OSGiRetailerComponentImpl.submitOrder , warehouse is " + warehouse); - warehouse.fulfillOrder(order + ", submitted (" + retailerName + ")"); - - } - - public boolean isAvailable(String order) { - return warehouseQuery.isAvailable(order); - } - - protected void activate(ComponentContext context){ - System.out.println("Activated OSGiRetailerComponentImpl bundle "); - - Object prop = context.getProperties().get("retailerName"); - if (prop instanceof String[]) - retailerName = ((String [])prop)[0]; - - - } - - protected void deactivate(ComponentContext context){ - System.out.println("Deactivated OSGiRetailerComponentImpl bundle "); - } - - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java deleted file mode 100644 index ee1f575e70..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * 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. - */ -package supplychain.retailer; - - -import java.util.Hashtable; - -import supplychain.OSGiBundleImpl; -import supplychain.warehouse.Warehouse; -import supplychain.warehouse.WarehouseQuery; - -/** - * This class implements the Retailer service component with query. - */ -public class OSGiRetailerWithQueryImpl extends OSGiBundleImpl implements Retailer, RetailerQuery { - - private Warehouse warehouse; - private WarehouseQuery warehouseQuery; - - public OSGiRetailerWithQueryImpl() { - - super(new String[]{"warehouse", "warehouseQuery"}, null); - - Hashtable<String, Object> props1 = new Hashtable<String, Object>(); - props1.put("retailerName", "amazon.com"); - registerService(this, - "supplychain.retailer.Retailer", props1); - - registerService(this, - "supplychain.retailer.RetailerQuery", props1); - - } - - public void submitOrder(String order) { - - System.out.println("Retailer.submitOrder, warehouse is " + warehouse); - warehouse.fulfillOrder(order + ", submitted (" - + "amazon.com" + ")"); - - } - - public boolean isAvailable(String order) { - return warehouseQuery.isAvailable(order); - } - - - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java deleted file mode 100644 index 09e60ca626..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * 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. - */ -package supplychain.retailer; - - -import java.util.Hashtable; - -import org.osgi.framework.BundleContext; -import org.osgi.framework.InvalidSyntaxException; -import org.osgi.framework.ServiceReference; - -import supplychain.OSGiBundleImpl; -import supplychain.warehouse.Warehouse; - -/** - * This class implements the Retailer service component. - */ -public class OSGiVersionedRetailerImpl extends OSGiBundleImpl { - - protected Warehouse warehouse; - - private int version; - - public OSGiVersionedRetailerImpl() { - - super(new String[]{"warehouse"}, null); - - - } - - protected void started(BundleContext bc) { - String jarFile = bc.getBundle().getLocation(); - if (jarFile.endsWith("1.jar")) version = 1; - else if (jarFile.endsWith("2.jar")) version = 2; - else version = 3; - - Hashtable<String, Object> props1 = new Hashtable<String, Object>(); - props1.put("retailerName", "amazon.com"); - bc.registerService("supplychain.retailer.Retailer", - new OSGiVersionedRetailerServiceImpl(this, "amazon.com", version), - props1); - - Hashtable<String, Object> props2 = new Hashtable<String, Object>(); - props2.put("retailerName", "play.com"); - bc.registerService( - "supplychain.retailer.Retailer", - new OSGiVersionedRetailerServiceImpl(this, "play.com", version), - props2); - - try { - ServiceReference[] refs = bc.getServiceReferences(Warehouse.class.getName(), - "(component.service.name=WarehouseComponent" + version + "/Warehouse)"); - if (refs != null && refs.length > 0) { - warehouse = (Warehouse) bc.getService(refs[0]); - } - } catch (InvalidSyntaxException e) { - } - } -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java deleted file mode 100644 index 7dd70889c7..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * 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. - */ -package supplychain.retailer; - - -/** - * This class implements the Retailer service. - */ -public class OSGiVersionedRetailerServiceImpl implements Retailer { - - private OSGiVersionedRetailerImpl retailerImpl; - - private String retailerName; - - private int version; - - OSGiVersionedRetailerServiceImpl(OSGiVersionedRetailerImpl retailerImpl, String retailerName, int version) { - this.retailerImpl = retailerImpl; - this.retailerName = retailerName; - this.version = version; - } - - public void submitOrder(String order) { - - System.out.println("Retailer.submitOrder, warehouse is " + retailerImpl.warehouse); - retailerImpl.warehouse.fulfillOrder(order + ", submitted (" - + retailerName + " v" + version + ")"); - - } - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java deleted file mode 100644 index 1e87d59af1..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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. - */ -package supplychain.retailer; - -/** - * This is the business interface of the Retailer service component. - */ -public interface Retailer { - - public void submitOrder(String order); - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java deleted file mode 100644 index 354f40a064..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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. - */ -package supplychain.retailer; - -/** - * This is the business interface of the RetailerQuery service. - */ -public interface RetailerQuery { - - public boolean isAvailable(String order); - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java deleted file mode 100644 index d0cf43a960..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * 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. - */ -package supplychain.shipper; - - -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -import supplychain.customer.Customer; - -/** - * This class implements the Shipper service component. - */ -@Service(Shipper.class) -@Scope("COMPOSITE") -public class JavaShipperComponentImpl implements Shipper { - - private Customer customer; - - private String shipperName; - - @Reference - public void setCustomer(Customer customer) { - this.customer = customer; - } - - @Property - public void setShipperName(String shipperName) { - this.shipperName = shipperName; - } - - - - public void processShipment(String order) { - System.out.println("JavaShipperComponentImpl.processShipment"); - customer.notifyShipment(order + ", shipped (" + shipperName + ")"); - } - - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java deleted file mode 100644 index f3a98be77b..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * 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. - */ -package supplychain.shipper; - - -import org.osgi.service.component.ComponentContext; - -import supplychain.customer.Customer; - -/** - * This class implements the Shipper service component. - */ -public class OSGiShipperComponentImpl implements Shipper { - - private Customer customer; - private String shipperName; - - protected void setCustomer(Customer customer) { - this.customer = customer; - } - - protected void unsetCustomer(Customer customer) { - this.customer = null; - } - - public void processShipment(String order) { - System.out.println("OSGiShipperComponentImpl.processShipment, customer is " + customer); - customer.notifyShipment(order + ", shipped (" + shipperName + ")"); - } - - - protected void activate(ComponentContext context){ - System.out.println("Activated OSGiShipperComponentImpl bundle "); - - Object prop = context.getProperties().get("shipperName"); - if (prop instanceof String[]) - shipperName = ((String [])prop)[0]; - - } - - protected void deactivate(ComponentContext context){ - System.out.println("Deactivated OSGiShipperComponentImpl bundle "); - } - - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java deleted file mode 100644 index e2f649e4f4..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * 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. - */ -package supplychain.shipper; - - -import java.util.Hashtable; - -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceFactory; -import org.osgi.framework.ServiceRegistration; - - -/** - * This class implements the Shipper service component. - */ -public class OSGiShipperFactoryImpl implements BundleActivator, ServiceFactory { - - private BundleContext bundleContext; - - public OSGiShipperFactoryImpl() { - - } - - - public void start(BundleContext bc) { - - this.bundleContext = bc; - - Hashtable<String, Object> props1 = new Hashtable<String, Object>(); - props1.put("shipperName", "RoyalMail"); - bc.registerService(Shipper.class.getName(), this, props1); - - Hashtable<String, Object> props2 = new Hashtable<String, Object>(); - props2.put("shipperName", "ParcelForce"); - bc.registerService(Shipper.class.getName(), this, props2); - } - - - - - public void stop(BundleContext context) throws Exception { - - } - - - public Object getService(Bundle bundle, ServiceRegistration reg) { - OSGiShipperImpl shipper = new OSGiShipperImpl(false); - shipper.start(bundleContext); - OSGiShipperServiceImpl shipperService = new OSGiShipperServiceImpl(shipper, - (String)reg.getReference().getProperty("shipperName")); - return shipperService; - } - - public void ungetService(Bundle arg0, ServiceRegistration arg1, Object arg2) { - - } - - - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java deleted file mode 100644 index effae8c246..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * 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. - */ -package supplychain.shipper; - - -import java.util.Hashtable; - -import supplychain.OSGiBundleImpl; -import supplychain.customer.Customer; - -/** - * This class implements the Shipper service component. - */ -public class OSGiShipperImpl extends OSGiBundleImpl { - - protected Customer customer; - - - public OSGiShipperImpl() { - - super(new String[]{"customer"}, null); - - Hashtable<String, Object> props1 = new Hashtable<String, Object>(); - props1.put("shipperName", "RoyalMail"); - registerService(new OSGiShipperServiceImpl(this, "RoyalMail"), - "supplychain.shipper.Shipper", props1); - - Hashtable<String, Object> props2 = new Hashtable<String, Object>(); - props2.put("shipperName", "ParcelForce"); - registerService( - new OSGiShipperServiceImpl(this, "ParcelForce"), - "supplychain.shipper.Shipper", props2); - } - - // Used only by service factories - public OSGiShipperImpl(boolean ignore) { - - super(new String[]{"customer"}, null); - } - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java deleted file mode 100644 index 4effadf208..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * 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. - */ -package supplychain.shipper; - - -/** - * This class implements the Shipper service. - */ -public class OSGiShipperServiceImpl implements Shipper { - - private OSGiShipperImpl shipperImpl; - - private String shipperName; - - OSGiShipperServiceImpl(OSGiShipperImpl shipperImpl, String shipperName) { - this.shipperImpl = shipperImpl; - this.shipperName = shipperName; - } - - public void processShipment(String order) { - - System.out.println("Shipper.submitOrder, warehouse is " + shipperImpl.customer); - shipperImpl.customer.notifyShipment(order + ", shipped (" + shipperName + ")"); - - } - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java deleted file mode 100644 index 3b87f6b087..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * 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. - */ -package supplychain.shipper; - - -import java.util.Hashtable; - -import org.osgi.framework.BundleContext; -import org.osgi.framework.InvalidSyntaxException; -import org.osgi.framework.ServiceReference; - -import supplychain.OSGiBundleImpl; -import supplychain.customer.Customer; - -/** - * This class implements the Shipper service component. - */ -public class OSGiVersionedShipperImpl extends OSGiBundleImpl { - - protected Customer customer; - - private int version; - - - public OSGiVersionedShipperImpl() { - - super(new String[]{"customer"}, null); - } - - protected void started(BundleContext bc) { - - String jarFile = bc.getBundle().getLocation(); - if (jarFile.endsWith("1.jar")) version = 1; - else if (jarFile.endsWith("2.jar")) version = 2; - - - Hashtable<String, Object> props1 = new Hashtable<String, Object>(); - props1.put("shipperName", "RoyalMail"); - bc.registerService("supplychain.shipper.Shipper", - new OSGiVersionedShipperServiceImpl(this, "RoyalMail", version), - props1); - - Hashtable<String, Object> props2 = new Hashtable<String, Object>(); - props2.put("shipperName", "ParcelForce"); - bc.registerService("supplychain.shipper.Shipper", - new OSGiVersionedShipperServiceImpl(this, "ParcelForce", version), - props2); - - try { - ServiceReference[] refs = bc.getServiceReferences(Customer.class.getName(), - "(component.service.name=CustomerComponent" + version + ".CustomerService)"); - if (refs != null && refs.length > 0) { - customer = (Customer) bc.getService(refs[0]); - } - } catch (InvalidSyntaxException e) { - } - } - - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java deleted file mode 100644 index b66961b1c2..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * 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. - */ -package supplychain.shipper; - - -/** - * This class implements the Shipper service. - */ -public class OSGiVersionedShipperServiceImpl implements Shipper { - - private OSGiVersionedShipperImpl shipperImpl; - - private String shipperName; - - private int version; - - OSGiVersionedShipperServiceImpl(OSGiVersionedShipperImpl shipperImpl, String shipperName, int version) { - this.shipperImpl = shipperImpl; - this.shipperName = shipperName; - this.version = version; - } - - public void processShipment(String order) { - - System.out.println("Shipper.processShipment, version " + version + " customer is " + shipperImpl.customer); - shipperImpl.customer.notifyShipment(order + ", shipped (" + shipperName + ")"); - - } - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java deleted file mode 100644 index 2514928c10..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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. - */ -package supplychain.shipper; - -/** - * This is the business interface of the Shipper service component. - */ -public interface Shipper { - - public void processShipment(String order); - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java deleted file mode 100644 index 9edf3567e5..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * 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. - */ -package supplychain.warehouse; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -import supplychain.shipper.Shipper; - -/** - * This class implements the Warehouse service component. - */ -@Service(Warehouse.class) -@Scope("STATELESS") -public class JavaWarehouseComponentImpl implements Warehouse { - - private Shipper shipper; - - @Reference - public void setShipper(Shipper shipper) { - this.shipper = shipper; - } - - public void fulfillOrder(String order) { - System.out.println("JavaWarehouseComponentImpl.fulfillOrder : shipper is " + shipper); - - shipper.processShipment(order + ", fulfilled"); - } - - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java deleted file mode 100644 index 659f16be7f..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * 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. - */ -package supplychain.warehouse; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -import supplychain.shipper.Shipper; - -/** - * This class implements the Warehouse service component. - */ -@Service(interfaces={Warehouse.class, WarehouseQuery.class}) -@Scope("COMPOSITE") -public class JavaWarehouseWithQueryComponentImpl implements Warehouse, WarehouseQuery { - - private Shipper shipper; - - @Reference - public void setShipper(Shipper shipper) { - this.shipper = shipper; - } - - public void fulfillOrder(String order) { - System.out.println("JavaWarehouseComponentImpl.fulfillOrder : shipper is " + shipper); - - shipper.processShipment(order + ", fulfilled"); - } - - public boolean isAvailable(String order) { - return true; - } - - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java deleted file mode 100644 index dd283bf779..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * 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. - */ -package supplychain.warehouse; - - -import org.osgi.service.component.ComponentContext; - -import supplychain.shipper.Shipper; - -/** - * This class implements the Warehouse service component. - */ - -public class OSGiWarehouseComponentImpl implements Warehouse { - - private Shipper shipper; - - protected void setShipper(Shipper shipper) { - this.shipper = shipper; - } - - protected void unsetShipper(Shipper shipper) { - this.shipper = null; - } - - public void fulfillOrder(String order) { - System.out.println("OSGiWarehouseComponentImpl.fulfillOrder : shipper is " + shipper); - - shipper.processShipment(order + ", fulfilled"); - - } - - protected void activate(ComponentContext context){ - System.out.println("Activated OSGiWarehouseComponentImpl "); - } - - protected void deactivate(ComponentContext context){ - System.out.println("Deactivated OSGiWarehouseComponentImpl "); - } - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java deleted file mode 100644 index bb04ff42e0..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * 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. - */ -package supplychain.warehouse; - - -import java.util.Hashtable; - -import org.osgi.framework.BundleContext; - -import supplychain.OSGiBundleImpl; -import supplychain.shipper.Shipper; - -/** - * This class implements the Warehouse service component. - */ - -public class OSGiWarehouseImpl extends OSGiBundleImpl implements Warehouse { - - protected Shipper shipper; - private OSGiWarehouseServiceImpl warehouseService1; - private OSGiWarehouseServiceImpl warehouseService2; - - public OSGiWarehouseImpl() { - super(new String[]{"shipper"}, null); - - Hashtable<String, Object> props1 = new Hashtable<String, Object>(); - props1.put("component.name", "WarehouseComponent1"); - warehouseService1 = new OSGiWarehouseServiceImpl(this, 2); - registerService(warehouseService1, - "supplychain.warehouse.Warehouse", props1); - - Hashtable<String, Object> props2 = new Hashtable<String, Object>(); - props2.put("component.name", "WarehouseComponent2"); - warehouseService2 = new OSGiWarehouseServiceImpl(this, 1); - registerService(warehouseService2, - "supplychain.warehouse.Warehouse", props2); - } - - protected void started(BundleContext bc) { - warehouseService1.started(bc); - warehouseService2.started(bc); - } - - public void fulfillOrder(String order) { - System.out.println("OSGiWarehouseImpl.fulfillOrder : shipper is " + shipper); - - shipper.processShipment(order + ", fulfilled"); - - } - - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java deleted file mode 100644 index 3317816557..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * 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. - */ -package supplychain.warehouse; - -import org.osgi.framework.BundleContext; -import org.osgi.framework.InvalidSyntaxException; -import org.osgi.framework.ServiceReference; - -import supplychain.shipper.Shipper; - - -/** - * This class implements the Warehouse service. - */ -public class OSGiWarehouseServiceImpl implements Warehouse { - - private OSGiWarehouseImpl warehouseImpl; - private Shipper shipper; - private int shipperNum; - - - OSGiWarehouseServiceImpl(OSGiWarehouseImpl warehouseImpl, int shipperNum) { - this.warehouseImpl = warehouseImpl; - this.shipperNum = shipperNum; - } - - - protected void started(BundleContext bc) { - try { - ServiceReference[] refs = bc.getServiceReferences(Shipper.class.getName(), - "(component.service.name=ShipperComponent" + shipperNum + "/Shipper)"); - if (refs != null && refs.length > 0) { - shipper = (Shipper) bc.getService(refs[0]); - } - } catch (InvalidSyntaxException e) { - } - } - - public void fulfillOrder(String order) { - System.out.println("OSGiWarehouseImpl.fulfillOrder : shipper is " + warehouseImpl.shipper); - - shipper.processShipment(order + ", fulfilled"); - - } - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java deleted file mode 100644 index 6f1f6b8730..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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. - */ -package supplychain.warehouse; - -/** - * This is the business interface of the Warehouse service component. - */ -public interface Warehouse { - - public void fulfillOrder(String order); - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java b/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java deleted file mode 100644 index 6d1ad76796..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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. - */ -package supplychain.warehouse; - -/** - * This is the business interface of the RetailerQuery service. - */ -public interface WarehouseQuery { - - public boolean isAvailable(String order); - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/META-INF/LICENSE.txt b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/META-INF/LICENSE.txt deleted file mode 100644 index 0084319535..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/META-INF/LICENSE.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, serviceDefinition marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed 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. diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/META-INF/NOTICE b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/META-INF/NOTICE deleted file mode 100644 index d83ebbe236..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/META-INF/NOTICE +++ /dev/null @@ -1,14 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2006 The Apache Software Foundation - -Apache Tuscany is an effort undergoing incubation at The Apache Software -Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is -required of all newly accepted projects until a further review indicates that -the infrastructure, communications, and decision making process have stabilized -in a manner consistent with other successful ASF projects. While incubation -status is not necessarily a reflection of the completeness or stability of the -code, it does indicate that the project has yet to be fully endorsed by the ASF. - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/META-INF/README.txt b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/META-INF/README.txt deleted file mode 100644 index 9b26d1690a..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/META-INF/README.txt +++ /dev/null @@ -1,35 +0,0 @@ -Apache Tuscany M1 build (May, 2006) -=================================== - -http://incubator.apache.org/tuscany/ - -Tuscany is an effort undergoing incubation at the Apache Software Foundation -(ASF), sponsored by the Web Services PMC. - -Incubation is required of all newly accepted projects until a further review -indicates that the infrastructure, communications, and decision making process -have stabilized in a manner consistent with other successful ASF projects. - -While incubation status is not necessarily a reflection of the completeness or -stability of the code, it does indicate that the project has yet to be fully -endorsed by the ASF. - - -Support -------- - -Any problem with this release can be reported to the Tuscany mailing list -or in the JIRA issue tracker. - -Mailing list subscription: - tuscany-dev-subscribe@ws.apache.org - -Jira: - http://issues.apache.org/jira/browse/Tuscany - - -Thank you for using Tuscany! - - -The Tuscany Team. - diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 2d345390b7..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?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. ---> -<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://sample" - xmlns:sample="http://sample"> - <import namespace="sample:Greetings" location="file:target/passbyref/Greetings.jar" /> -</contribution>
\ No newline at end of file diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType deleted file mode 100644 index 127349eacf..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType +++ /dev/null @@ -1,30 +0,0 @@ -<?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. ---> -<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0"> - <service name="Greetings"> - <interface.java interface="helloworld.Greetings"/> - </service> - - - <reference name="greetingsService" > - <interface.java interface="helloworld.Greetings" /> - </reference> - -</componentType>
\ No newline at end of file diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType deleted file mode 100644 index 7e3810c458..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType +++ /dev/null @@ -1,31 +0,0 @@ -<?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. ---> -<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0"> - <service name="OSGiHelloWorld"> - <interface.java interface="helloworld.HelloWorld"/> - </service> - - - <reference name="helloWorldWS" > - <!-- interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" / --> - <interface.java interface="helloworld.ws.HelloWorld" /> - </reference> - -</componentType>
\ No newline at end of file diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf deleted file mode 100644 index 26f32fe617..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf +++ /dev/null @@ -1,11 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Customer
-Bundle-SymbolicName: factory.supplychain.customer.Customer
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.retailer
-Export-Package: supplychain.customer
-Bundle-Activator: supplychain.customer.OSGiCustomerFactoryImpl
-
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf deleted file mode 100644 index 1b9e0e847e..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Retailer
-Bundle-SymbolicName: factory.supplychain.retailer.Retailer
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.warehouse
-Export-Package: supplychain.retailer
-Bundle-Activator: supplychain.retailer.OSGiRetailerImpl
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf deleted file mode 100644 index 6066a38f29..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Shipper
-Bundle-SymbolicName: factory.supplychain.shipper.Shipper
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.customer
-Export-Package: supplychain.shipper
-Bundle-Activator: supplychain.shipper.OSGiShipperFactoryImpl
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf deleted file mode 100644 index 777edd3f7d..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Customer
-Bundle-SymbolicName: ds.factory.supplychain.customer.Customer
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- org.osgi.service.component, supplychain.retailer
-Export-Package: supplychain.customer
-Service-Component: osgi/factory/ds/Customer.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml deleted file mode 100644 index d8adaa2ba3..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?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. ---> -<component name="CustomerComponent" > - <implementation class="supplychain.customer.OSGiCustomerComponentImpl" /> - <service servicefactory="true" > - <provide interface="supplychain.customer.Customer" /> - </service> - <reference - name="retailer1" - interface="supplychain.retailer.Retailer" - bind="setRetailer1" - unbind="unsetRetailer1" - target="(retailerName=amazon.com)" - policy="dynamic" - /> - <reference - name="retailer2" - interface="supplychain.retailer.Retailer" - bind="setRetailer2" - unbind="unsetRetailer2" - target="(retailerName=play.com)" - policy="dynamic" - /> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf deleted file mode 100644 index e0bd9d8c10..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf +++ /dev/null @@ -1,11 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Retailer
-Bundle-SymbolicName: ds.factory.supplychain.retailer.Retailer
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- org.osgi.service.component,
- supplychain.warehouse
-Export-Package: supplychain.retailer
-Service-Component: osgi/factory/ds/Retailer1.xml, osgi/factory/ds/Retailer2.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml deleted file mode 100644 index 6005ae785c..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?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. ---> -<component name="RetailerComponent1" > - <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" /> - <service servicefactory="true"> - <provide interface="supplychain.retailer.Retailer" /> - </service> - <reference - name="supplychain.warehouse.Warehouse" - interface="supplychain.warehouse.Warehouse" - bind="setWarehouse" - unbind="unsetWarehouse" - /> - <property name="retailerName">amazon.com</property> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml deleted file mode 100644 index 6f0b79ebc2..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?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. ---> -<component name="RetailerComponent2" > - <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" /> - <service servicefactory="true"> - <provide interface="supplychain.retailer.Retailer" /> - </service> - <reference - name="supplychain.warehouse.Warehouse" - interface="supplychain.warehouse.Warehouse" - bind="setWarehouse" - unbind="unsetWarehouse" - /> - <property name="retailerName">play.com</property> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf deleted file mode 100644 index d4b461460e..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Shipper
-Bundle-SymbolicName: ds.factory.supplychain.shipper.Shipper
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- org.osgi.service.component, supplychain.customer
-Export-Package: supplychain.shipper
-Service-Component: osgi/factory/ds/Shipper1.xml, osgi/factory/ds/Shipper2.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml deleted file mode 100644 index bb15e6e3aa..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?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. ---> -<component name="ShipperComponent1" > - <implementation class="supplychain.shipper.OSGiShipperComponentImpl" /> - <service servicefactory="true"> - <provide interface="supplychain.shipper.Shipper" /> - </service> - <reference - name="customer" - interface="supplychain.customer.Customer" - bind="setCustomer" - unbind="unsetCustomer" - cardinality="0..1" - policy="dynamic" - /> - <property name="shipperName">RoyalMail</property> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml deleted file mode 100644 index 7591201b8c..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?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. ---> -<component name="ShipperComponent2"> - <implementation class="supplychain.shipper.OSGiShipperComponentImpl" /> - <service servicefactory="true"> - <provide interface="supplychain.shipper.Shipper" /> - </service> - <reference - name="customer" - interface="supplychain.customer.Customer" - bind="setCustomer" - unbind="unsetCustomer" - cardinality="0..1" - policy="dynamic" - /> - <property name="shipperName">ParcelForce</property> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf deleted file mode 100644 index 0e844fab99..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf +++ /dev/null @@ -1,11 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Warehouse
-Bundle-SymbolicName: ds.factory.supplychain.warehouse.Warehouse
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- org.osgi.service.component,
- supplychain.shipper
-Export-Package: supplychain.warehouse
-Service-Component: osgi/factory/ds/Warehouse.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml deleted file mode 100644 index fc86a76784..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?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. ---> -<component name="WarehouseComponent" immediate="true"> - <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" /> - <service> - <provide interface="supplychain.warehouse.Warehouse"/> - </service> - <reference - name="shipper" - interface="supplychain.shipper.Shipper" - bind="setShipper" - unbind="unsetShipper" - policy="dynamic" - /> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf deleted file mode 100644 index a8a87c5c8c..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf +++ /dev/null @@ -1,11 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Customer
-Bundle-SymbolicName: interfaces.supplychain.customer.Customer
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.retailer
-Export-Package: supplychain.customer
-Bundle-Activator: supplychain.customer.OSGiCustomerWithQueryImpl
-
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf deleted file mode 100644 index 05bbf4db88..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Retailer
-Bundle-SymbolicName: interfaces.supplychain.retailer.Retailer
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.warehouse
-Export-Package: supplychain.retailer
-Bundle-Activator: supplychain.retailer.OSGiRetailerWithQueryImpl
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf deleted file mode 100644 index a12d1a21ea..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Shipper
-Bundle-SymbolicName: interfaces.supplychain.shipper.Shipper
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.customer
-Export-Package: supplychain.shipper
-Bundle-Activator: supplychain.shipper.OSGiShipperImpl
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf deleted file mode 100644 index 2214db11a6..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Customer
-Bundle-SymbolicName: ds.interfaces.supplychain.customer.Customer
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- org.osgi.service.component, supplychain.retailer
-Export-Package: supplychain.customer
-Service-Component: osgi/interfaces/ds/Customer.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml deleted file mode 100644 index 236ff3f84f..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?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. ---> -<component name="CustomerComponent" immediate="true"> - <implementation class="supplychain.customer.OSGiCustomerWithQueryComponentImpl" /> - <service> - <provide interface="supplychain.customer.Customer"/> - </service> - <reference - name="retailer" - interface="supplychain.retailer.Retailer" - bind="setRetailer" - unbind="unsetRetailer" - target="(retailerName=amazon.com)" - policy="dynamic" - /> - - <reference - name="retailerQuery" - interface="supplychain.retailer.RetailerQuery" - bind="setRetailerQuery" - unbind="unsetRetailerQuery" - target="(retailerName=amazon.com)" - policy="dynamic" - /> - -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf deleted file mode 100644 index 60c0fb3fd3..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf +++ /dev/null @@ -1,11 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Retailer
-Bundle-SymbolicName: ds.interfaces.supplychain.retailer.Retailer
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- org.osgi.service.component,
- supplychain.warehouse
-Export-Package: supplychain.retailer
-Service-Component: osgi/interfaces/ds/Retailer.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml deleted file mode 100644 index ca1392d2b8..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?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. ---> -<component name="RetailerComponent" immediate="true" > - <implementation class="supplychain.retailer.OSGiRetailerWithQueryComponentImpl" /> - <service> - <provide interface="supplychain.retailer.Retailer"/> - <provide interface="supplychain.retailer.RetailerQuery"/> - </service> - <reference - name="supplychain.warehouse.Warehouse" - interface="supplychain.warehouse.Warehouse" - bind="setWarehouse" - unbind="unsetWarehouse" - /> - <reference - name="supplychain.warehouse.WarehouseQuery" - interface="supplychain.warehouse.WarehouseQuery" - bind="setWarehouseQuery" - unbind="unsetWarehouseQuery" - /> - <property name="retailerName">amazon.com</property> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf deleted file mode 100644 index 7c9f67c36d..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Shipper
-Bundle-SymbolicName: ds.interfaces.supplychain.shipper.Shipper
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- org.osgi.service.component, supplychain.customer
-Export-Package: supplychain.shipper
-Service-Component: osgi/interfaces/ds/Shipper.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml deleted file mode 100644 index 760c761666..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?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. ---> -<component name="ShipperComponent" immediate="true" > - <implementation class="supplychain.shipper.OSGiShipperComponentImpl" /> - <service> - <provide interface="supplychain.shipper.Shipper" /> - </service> - <reference - name="customer" - interface="supplychain.customer.Customer" - bind="setCustomer" - unbind="unsetCustomer" - cardinality="0..1" - policy="dynamic" - /> - <property name="shipperName">RoyalMail</property> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf deleted file mode 100644 index ebca01749a..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Greetings
-Bundle-SymbolicName: helloworld.Greetings
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework
-Export-Package: helloworld
-Bundle-Activator: helloworld.OSGiGreetingsImpl
-
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf deleted file mode 100644 index c7ff94d216..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: StockQuote
-Bundle-SymbolicName: stockquote.StockQuote
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework, org.osgi.service.cm
-Export-Package: stockquote
-Bundle-Activator: stockquote.OSGiManagedStockQuoteFactoryImpl
-
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf deleted file mode 100644 index 66f98011cb..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: StockQuote
-Bundle-SymbolicName: stockquote.StockQuote
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework, org.osgi.service.cm
-Export-Package: stockquote
-Bundle-Activator: stockquote.OSGiStockQuoteImpl
-
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf deleted file mode 100644 index 02fefbce42..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: StockQuote
-Bundle-SymbolicName: stockquote.StockQuote
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework, org.osgi.service.cm
-Export-Package: stockquote
-Bundle-Activator: stockquote.OSGiStockQuoteFactoryImpl
-
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf deleted file mode 100644 index 8b2e1717fa..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf +++ /dev/null @@ -1,11 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: StockQuote
-Bundle-SymbolicName: stockquote.StockQuote
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework, org.osgi.service.component, org.osgi.service.cm
-Export-Package: stockquote
-Service-Component: osgi/properties/ds/StockQuote.xml
-
-
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml deleted file mode 100644 index c7f13a50a7..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?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. ---> -<component name="StockQuoteComponent" immediate="true"> - <implementation class="stockquote.OSGiStockQuoteComponentImpl" /> - <service> - <provide interface="stockquote.StockQuote"/> - </service> - <property name="currency">GBP</property> - <property name="exchangeRate" type="Double">1.0</property> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf deleted file mode 100644 index 01c125ae38..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf +++ /dev/null @@ -1,11 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: StockQuote
-Bundle-SymbolicName: stockquote.StockQuote
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework, org.osgi.service.component, org.osgi.service.cm
-Export-Package: stockquote
-Service-Component: osgi/properties/ds/StockQuoteFactory.xml
-
-
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml deleted file mode 100644 index cbebf7eec2..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?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. ---> -<component name="StockQuoteComponent" > - <implementation class="stockquote.OSGiStockQuoteComponentImpl" /> - <service servicefactory="true" > - <provide interface="stockquote.StockQuote" /> - </service> - <property name="currency">GBP</property> - <property name="exchangeRate" type="Double">1.0</property> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf deleted file mode 100644 index fc762df8d5..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf +++ /dev/null @@ -1,11 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Customer
-Bundle-SymbolicName: services.supplychain.customer.Customer
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.retailer
-Export-Package: supplychain.customer
-Bundle-Activator: supplychain.customer.OSGiCustomerImpl
-
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf deleted file mode 100644 index 02e42bc010..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Retailer
-Bundle-SymbolicName: services.supplychain.retailer.Retailer
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.warehouse
-Export-Package: supplychain.retailer
-Bundle-Activator: supplychain.retailer.OSGiRetailerImpl
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf deleted file mode 100644 index 390367b99b..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Shipper
-Bundle-SymbolicName: services.supplychain.shipper.Shipper
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.customer
-Export-Package: supplychain.shipper
-Bundle-Activator: supplychain.shipper.OSGiShipperImpl
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf deleted file mode 100644 index 4715cbd976..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Warehouse
-Bundle-SymbolicName: services.supplychain.warehouse.Warehouse
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.shipper
-Export-Package: supplychain.warehouse
-Bundle-Activator: supplychain.warehouse.OSGiWarehouseImpl
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf deleted file mode 100644 index 932fb8a483..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Customer
-Bundle-SymbolicName: ds.services.supplychain.customer.Customer
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- org.osgi.service.component, supplychain.retailer
-Export-Package: supplychain.customer
-Service-Component: osgi/services/ds/Customer.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml deleted file mode 100644 index b10d0416dc..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?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. ---> -<component name="CustomerComponent" immediate="true"> - <implementation class="supplychain.customer.OSGiCustomerComponentImpl" /> - <service> - <provide interface="supplychain.customer.Customer"/> - </service> - <reference - name="retailer1" - interface="supplychain.retailer.Retailer" - bind="setRetailer1" - unbind="unsetRetailer1" - target="(retailerName=amazon.com)" - policy="dynamic" - /> - <reference - name="retailer2" - interface="supplychain.retailer.Retailer" - bind="setRetailer2" - unbind="unsetRetailer2" - target="(retailerName=play.com)" - policy="dynamic" - /> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf deleted file mode 100644 index c799f31606..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf +++ /dev/null @@ -1,11 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Retailer
-Bundle-SymbolicName: ds.services.supplychain.retailer.Retailer
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- org.osgi.service.component,
- supplychain.warehouse
-Export-Package: supplychain.retailer
-Service-Component: osgi/services/ds/Retailer1.xml, osgi/services/ds/Retailer2.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml deleted file mode 100644 index db68d7e333..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?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. ---> -<component name="RetailerComponent1" immediate="true" > - <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" /> - <service> - <provide interface="supplychain.retailer.Retailer"/> - </service> - <reference - name="supplychain.warehouse.Warehouse" - interface="supplychain.warehouse.Warehouse" - bind="setWarehouse" - unbind="unsetWarehouse" - /> - <property name="retailerName">amazon.com</property> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml deleted file mode 100644 index 1aea3cf669..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?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. ---> -<component name="RetailerComponent2" immediate="true" > - <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" /> - <service> - <provide interface="supplychain.retailer.Retailer"/> - </service> - <reference - name="supplychain.warehouse.Warehouse" - interface="supplychain.warehouse.Warehouse" - bind="setWarehouse" - unbind="unsetWarehouse" - /> - <property name="retailerName">play.com</property> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf deleted file mode 100644 index 106bd1b6aa..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Shipper
-Bundle-SymbolicName: ds.services.supplychain.shipper.Shipper
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- org.osgi.service.component, supplychain.customer
-Export-Package: supplychain.shipper
-Service-Component: osgi/services/ds/Shipper1.xml, osgi/services/ds/Shipper2.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml deleted file mode 100644 index 1e3c915a59..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?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. ---> -<component name="ShipperComponent1" immediate="true" > - <implementation class="supplychain.shipper.OSGiShipperComponentImpl" /> - <service> - <provide interface="supplychain.shipper.Shipper" /> - </service> - <reference - name="customer" - interface="supplychain.customer.Customer" - bind="setCustomer" - unbind="unsetCustomer" - cardinality="0..1" - policy="dynamic" - /> - <property name="shipperName">RoyalMail</property> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml deleted file mode 100644 index d7d0b41f5e..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?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. ---> -<component name="ShipperComponent2" immediate="true" > - <implementation class="supplychain.shipper.OSGiShipperComponentImpl" /> - <service> - <provide interface="supplychain.shipper.Shipper" /> - </service> - <reference - name="customer" - interface="supplychain.customer.Customer" - bind="setCustomer" - unbind="unsetCustomer" - cardinality="0..1" - policy="dynamic" - /> - <property name="shipperName">ParcelForce</property> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf deleted file mode 100644 index 81c51e6804..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf +++ /dev/null @@ -1,11 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Warehouse
-Bundle-SymbolicName: ds.services.supplychain.warehouse.Warehouse
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- org.osgi.service.component,
- supplychain.shipper
-Export-Package: supplychain.warehouse
-Service-Component: osgi/services/ds/Warehouse1.xml, osgi/services/ds/Warehouse2.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml deleted file mode 100644 index ca50b554df..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?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. ---> -<component name="WarehouseComponent1" immediate="true"> - <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" /> - <service> - <provide interface="supplychain.warehouse.Warehouse"/> - </service> - <reference - name="shipper" - interface="supplychain.shipper.Shipper" - bind="setShipper" - unbind="unsetShipper" - policy="dynamic" - /> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml deleted file mode 100644 index 14658127f8..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?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. ---> -<component name="WarehouseComponent2" immediate="true"> - <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" /> - <service> - <provide interface="supplychain.warehouse.Warehouse"/> - </service> - <reference - name="shipper" - interface="supplychain.shipper.Shipper" - bind="setShipper" - unbind="unsetShipper" - policy="dynamic" - /> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf deleted file mode 100644 index 335bc419c1..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf +++ /dev/null @@ -1,11 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Customer
-Bundle-SymbolicName: version.supplychain.customer.Customer
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.retailer;version="[1.0.0,2.0.0)"
-Export-Package: supplychain.customer;version="1.0.0"
-Bundle-Activator: supplychain.customer.OSGiVersionedCustomerImpl
-
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf deleted file mode 100644 index a68b9d6dbb..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf +++ /dev/null @@ -1,11 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Customer
-Bundle-SymbolicName: version.supplychain.customer.Customer
-Bundle-Version: 2.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.retailer;version="[2.0.0,3.0.0)"
-Export-Package: supplychain.customer;version="2.0.0"
-Bundle-Activator: supplychain.customer.OSGiVersionedCustomerImpl
-
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf deleted file mode 100644 index 02f79c15f3..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Retailer
-Bundle-SymbolicName: version.supplychain.retailer.Retailer
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.warehouse
-Export-Package: supplychain.retailer;version="1.0.0"
-Bundle-Activator: supplychain.retailer.OSGiVersionedRetailerImpl
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf deleted file mode 100644 index 8428b08d96..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Retailer
-Bundle-SymbolicName: version.supplychain.retailer.Retailer
-Bundle-Version: 2.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.warehouse
-Export-Package: supplychain.retailer;version="2.0.0"
-Bundle-Activator: supplychain.retailer.OSGiVersionedRetailerImpl
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf deleted file mode 100644 index 01d0320f5b..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Shipper
-Bundle-SymbolicName: version.supplychain.shipper.Shipper
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.customer
-Export-Package: supplychain.shipper;version="1.0.0"
-Bundle-Activator: supplychain.shipper.OSGiVersionedShipperImpl
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf deleted file mode 100644 index 8f311807b5..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Shipper
-Bundle-SymbolicName: version.supplychain.shipper.Shipper
-Bundle-Version: 2.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.customer
-Export-Package: supplychain.shipper;version="2.0.0"
-Bundle-Activator: supplychain.shipper.OSGiVersionedShipperImpl
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf deleted file mode 100644 index fccaad9e05..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Warehouse
-Bundle-SymbolicName: version.supplychain.warehouse.Warehouse
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.shipper
-Export-Package: supplychain.warehouse;version="1.0.0"
-Bundle-Activator: supplychain.warehouse.OSGiWarehouseImpl
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf deleted file mode 100644 index 7ebbfbe185..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Warehouse
-Bundle-SymbolicName: version.supplychain.warehouse.Warehouse
-Bundle-Version: 2.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.shipper
-Export-Package: supplychain.warehouse;version="2.0.0"
-Bundle-Activator: supplychain.warehouse.OSGiWarehouseImpl
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf deleted file mode 100644 index 6674cdd7f2..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Customer
-Bundle-SymbolicName: ds.version.supplychain.customer.Customer
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- org.osgi.service.component, supplychain.retailer;version="[1.0.0,2.0.0)"
-Export-Package: supplychain.customer;version="1.0.0"
-Service-Component: osgi/version/ds/CustomerV1.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf deleted file mode 100644 index 72df35ef41..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Customer
-Bundle-SymbolicName: ds.version.supplychain.customer.Customer
-Bundle-Version: 2.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- org.osgi.service.component, supplychain.retailer;version="[2.0.0,3.0.0)"
-Export-Package: supplychain.customer;version="2.0.0"
-Service-Component: osgi/version/ds/CustomerV2.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml deleted file mode 100644 index 724c8132df..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?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. ---> -<component name="CustomerComponent1" immediate="true"> - <implementation class="supplychain.customer.OSGiCustomerComponentImpl" /> - <service> - <provide interface="supplychain.customer.Customer"/> - </service> - <reference - name="retailer1" - interface="supplychain.retailer.Retailer" - bind="setRetailer1" - unbind="unsetRetailer1" - target="(retailerName=amazon.com)" - policy="dynamic" - /> - <reference - name="retailer2" - interface="supplychain.retailer.Retailer" - bind="setRetailer2" - unbind="unsetRetailer2" - target="(retailerName=play.com)" - policy="dynamic" - /> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml deleted file mode 100644 index 1e5035d949..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?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. ---> -<component name="CustomerComponent2" immediate="true"> - <implementation class="supplychain.customer.OSGiCustomerComponentImpl" /> - <service> - <provide interface="supplychain.customer.Customer"/> - </service> - <reference - name="retailer1" - interface="supplychain.retailer.Retailer" - bind="setRetailer1" - unbind="unsetRetailer1" - target="(retailerName=amazon.com)" - policy="dynamic" - /> - <reference - name="retailer2" - interface="supplychain.retailer.Retailer" - bind="setRetailer2" - unbind="unsetRetailer2" - target="(retailerName=play.com)" - policy="dynamic" - /> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf deleted file mode 100644 index 85bfd86422..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf +++ /dev/null @@ -1,11 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Retailer
-Bundle-SymbolicName: ds.version.supplychain.retailer.Retailer
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- org.osgi.service.component,
- supplychain.warehouse
-Export-Package: supplychain.retailer;version="1.0.0"
-Service-Component: osgi/version/ds/Retailer1V1.xml, osgi/version/ds/Retailer2V1.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml deleted file mode 100644 index 6e51b3d6f2..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?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. ---> -<component name="RetailerComponent1.Retailer1" immediate="true" > - <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" /> - <service> - <provide interface="supplychain.retailer.Retailer"/> - </service> - <reference - name="supplychain.warehouse.Warehouse" - interface="supplychain.warehouse.Warehouse" - bind="setWarehouse" - unbind="unsetWarehouse" - target="(component.service.name=WarehouseComponent1/Warehouse)" - /> - <property name="retailerName">amazon.com</property> - <property name="version">1</property> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml deleted file mode 100644 index 9a87758ec2..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?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. ---> -<component name="RetailerComponent2.Retailer1" immediate="true" > - <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" /> - <service> - <provide interface="supplychain.retailer.Retailer"/> - </service> - <reference - name="supplychain.warehouse.Warehouse" - interface="supplychain.warehouse.Warehouse" - bind="setWarehouse" - unbind="unsetWarehouse" - target="(component.service.name=WarehouseComponent2/Warehouse)" - /> - <property name="retailerName">amazon.com</property> - <property name="version">2</property> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf deleted file mode 100644 index e134bd1061..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf +++ /dev/null @@ -1,11 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Retailer
-Bundle-SymbolicName: ds.version.supplychain.retailer.Retailer
-Bundle-Version: 2.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- org.osgi.service.component,
- supplychain.warehouse
-Export-Package: supplychain.retailer;version="2.0.0"
-Service-Component: osgi/version/ds/Retailer1V2.xml, osgi/version/ds/Retailer2V2.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml deleted file mode 100644 index c19895bab1..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?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. ---> -<component name="RetailerComponent1.Retailer2" immediate="true" > - <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" /> - <service> - <provide interface="supplychain.retailer.Retailer"/> - </service> - <reference - name="supplychain.warehouse.Warehouse" - interface="supplychain.warehouse.Warehouse" - bind="setWarehouse" - unbind="unsetWarehouse" - target="(component.service.name=WarehouseComponent1/Warehouse)" - /> - <property name="retailerName">play.com</property> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml deleted file mode 100644 index 707609d2c4..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?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. ---> -<component name="RetailerComponent2.Retailer2" immediate="true" > - <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" /> - <service> - <provide interface="supplychain.retailer.Retailer"/> - </service> - <reference - name="supplychain.warehouse.Warehouse" - interface="supplychain.warehouse.Warehouse" - bind="setWarehouse" - unbind="unsetWarehouse" - target="(component.service.name=WarehouseComponent2/Warehouse)" - /> - <property name="retailerName">play.com</property> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf deleted file mode 100644 index e084e5831a..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Shipper
-Bundle-SymbolicName: ds.version.supplychain.shipper.Shipper
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- org.osgi.service.component, supplychain.customer;version="[1.0.0,2.0.0)"
-Export-Package: supplychain.shipper;version="1.0.0"
-Service-Component: osgi/version/ds/Shipper1V1.xml, osgi/version/ds/Shipper2V1.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml deleted file mode 100644 index d96f6481fb..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?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. ---> -<component name="ShipperComponent1.ShipperService1" immediate="true" > - <implementation class="supplychain.shipper.OSGiShipperComponentImpl" /> - <service> - <provide interface="supplychain.shipper.Shipper" /> - </service> - <reference - name="customer" - interface="supplychain.customer.Customer" - bind="setCustomer" - unbind="unsetCustomer" - cardinality="0..1" - policy="dynamic" - target="(component.name=CustomerComponent1)" - /> - <property name="shipperName">RoyalMail</property> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml deleted file mode 100644 index 10ef690c9b..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?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. ---> -<component name="ShipperComponent2.ShipperService1" immediate="true" > - <implementation class="supplychain.shipper.OSGiShipperComponentImpl" /> - <service> - <provide interface="supplychain.shipper.Shipper" /> - </service> - <reference - name="customer" - interface="supplychain.customer.Customer" - bind="setCustomer" - unbind="unsetCustomer" - cardinality="0..1" - policy="dynamic" - target="(component.name=CustomerComponent2)" - /> - <property name="shipperName">RoyalMail</property> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf deleted file mode 100644 index 003f9dca5a..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Shipper
-Bundle-SymbolicName: ds.version.supplychain.shipper.Shipper
-Bundle-Version: 2.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- org.osgi.service.component, supplychain.customer;version="[2.0.0,3.0.0)"
-Export-Package: supplychain.shipper;version="2.0.0"
-Service-Component: osgi/version/ds/Shipper1V2.xml, osgi/version/ds/Shipper2V2.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml deleted file mode 100644 index fefdea106d..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?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. ---> -<component name="ShipperComponent1.ShipperService2" immediate="true" > - <implementation class="supplychain.shipper.OSGiShipperComponentImpl" /> - <service> - <provide interface="supplychain.shipper.Shipper" /> - </service> - <reference - name="customer" - interface="supplychain.customer.Customer" - bind="setCustomer" - unbind="unsetCustomer" - cardinality="0..1" - policy="dynamic" - target="(component.name=CustomerComponent1)" - /> - <property name="shipperName">ParcelForce</property> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml deleted file mode 100644 index f6b847ed59..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?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. ---> -<component name="ShipperComponent2.ShipperService2" immediate="true" > - <implementation class="supplychain.shipper.OSGiShipperComponentImpl" /> - <service> - <provide interface="supplychain.shipper.Shipper" /> - </service> - <reference - name="customer" - interface="supplychain.customer.Customer" - bind="setCustomer" - unbind="unsetCustomer" - cardinality="0..1" - policy="dynamic" - target="(component.name=CustomerComponent2)" - /> - <property name="shipperName">ParcelForce</property> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf deleted file mode 100644 index 5cff2f573e..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf +++ /dev/null @@ -1,11 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Warehouse
-Bundle-SymbolicName: ds.version.supplychain.warehouse.Warehouse
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- org.osgi.service.component,
- supplychain.shipper;version="[1.0.0,2.0.0)"
-Export-Package: supplychain.warehouse;version="1.0.0"
-Service-Component: osgi/version/ds/Warehouse1V1.xml, osgi/version/ds/Warehouse2V2.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml deleted file mode 100644 index ca50b554df..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?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. ---> -<component name="WarehouseComponent1" immediate="true"> - <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" /> - <service> - <provide interface="supplychain.warehouse.Warehouse"/> - </service> - <reference - name="shipper" - interface="supplychain.shipper.Shipper" - bind="setShipper" - unbind="unsetShipper" - policy="dynamic" - /> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml deleted file mode 100644 index 14658127f8..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?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. ---> -<component name="WarehouseComponent2" immediate="true"> - <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" /> - <service> - <provide interface="supplychain.warehouse.Warehouse"/> - </service> - <reference - name="shipper" - interface="supplychain.shipper.Shipper" - bind="setShipper" - unbind="unsetShipper" - policy="dynamic" - /> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf deleted file mode 100644 index 0fec68a725..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf +++ /dev/null @@ -1,11 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Warehouse
-Bundle-SymbolicName: ds.version.supplychain.warehouse.Warehouse
-Bundle-Version: 2.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- org.osgi.service.component,
- supplychain.shipper;version="[2.0.0,3.0.0)"
-Export-Package: supplychain.warehouse;version="2.0.0"
-Service-Component: osgi/version/ds/Warehouse1V1.xml, osgi/version/ds/Warehouse2V2.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml deleted file mode 100644 index ca50b554df..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?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. ---> -<component name="WarehouseComponent1" immediate="true"> - <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" /> - <service> - <provide interface="supplychain.warehouse.Warehouse"/> - </service> - <reference - name="shipper" - interface="supplychain.shipper.Shipper" - bind="setShipper" - unbind="unsetShipper" - policy="dynamic" - /> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml deleted file mode 100644 index 14658127f8..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?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. ---> -<component name="WarehouseComponent2" immediate="true"> - <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" /> - <service> - <provide interface="supplychain.warehouse.Warehouse"/> - </service> - <reference - name="shipper" - interface="supplychain.shipper.Shipper" - bind="setShipper" - unbind="unsetShipper" - policy="dynamic" - /> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf deleted file mode 100644 index 678014d48d..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf +++ /dev/null @@ -1,11 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Customer
-Bundle-SymbolicName: wiring.supplychain.customer.Customer
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.retailer
-Export-Package: supplychain.customer
-Bundle-Activator: supplychain.customer.OSGiCustomerImpl
-
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf deleted file mode 100644 index f0090fb52b..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Retailer
-Bundle-SymbolicName: wiring.supplychain.retailer.Retailer
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.warehouse
-Export-Package: supplychain.retailer
-Bundle-Activator: supplychain.retailer.OSGiRetailerImpl
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf deleted file mode 100644 index 0b50923a05..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Shipper
-Bundle-SymbolicName: wiring.supplychain.shipper.Shipper
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.customer
-Export-Package: supplychain.shipper
-Bundle-Activator: supplychain.shipper.OSGiShipperImpl
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf deleted file mode 100644 index 1000a5f974..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Warehouse
-Bundle-SymbolicName: wiring.supplychain.warehouse.Warehouse
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.shipper
-Export-Package: supplychain.warehouse
-Bundle-Activator: supplychain.warehouse.OSGiWarehouseImpl
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf deleted file mode 100644 index 4e392a9ff1..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Customer
-Bundle-SymbolicName: ds.wiring.supplychain.customer.Customer
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- org.osgi.service.component, supplychain.retailer
-Export-Package: supplychain.customer
-Service-Component: osgi/wiring/ds/Customer.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml deleted file mode 100644 index b10d0416dc..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?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. ---> -<component name="CustomerComponent" immediate="true"> - <implementation class="supplychain.customer.OSGiCustomerComponentImpl" /> - <service> - <provide interface="supplychain.customer.Customer"/> - </service> - <reference - name="retailer1" - interface="supplychain.retailer.Retailer" - bind="setRetailer1" - unbind="unsetRetailer1" - target="(retailerName=amazon.com)" - policy="dynamic" - /> - <reference - name="retailer2" - interface="supplychain.retailer.Retailer" - bind="setRetailer2" - unbind="unsetRetailer2" - target="(retailerName=play.com)" - policy="dynamic" - /> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf deleted file mode 100644 index 788ec4f19a..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf +++ /dev/null @@ -1,11 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Retailer
-Bundle-SymbolicName: ds.wiring.supplychain.retailer.Retailer
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- org.osgi.service.component,
- supplychain.warehouse
-Export-Package: supplychain.retailer
-Service-Component: osgi/wiring/ds/Retailer1.xml, osgi/wiring/ds/Retailer2.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml deleted file mode 100644 index 1ba16d0693..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?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. ---> -<component name="RetailerComponent1" immediate="true" > - <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" /> - <service> - <provide interface="supplychain.retailer.Retailer"/> - </service> - <reference - name="supplychain.warehouse.Warehouse" - interface="supplychain.warehouse.Warehouse" - bind="setWarehouse" - unbind="unsetWarehouse" - target="(component.service.name=WarehouseComponent1/Warehouse)" - /> - <property name="retailerName">amazon.com</property> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml deleted file mode 100644 index a55ebd02a8..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?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. ---> -<component name="RetailerComponent2" immediate="true" > - <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" /> - <service> - <provide interface="supplychain.retailer.Retailer"/> - </service> - <reference - name="supplychain.warehouse.Warehouse" - interface="supplychain.warehouse.Warehouse" - bind="setWarehouse" - unbind="unsetWarehouse" - target="(component.service.name=WarehouseComponent1/Warehouse)" - /> - <property name="retailerName">play.com</property> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf deleted file mode 100644 index e7459360e6..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Shipper
-Bundle-SymbolicName: ds.wiring.supplychain.shipper.Shipper
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- org.osgi.service.component, supplychain.customer
-Export-Package: supplychain.shipper
-Service-Component: osgi/wiring/ds/Shipper1.xml, osgi/wiring/ds/Shipper2.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml deleted file mode 100644 index d518ecab62..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?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. ---> -<component name="ShipperComponent1" immediate="true" > - <implementation class="supplychain.shipper.OSGiShipperComponentImpl" /> - <service> - <provide interface="supplychain.shipper.Shipper" /> - </service> - <reference - name="customer" - interface="supplychain.customer.Customer" - bind="setCustomer" - unbind="unsetCustomer" - cardinality="0..1" - target="(component.service.name=CustomerComponent/Customer)" - policy="dynamic" - /> - <property name="shipperName">RoyalMail</property> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml deleted file mode 100644 index d7d0b41f5e..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?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. ---> -<component name="ShipperComponent2" immediate="true" > - <implementation class="supplychain.shipper.OSGiShipperComponentImpl" /> - <service> - <provide interface="supplychain.shipper.Shipper" /> - </service> - <reference - name="customer" - interface="supplychain.customer.Customer" - bind="setCustomer" - unbind="unsetCustomer" - cardinality="0..1" - policy="dynamic" - /> - <property name="shipperName">ParcelForce</property> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf deleted file mode 100644 index 880304187b..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf +++ /dev/null @@ -1,11 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Warehouse
-Bundle-SymbolicName: ds.wiring.supplychain.warehouse.Warehouse
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- org.osgi.service.component,
- supplychain.shipper
-Export-Package: supplychain.warehouse
-Service-Component: osgi/wiring/ds/Warehouse1.xml, osgi/wiring/ds/Warehouse2.xml
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml deleted file mode 100644 index ca50b554df..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?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. ---> -<component name="WarehouseComponent1" immediate="true"> - <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" /> - <service> - <provide interface="supplychain.warehouse.Warehouse"/> - </service> - <reference - name="shipper" - interface="supplychain.shipper.Shipper" - bind="setShipper" - unbind="unsetShipper" - policy="dynamic" - /> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml deleted file mode 100644 index 14658127f8..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?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. ---> -<component name="WarehouseComponent2" immediate="true"> - <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" /> - <service> - <provide interface="supplychain.warehouse.Warehouse"/> - </service> - <reference - name="shipper" - interface="supplychain.shipper.Shipper" - bind="setShipper" - unbind="unsetShipper" - policy="dynamic" - /> -</component> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf deleted file mode 100644 index d8e4c1cb7e..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf +++ /dev/null @@ -1,12 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: HelloWorld
-Bundle-SymbolicName: helloworld.HelloWorld
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- org.osgi.service.component ,
- helloworld.ws
-Export-Package: helloworld
-Bundle-Activator: helloworld.OSGiHelloWorldImpl
-
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/factory-ds-test.composite b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/factory-ds-test.composite deleted file mode 100644 index ed5b7593dc..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/factory-ds-test.composite +++ /dev/null @@ -1,136 +0,0 @@ -<?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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://supplychain"
- xmlns:sp="http://supplychain"
- name="supplychain">
-
- <component name="CustomerComponent">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Customer"
- bundleLocation="file:target/factory/ds/Customer.jar"
- scope="STATELESS" >
-
- <properties reference="retailer1">
- <property name="retailerName">amazon.com</property>
- </properties>
- <properties reference="retailer2">
- <property name="retailerName">play.com</property>
- </properties>
- <properties reference="retailer3">
- <property name="retailerName">ebay.com</property>
- </properties>
- </implementation.osgi>
-
- <reference name="retailer1" target="RetailerComponent1"/>
-
- <reference name="retailer2" target="RetailerComponent2" />
-
- <reference name="retailer3" target="RetailerComponent3" />
- </component>
-
- <component name="RetailerComponent1">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Retailer"
- bundleLocation="file:target/factory/ds/Retailer.jar" >
- <properties service="Retailer">
- <property name="retailerName">amazon.com</property>
- </properties>
- </implementation.osgi>
- <service name="Retailer"/>
-
- <reference name="warehouse" target="WarehouseComponent1"/>
- <property name="retailerName" type="xsd:string" >amazon.com</property>
- </component>
-
- <component name="RetailerComponent2">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Retailer"
- bundleLocation="file:target/factory/ds/Retailer.jar" >
- <properties service="Retailer">
- <property name="retailerName">play.com</property>
- </properties>
- </implementation.osgi>
-
- <reference name="warehouse" target="WarehouseComponent1"/>
- <property name="retailerName" type="xsd:string" >play.com</property>
- </component>
-
- <component name="RetailerComponent3">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Retailer"
- bundleLocation="file:target/factory/ds/Retailer.jar" >
- <properties service="Retailer">
- <property name="retailerName">ebay.com</property>
- </properties>
- </implementation.osgi>
-
- <reference name="warehouse" target="WarehouseComponent1"/>
- <property name="retailerName" type="xsd:string" >ebay.com</property>
- </component>
-
-
-
- <component name="WarehouseComponent1">
- <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
-
- <reference name="shipper" target="ShipperComponent2" />
- </component>
-
- <component name="WarehouseComponent2">
- <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
-
- <reference name="shipper" target="ShipperComponent1" />
- </component>
-
- <component name="ShipperComponent1">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Shipper"
- bundleLocation="file:target/factory/ds/Shipper.jar"
- scope="STATELESS">
-
- <properties service="Shipper">
- <property name="shipperName">RoyalMail</property>
- </properties>
- </implementation.osgi>
-
- <reference name="customer" target="CustomerComponent" />
- <property name="shipperName" type="xsd:string" >RoyalMail</property>
- </component>
-
- <component name="ShipperComponent2">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Shipper"
- bundleLocation="file:target/factory/ds/Shipper.jar"
- scope="STATELESS">
-
- <properties service="Shipper">
- <property name="shipperName">ParcelForce</property>
- </properties>
- </implementation.osgi>
-
- <reference name="customer" target="CustomerComponent" />
- <property name="shipperName" type="xsd:string" >ParcelForce</property>
-
- </component>
-
-
-</composite>
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/factory-test.composite b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/factory-test.composite deleted file mode 100644 index 53abe030b7..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/factory-test.composite +++ /dev/null @@ -1,121 +0,0 @@ -<?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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://supplychain"
- xmlns:sp="http://supplychain"
- name="supplychain">
-
- <component name="CustomerComponent">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Customer"
- bundleLocation="file:target/factory/Customer.jar"
- scope="STATELESS" >
-
- <properties reference="retailer1">
- <property name="retailerName">amazon.com</property>
- </properties>
- <properties reference="retailer2">
- <property name="retailerName">play.com</property>
- </properties>
- <properties reference="retailer3">
- <property name="retailerName">ebay.com</property>
- </properties>
- </implementation.osgi>
-
- <reference name="retailer1" target="RetailerComponent1"/>
-
- <reference name="retailer2" target="RetailerComponent2" />
-
- <reference name="retailer3" target="RetailerComponent3" />
- </component>
-
- <component name="RetailerComponent1">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Retailer"
- bundleLocation="file:target/factory/Retailer.jar" >
- <properties service="Retailer">
- <property name="retailerName">amazon.com</property>
- </properties>
- </implementation.osgi>
- <service name="Retailer"/>
-
- <reference name="warehouse" target="WarehouseComponent1"/>
- <property name="retailerName" type="xsd:string" >amazon.com</property>
- </component>
-
- <component name="RetailerComponent2">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Retailer"
- bundleLocation="file:target/factory/Retailer.jar" >
- <properties service="Retailer">
- <property name="retailerName">play.com</property>
- </properties>
- </implementation.osgi>
-
- <reference name="warehouse" target="WarehouseComponent1"/>
- <property name="retailerName" type="xsd:string" >play.com</property>
- </component>
-
- <component name="RetailerComponent3">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Retailer"
- bundleLocation="file:target/factory/Retailer.jar" >
- <properties service="Retailer">
- <property name="retailerName">ebay.com</property>
- </properties>
- </implementation.osgi>
-
- <reference name="warehouse" target="WarehouseComponent1"/>
- <property name="retailerName" type="xsd:string" >ebay.com</property>
- </component>
-
-
-
- <component name="WarehouseComponent1">
- <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
-
- <reference name="shipper" target="ShipperComponent1" />
- </component>
-
- <component name="WarehouseComponent2">
- <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
-
- <reference name="shipper" target="ShipperComponent1" />
- </component>
-
- <component name="ShipperComponent1">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Shipper"
- bundleLocation="file:target/factory/Shipper.jar"
- scope="STATELESS">
-
- <properties service="Shipper">
- <property name="shipperName">ParcelForce</property>
- </properties>
- </implementation.osgi>
-
- <reference name="customer" target="CustomerComponent" />
- <property name="shipperName" type="xsd:string" >ParcelForce</property>
- </component>
-
-
-
-</composite>
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/helloworld.wsdl b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/helloworld.wsdl deleted file mode 100644 index 68174d1ecd..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/helloworld.wsdl +++ /dev/null @@ -1,80 +0,0 @@ -<?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. ---> -<wsdl:definitions targetNamespace="http://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - name="helloworld"> - - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema"> - - <element name="getGreetings"> - <complexType> - <sequence> - <element name="name" type="xsd:string"/> - </sequence> - </complexType> - </element> - - <element name="getGreetingsResponse"> - <complexType> - <sequence> - <element name="getGreetingsReturn" type="xsd:string"/> - </sequence> - </complexType> - </element> - - </schema> - </wsdl:types> - - <wsdl:message name="getGreetingsRequest"> - <wsdl:part element="tns:getGreetings" name="parameters"/> - </wsdl:message> - - <wsdl:message name="getGreetingsResponse"> - <wsdl:part element="tns:getGreetingsResponse" name="parameters"/> - </wsdl:message> - - <wsdl:portType name="HelloWorld"> - <wsdl:operation name="getGreetings"> - <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/> - <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/> - </wsdl:operation> - </wsdl:portType> - - <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="getGreetings"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="getGreetingsRequest"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="getGreetingsResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - - </wsdl:binding> - - <wsdl:service name="HelloWorldService"> - <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort"> - <wsdlsoap:address location="http://localhost:8080/services/HelloWorldWebService"/> - </wsdl:port> - </wsdl:service> - -</wsdl:definitions> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/interfaces-ds-test.composite b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/interfaces-ds-test.composite deleted file mode 100644 index c3ad9e1588..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/interfaces-ds-test.composite +++ /dev/null @@ -1,60 +0,0 @@ -<?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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://supplychain"
- xmlns:sp="http://supplychain"
- name="supplychain">
-
- <component name="CustomerComponent">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.CustomerWithQuery"
- bundleLocation="file:target/interfaces/ds/Customer.jar"
- />
- <reference name="retailer" target="RetailerComponent/Retailer"/>
- <reference name="retailerQuery" target="RetailerComponent/RetailerQuery"/>
-
- </component>
-
- <component name="RetailerComponent">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.RetailerWithQuery"
- bundleLocation="file:target/interfaces/ds/Retailer.jar"
- />
- <reference name="warehouse" target="WarehouseComponent/Warehouse"/>
- <reference name="warehouseQuery" target="WarehouseComponent/WarehouseQuery"/>
- </component>
-
- <component name="WarehouseComponent">
- <implementation.java class="supplychain.warehouse.JavaWarehouseWithQueryComponentImpl" />
-
- <reference name="shipper" target="ShipperComponent" />
- </component>
-
- <component name="ShipperComponent">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Shipper"
- bundleLocation="file:target/interfaces/ds/Shipper.jar"
- />
- <reference name="customer" target="CustomerComponent" />
- </component>
-
-
-</composite>
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/interfaces-test.composite b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/interfaces-test.composite deleted file mode 100644 index 56b04f348d..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/interfaces-test.composite +++ /dev/null @@ -1,60 +0,0 @@ -<?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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://supplychain"
- xmlns:sp="http://supplychain"
- name="supplychain">
-
- <component name="CustomerComponent">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.CustomerWithQuery"
- bundleLocation="file:target/interfaces/Customer.jar"
- />
- <reference name="retailer" target="RetailerComponent/Retailer"/>
- <reference name="retailerQuery" target="RetailerComponent/RetailerQuery"/>
-
- </component>
-
- <component name="RetailerComponent">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.RetailerWithQuery"
- bundleLocation="file:target/interfaces/Retailer.jar"
- />
- <reference name="warehouse" target="WarehouseComponent/Warehouse"/>
- <reference name="warehouseQuery" target="WarehouseComponent/WarehouseQuery"/>
- </component>
-
- <component name="WarehouseComponent">
- <implementation.java class="supplychain.warehouse.JavaWarehouseWithQueryComponentImpl" />
-
- <reference name="shipper" target="ShipperComponent" />
- </component>
-
- <component name="ShipperComponent">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Shipper"
- bundleLocation="file:target/interfaces/Shipper.jar"
- />
- <reference name="customer" target="CustomerComponent" />
- </component>
-
-
-</composite>
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/passbyref-test.composite b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/passbyref-test.composite deleted file mode 100644 index 84e2c5b1cf..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/passbyref-test.composite +++ /dev/null @@ -1,41 +0,0 @@ -<?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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="HelloWorld">
-
- <component name="JavaGreetingsComponent">
- <implementation.java class="helloworld.JavaGreetingsComponent"/>
-
- <reference name="greetingsService" target="OSGiGreetingsComponent" />
- </component>
-
- <component name="OSGiGreetingsComponent">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="helloworld.Greetings"
- bundleLocation="file:target/passbyref/Greetings.jar"
- allowsPassByReference="helloworld.OSGiGreetingsImpl.getModifiedGreetingsFromJava
- helloworld.OSGiGreetingsImpl.getModifiedGreetingsFromOSGi"
- />
- <reference name="greetingsService" target="JavaGreetingsComponent" />
- </component>
-
-
-
-</composite>
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/properties-ds-test.composite b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/properties-ds-test.composite deleted file mode 100644 index e6f51208a7..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/properties-ds-test.composite +++ /dev/null @@ -1,41 +0,0 @@ -<?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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- name="StockQuoteComposite">
-
- <component name="StockQuoteComponent">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="stockquote.StockQuote"
- bundleLocation="file:target/properties/ds/StockQuote.jar"
- scope="COMPOSITE"
- injectProperties="true">
-
- <properties service="StockQuoteService">
- <property name="service.pid">stockQuote</property>
- </properties>
- </implementation.osgi>
-
- <property name="currency" type="xsd:string" >USD</property>
- <property name="exchangeRate" type="xsd:double" >2.0</property>
-
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/properties-test.composite b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/properties-test.composite deleted file mode 100644 index 2794007254..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/properties-test.composite +++ /dev/null @@ -1,41 +0,0 @@ -<?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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- name="StockQuoteComposite">
-
- <component name="StockQuoteComponent">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="stockquote.StockQuote"
- bundleLocation="file:target/properties/StockQuote.jar"
- scope="COMPOSITE"
- injectProperties="true">
-
- <properties service="StockQuoteService">
- <property name="service.pid">stockQuote</property>
- </properties>
- </implementation.osgi>
-
- <property name="currency" type="xsd:string" >USD</property>
- <property name="exchangeRate" type="xsd:double" >2.0</property>
-
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/properties2-ds-test.composite b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/properties2-ds-test.composite deleted file mode 100644 index c341446691..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/properties2-ds-test.composite +++ /dev/null @@ -1,58 +0,0 @@ -<?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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- name="StockQuoteComposite">
-
- <component name="USDStockQuoteComponent">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="stockquote.StockQuote"
- bundleLocation="file:target/properties/ds/StockQuoteFactory.jar"
- scope="COMPOSITE"
- injectProperties="true">
-
- <properties service="StockQuoteService">
- <property name="service.pid">stockQuote</property>
- </properties>
- </implementation.osgi>
-
- <property name="currency" type="xsd:string" >USD</property>
- <property name="exchangeRate" type="xsd:double" >2.0</property>
-
- </component>
-
- <component name="EUROStockQuoteComponent">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="stockquote.StockQuote"
- bundleLocation="file:target/properties/ds/StockQuoteFactory.jar"
- scope="COMPOSITE"
- injectProperties="true">
-
- <properties service="StockQuoteService">
- <property name="service.pid">stockQuote</property>
- </properties>
- </implementation.osgi>
-
- <property name="currency" type="xsd:string" >EURO</property>
- <property name="exchangeRate" type="xsd:double" >1.48</property>
-
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/properties2-test.composite b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/properties2-test.composite deleted file mode 100644 index 67b5c294ae..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/properties2-test.composite +++ /dev/null @@ -1,52 +0,0 @@ -<?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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- name="StockQuoteComposite">
-
- <component name="USDStockQuoteComponent">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="stockquote.StockQuote"
- bundleLocation="file:target/properties/StockQuoteFactory.jar"
- scope="COMPOSITE"
- injectProperties="true">
-
- </implementation.osgi>
-
- <property name="currency" type="xsd:string" >USD</property>
- <property name="exchangeRate" type="xsd:double" >2.0</property>
-
- </component>
-
- <component name="EUROStockQuoteComponent">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="stockquote.StockQuote"
- bundleLocation="file:target/properties/StockQuoteFactory.jar"
- scope="COMPOSITE"
- injectProperties="true">
-
- </implementation.osgi>
-
- <property name="currency" type="xsd:string" >EURO</property>
- <property name="exchangeRate" type="xsd:double" >1.48</property>
-
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/services-ds-test.composite b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/services-ds-test.composite deleted file mode 100644 index db743296a0..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/services-ds-test.composite +++ /dev/null @@ -1,93 +0,0 @@ -<?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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://supplychain"
- xmlns:sp="http://supplychain"
- name="supplychain">
-
- <component name="CustomerComponent">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.CustomerServices"
- bundleLocation="file:target/services/ds/Customer.jar" >
-
- <properties reference="retailer1">
- <property name="retailerName">amazon.com</property>
- </properties>
- <properties reference="retailer2">
- <property name="retailerName">play.com</property>
- </properties>
- <properties reference="retailer3">
- <property name="retailerName">ebay.com</property>
- </properties>
-
- </implementation.osgi>
-
- <reference name="retailer1" target="RetailerComponent/RetailerService1"/>
-
- <reference name="retailer2" target="RetailerComponent/RetailerService2" />
-
- <reference name="retailer3" target="RetailerComponent/RetailerService3" />
- </component>
-
- <component name="RetailerComponent">
- <!-- implementation.java class="supplychain.retailer.JavaRetailerComponentImpl" -->
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.RetailerServices"
- bundleLocation="file:target/services/ds/Retailer.jar" >
- <properties service="RetailerService1">
- <property name="retailerName">amazon.com</property>
- </properties>
- <properties service="RetailerService2">
- <property name="retailerName">play.com</property>
- </properties>
- <properties service="RetailerService3">
- <property name="retailerName">ebay.com</property>
- </properties>
- </implementation.osgi>
-
- <reference name="warehouse" target="WarehouseComponent1"/>
- </component>
-
- <component name="WarehouseComponent1">
- <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
-
- <reference name="shipper" target="ShipperComponent/ShipperService2" />
- </component>
-
-
- <component name="ShipperComponent">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.ShipperServices"
- bundleLocation="file:target/services/ds/Shipper.jar" >
-
- <properties service="ShipperService1">
- <property name="shipperName">RoyalMail</property>
- </properties>
- <properties service="ShipperService2">
- <property name="shipperName">ParcelForce</property>
- </properties>
- </implementation.osgi>
- <reference name="customer" target="CustomerComponent" />
-
- </component>
-
-
-</composite>
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/services-test.composite b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/services-test.composite deleted file mode 100644 index 35bb9834d6..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/services-test.composite +++ /dev/null @@ -1,92 +0,0 @@ -<?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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://supplychain"
- xmlns:sp="http://supplychain"
- name="supplychain">
-
- <component name="CustomerComponent">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.CustomerServices"
- bundleLocation="file:target/services/Customer.jar" >
-
- <properties reference="retailer1">
- <property name="retailerName">amazon.com</property>
- </properties>
- <properties reference="retailer2">
- <property name="retailerName">play.com</property>
- </properties>
- <properties reference="retailer3">
- <property name="retailerName">ebay.com</property>
- </properties>
-
- </implementation.osgi>
-
- <reference name="retailer1" target="RetailerComponent/RetailerService1"/>
-
- <reference name="retailer2" target="RetailerComponent/RetailerService2" />
-
- <reference name="retailer3" target="RetailerComponent/RetailerService3" />
- </component>
-
- <component name="RetailerComponent">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.RetailerServices"
- bundleLocation="file:target/services/Retailer.jar" >
- <properties service="RetailerService1">
- <property name="retailerName">amazon.com</property>
- </properties>
- <properties service="RetailerService2">
- <property name="retailerName">play.com</property>
- </properties>
- <properties service="RetailerService3">
- <property name="retailerName">ebay.com</property>
- </properties>
- </implementation.osgi>
-
- <reference name="warehouse" target="WarehouseComponent1"/>
- </component>
-
- <component name="WarehouseComponent1">
- <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
-
- <reference name="shipper" target="ShipperComponent/ShipperService2" />
- </component>
-
-
- <component name="ShipperComponent">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.ShipperServices"
- bundleLocation="file:target/services/Shipper.jar" >
-
- <properties service="ShipperService1">
- <property name="shipperName">RoyalMail</property>
- </properties>
- <properties service="ShipperService2">
- <property name="shipperName">ParcelForce</property>
- </properties>
- </implementation.osgi>
- <reference name="customer" target="CustomerComponent" />
-
- </component>
-
-
-</composite>
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/version-ds-test.composite b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/version-ds-test.composite deleted file mode 100644 index 66d3a6474d..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/version-ds-test.composite +++ /dev/null @@ -1,160 +0,0 @@ -<?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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://supplychain"
- xmlns:sp="http://supplychain"
- name="supplychain">
-
- <component name="CustomerComponent1">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.CustomerServices"
- bundleLocation="file:target/version/ds/Customer1.jar" >
-
- <properties service="CustomerService">
- <property name="component.name">CustomerComponent1</property>
- </properties>
-
- </implementation.osgi>
-
- <reference name="retailer1" target="RetailerComponent1/RetailerService1"/>
-
- <reference name="retailer2" target="RetailerComponent1/RetailerService2" />
-
- <reference name="retailer3" target="RetailerComponent1/RetailerService3" />
- </component>
-
-
-
- <component name="CustomerComponent2">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.CustomerServices"
- bundleLocation="file:target/version/ds/Customer2.jar" >
-
- <properties service="CustomerService">
- <property name="component.name">CustomerComponent2</property>
- </properties>
-
- </implementation.osgi>
-
- <reference name="retailer1" target="RetailerComponent2/RetailerService1"/>
-
- <reference name="retailer2" target="RetailerComponent2/RetailerService2" />
-
- <reference name="retailer3" target="RetailerComponent2/RetailerService3" />
- </component>
-
- <component name="RetailerComponent1">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.RetailerServices"
- bundleLocation="file:target/version/ds/Retailer1.jar" >
- <properties service="RetailerService1">
- <property name="retailerName">amazon.com</property>
- </properties>
- <properties service="RetailerService2">
- <property name="retailerName">play.com</property>
- </properties>
- <properties service="RetailerService3">
- <property name="retailerName">ebay.com</property>
- </properties>
- <properties reference="warehouse">
- <property name="component.service.name">WarehouseComponent1/Warehouse</property>
- </properties>
- </implementation.osgi>
-
- <reference name="warehouse" target="WarehouseComponent1"/>
- </component>
-
- <component name="RetailerComponent2">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.RetailerServices"
- bundleLocation="file:target/version/ds/Retailer2.jar" >
- <properties service="RetailerService1">
- <property name="retailerName">amazon.com</property>
- </properties>
- <properties service="RetailerService2">
- <property name="retailerName">play.com</property>
- </properties>
- <properties service="RetailerService3">
- <property name="retailerName">ebay.com</property>
- </properties>
- <properties reference="warehouse">
- <property name="component.service.name">WarehouseComponent2/Warehouse</property>
- </properties>
- </implementation.osgi>
-
- <reference name="warehouse" target="WarehouseComponent2"/>
- </component>
-
-
- <component name="WarehouseComponent1">
- <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
-
- <reference name="shipper" target="ShipperComponent1/ShipperService2" />
- </component>
-
- <component name="WarehouseComponent2">
- <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
-
- <reference name="shipper" target="ShipperComponent2/ShipperService2" />
- </component>
-
- <component name="ShipperComponent1">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.ShipperServices"
- bundleLocation="file:target/version/ds/Shipper1.jar">
-
- <properties service="ShipperService1">
- <property name="shipperName">RoyalMail</property>
- </properties>
- <properties service="ShipperService2">
- <property name="shipperName">ParcelForce</property>
- </properties>
- <properties reference="customer">
- <property name="component.name">CustomerComponent1</property>
- </properties>
- </implementation.osgi>
-
- <reference name="customer" target="CustomerComponent1" />
- </component>
-
- <component name="ShipperComponent2">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.ShipperServices"
- bundleLocation="file:target/version/ds/Shipper2.jar">
-
- <properties service="ShipperService1">
- <property name="shipperName">RoyalMail</property>
- </properties>
- <properties service="ShipperService2">
- <property name="shipperName">ParcelForce</property>
- </properties>
- <properties reference="customer">
- <property name="component.name">CustomerComponent2</property>
- </properties>
- </implementation.osgi>
-
- <reference name="customer" target="CustomerComponent2" />
-
- </component>
-
-
-
-</composite>
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/version-test.composite b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/version-test.composite deleted file mode 100644 index d3d1551c73..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/version-test.composite +++ /dev/null @@ -1,150 +0,0 @@ -<?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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://supplychain"
- xmlns:sp="http://supplychain"
- name="supplychain">
-
- <component name="CustomerComponent1">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.CustomerServices"
- bundleLocation="file:target/version/Customer1.jar" >
-
- </implementation.osgi>
-
- <reference name="retailer1" target="RetailerComponent1/RetailerService1"/>
-
- <reference name="retailer2" target="RetailerComponent1/RetailerService2" />
-
- <reference name="retailer3" target="RetailerComponent1/RetailerService3" />
- </component>
-
-
-
- <component name="CustomerComponent2">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.CustomerServices"
- bundleLocation="file:target/version/Customer2.jar" >
-
- </implementation.osgi>
-
- <reference name="retailer1" target="RetailerComponent2/RetailerService1"/>
-
- <reference name="retailer2" target="RetailerComponent2/RetailerService2" />
-
- <reference name="retailer3" target="RetailerComponent2/RetailerService3" />
- </component>
-
- <component name="RetailerComponent1">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.RetailerServices"
- bundleLocation="file:target/version/Retailer1.jar" >
- <properties service="RetailerService1">
- <property name="retailerName">amazon.com</property>
- </properties>
- <properties service="RetailerService2">
- <property name="retailerName">play.com</property>
- </properties>
- <properties service="RetailerService3">
- <property name="retailerName">ebay.com</property>
- </properties>
-
- </implementation.osgi>
-
- <reference name="warehouse" target="WarehouseComponent1"/>
- </component>
-
- <component name="RetailerComponent2">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.RetailerServices"
- bundleLocation="file:target/version/Retailer2.jar" >
- <properties service="RetailerService1">
- <property name="retailerName">amazon.com</property>
- </properties>
- <properties service="RetailerService2">
- <property name="retailerName">play.com</property>
- </properties>
- <properties service="RetailerService3">
- <property name="retailerName">ebay.com</property>
- </properties>
- <properties reference="warehouse">
- <property name="component.service.name">WarehouseComponent2/Warehouse</property>
- </properties>
- </implementation.osgi>
-
- <reference name="warehouse" target="WarehouseComponent2"/>
- </component>
-
-
- <component name="WarehouseComponent1">
- <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
-
- <reference name="shipper" target="ShipperComponent1/ShipperService2" />
- </component>
-
- <component name="WarehouseComponent2">
- <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
-
- <reference name="shipper" target="ShipperComponent2/ShipperService2" />
- </component>
-
- <component name="ShipperComponent1">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.ShipperServices"
- bundleLocation="file:target/version/Shipper1.jar">
-
- <properties service="ShipperService1">
- <property name="shipperName">RoyalMail</property>
- </properties>
- <properties service="ShipperService2">
- <property name="shipperName">ParcelForce</property>
- </properties>
- <properties reference="customer">
- <property name="component.service.name">CustomerComponent1/CustomerService</property>
- </properties>
- </implementation.osgi>
-
- <reference name="customer" target="CustomerComponent1" />
- </component>
-
- <component name="ShipperComponent2">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.ShipperServices"
- bundleLocation="file:target/version/Shipper2.jar">
-
- <properties service="ShipperService1">
- <property name="shipperName">RoyalMail</property>
- </properties>
- <properties service="ShipperService2">
- <property name="shipperName">ParcelForce</property>
- </properties>
- <properties reference="customer">
- <property name="component.service.name">CustomerComponent2/CustomerService</property>
- </properties>
- </implementation.osgi>
-
- <reference name="customer" target="CustomerComponent2" />
-
- </component>
-
-
-
-</composite>
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/wiring-ds-test1.composite b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/wiring-ds-test1.composite deleted file mode 100644 index 24f8c8f6fc..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/wiring-ds-test1.composite +++ /dev/null @@ -1,142 +0,0 @@ -<?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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://supplychain"
- xmlns:sp="http://supplychain"
- name="supplychain">
-
- <component name="CustomerComponent">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Customer"
- bundleLocation="file:target/wiring/ds/Customer.jar" >
-
- <properties reference="retailer1">
- <property name="retailerName">amazon.com</property>
- </properties>
- <properties reference="retailer2">
- <property name="retailerName">play.com</property>
- </properties>
- <properties reference="retailer3">
- <property name="retailerName">ebay.com</property>
- </properties>
- </implementation.osgi>
-
- <reference name="retailer1" target="RetailerComponent1/Retailer" />
-
- <reference name="retailer2" target="RetailerComponent2/Retailer" />
-
- <reference name="retailer3" target="RetailerComponent3" />
- </component>
-
- <component name="RetailerComponent1">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Retailer"
- bundleLocation="file:target/wiring/ds/Retailer.jar" >
- <properties service="Retailer">
- <property name="retailerName">amazon.com</property>
- </properties>
- <properties reference="warehouse">
- <property name="component.name">WarehouseComponent1</property>
- </properties>
- </implementation.osgi>
- <service name="Retailer"/>
-
- <reference name="warehouse" target="WarehouseComponent1"/>
- <property name="retailerName" type="xsd:string" >amazon.com</property>
- </component>
-
- <component name="RetailerComponent2">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Retailer"
- bundleLocation="file:target/wiring/ds/Retailer.jar" >
- <properties service="Retailer">
- <property name="retailerName">play.com</property>
- </properties>
- <properties reference="warehouse">
- <property name="component.name">WarehouseComponent1</property>
- </properties>
- </implementation.osgi>
-
- <reference name="warehouse" target="WarehouseComponent1"/>
- <property name="retailerName" type="xsd:string" >play.com</property>
- </component>
-
-
- <component name="RetailerComponent3">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Retailer"
- bundleLocation="file:target/wiring/ds/Retailer.jar" >
- <properties service="Retailer">
- <property name="retailerName">ebay.com</property>
- </properties>
- <properties reference="warehouse">
- <property name="component.name">WarehouseComponent2</property>
- </properties>
- </implementation.osgi>
-
- <reference name="warehouse" target="WarehouseComponent2"/>
- <property name="retailerName" type="xsd:string" >play.com</property>
- </component>
-
-
- <component name="WarehouseComponent1">
- <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
-
- <reference name="shipper" target="ShipperComponent2" />
- </component>
-
- <component name="WarehouseComponent2">
- <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
-
- <reference name="shipper" target="ShipperComponent1" />
- </component>
-
- <component name="ShipperComponent1">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Shipper"
- bundleLocation="file:target/wiring/ds/Shipper.jar" >
-
- <properties service="Shipper">
- <property name="component.name">ShipperComponent1</property>
- <property name="shipperName">RoyalMail</property>
- </properties>
- </implementation.osgi>
- <reference name="customer" target="CustomerComponent" />
- <property name="shipperName" type="xsd:string" >RoyalMail</property>
- </component>
-
- <component name="ShipperComponent2">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Shipper"
- bundleLocation="file:target/wiring/ds/Shipper.jar" >
-
- <properties service="Shipper">
- <property name="component.name">ShipperComponent2</property>
- <property name="shipperName">ParcelForce</property>
- </properties>
- </implementation.osgi>
- <reference name="customer" target="CustomerComponent" />
- <property name="shipperName" type="xsd:string" >ParcelForce</property>
-
- </component>
-
-
-</composite>
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/wiring-ds-test2.composite b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/wiring-ds-test2.composite deleted file mode 100644 index 95be8374cd..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/wiring-ds-test2.composite +++ /dev/null @@ -1,159 +0,0 @@ -<?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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://supplychain"
- xmlns:sp="http://supplychain"
- name="supplychain">
-
- <component name="CustomerComponent">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Customer"
- bundleLocation="file:target/wiring/ds/Customer.jar" >
-
- <properties reference="retailer1">
- <property name="retailerName">amazon.com</property>
- </properties>
- <properties reference="retailer2">
- <property name="retailerName">play.com</property>
- </properties>
- <properties reference="retailer3">
- <property name="retailerName">ebay.com</property>
- </properties>
- </implementation.osgi>
-
- <reference name="retailer1" target="RetailerComponent1/Retailer" />
-
- <reference name="retailer2" target="RetailerComponent2/Retailer" />
-
- <reference name="retailer3" target="RetailerComponent3/Retailer" />
- </component>
-
- <component name="RetailerComponent1">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Retailer"
- bundleLocation="file:target/wiring/ds/Retailer.jar" >
- <properties service="Retailer">
- <property name="retailerName">amazon.com</property>
- </properties>
- <properties reference="warehouse">
- <property name="component.name">WarehouseComponent1</property>
- </properties>
- </implementation.osgi>
- <service name="Retailer"/>
-
- <reference name="warehouse" target="WarehouseComponent1"/>
- <property name="retailerName" type="xsd:string" >amazon.com</property>
- </component>
-
- <component name="RetailerComponent2">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Retailer"
- bundleLocation="file:target/wiring/ds/Retailer.jar" >
-
- <properties service="Retailer">
- <property name="retailerName">play.com</property>
- </properties>
-
- <properties reference="warehouse">
- <property name="component.name">WarehouseComponent1</property>
- </properties>
- </implementation.osgi>
- <reference name="warehouse" target="WarehouseComponent1"/>
- <property name="retailerName" type="xsd:string" >play.com</property>
- </component>
-
- <component name="RetailerComponent3">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Retailer"
- bundleLocation="file:target/wiring/ds/Retailer.jar" >
-
- <properties service="Retailer">
- <property name="retailerName">ebay.com</property>
- </properties>
- <properties reference="warehouse">
- <property name="component.name">WarehouseComponent1</property>
- </properties>
- </implementation.osgi>
- <reference name="warehouse" target="WarehouseComponent1"/>
- <property name="retailerName" type="xsd:string" >ebay.com</property>
- </component>
-
- <component name="WarehouseComponent1">
-
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Warehouse"
- bundleLocation="file:target/wiring/ds/Warehouse.jar" >
-
- <properties reference="shipper">
- <property name="shipperName">ParcelForce</property>
- </properties>
- </implementation.osgi>
-
- <reference name="shipper" target="ShipperComponent2" />
- </component>
-
-
- <component name="WarehouseComponent2">
-
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Warehouse"
- bundleLocation="file:target/wiring/ds/Warehouse.jar" >
-
- <properties reference="shipper">
- <property name="shipperName">RoyalMail</property>
- </properties>
- </implementation.osgi>
-
- <reference name="shipper" target="ShipperComponent1" />
- </component>
-
-
- <component name="ShipperComponent1">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Shipper"
- bundleLocation="file:target/wiring/ds/Shipper.jar">
-
- <properties service="Shipper">
- <property name="shipperName">RoyalMail</property>
- </properties>
- </implementation.osgi>
-
- <reference name="customer" target="CustomerComponent" />
- <property name="shipperName" type="xsd:string" >RoyalMail</property>
- </component>
-
- <component name="ShipperComponent2">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Shipper"
- bundleLocation="file:target/wiring/ds/Shipper.jar">
-
- <properties service="Shipper">
- <property name="shipperName">ParcelForce</property>
- </properties>
- </implementation.osgi>
-
- <reference name="customer" target="CustomerComponent" />
- <property name="shipperName" type="xsd:string" >ParcelForce</property>
-
- </component>
-
-
-</composite>
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/wiring-test1.composite b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/wiring-test1.composite deleted file mode 100644 index 67066049e7..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/wiring-test1.composite +++ /dev/null @@ -1,132 +0,0 @@ -<?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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://supplychain"
- xmlns:sp="http://supplychain"
- name="supplychain">
-
- <component name="CustomerComponent">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Customer"
- bundleLocation="file:target/wiring/Customer.jar" >
-
- <properties reference="retailer1">
- <property name="retailerName">amazon.com</property>
- </properties>
- <properties reference="retailer2">
- <property name="retailerName">play.com</property>
- </properties>
- <properties reference="retailer3">
- <property name="retailerName">ebay.com</property>
- </properties>
- </implementation.osgi>
-
- <reference name="retailer1" target="RetailerComponent1/Retailer" />
-
- <reference name="retailer2" target="RetailerComponent2/Retailer" />
-
- <reference name="retailer3" target="RetailerComponent3/Retailer" />
- </component>
-
- <component name="RetailerComponent1">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Retailer"
- bundleLocation="file:target/wiring/Retailer.jar" >
- <properties service="Retailer">
- <property name="retailerName">amazon.com</property>
- </properties>
- </implementation.osgi>
-
- <reference name="warehouse" target="WarehouseComponent1"/>
- <property name="retailerName" type="xsd:string" >amazon.com</property>
- </component>
-
- <component name="RetailerComponent2">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Retailer"
- bundleLocation="file:target/wiring/Retailer.jar" >
-
- <properties service="Retailer">
- <property name="retailerName">play.com</property>
- </properties>
- </implementation.osgi>
- <reference name="warehouse" target="WarehouseComponent1"/>
- <property name="retailerName" type="xsd:string" >play.com</property>
- </component>
-
- <component name="RetailerComponent3">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Retailer"
- bundleLocation="file:target/wiring/Retailer.jar" >
-
- <properties service="Retailer">
- <property name="retailerName">ebay.com</property>
- </properties>
- </implementation.osgi>
- <reference name="warehouse" target="WarehouseComponent2"/>
- <property name="retailerName" type="xsd:string" >ebay.com</property>
- </component>
-
-
- <component name="WarehouseComponent1">
- <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
-
- <reference name="shipper" target="ShipperComponent2" />
- </component>
-
- <component name="WarehouseComponent2">
- <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
-
- <reference name="shipper" target="ShipperComponent1" />
- </component>
-
-
- <component name="ShipperComponent1">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Shipper"
- bundleLocation="file:target/wiring/Shipper.jar">
-
- <properties service="Shipper">
- <property name="shipperName">RoyalMail</property>
- </properties>
- </implementation.osgi>
-
- <reference name="customer" target="CustomerComponent" />
- <property name="shipperName" type="xsd:string" >RoyalMail</property>
- </component>
-
- <component name="ShipperComponent2">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Shipper"
- bundleLocation="file:target/wiring/Shipper.jar">
-
- <properties service="Shipper">
- <property name="shipperName">ParcelForce</property>
- </properties>
- </implementation.osgi>
-
- <reference name="customer" target="CustomerComponent" />
- <property name="shipperName" type="xsd:string" >ParcelForce</property>
-
- </component>
-
-
-</composite>
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/wiring-test2.composite b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/wiring-test2.composite deleted file mode 100644 index a5a634208d..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/wiring-test2.composite +++ /dev/null @@ -1,159 +0,0 @@ -<?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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://supplychain"
- xmlns:sp="http://supplychain"
- name="supplychain">
-
- <component name="CustomerComponent">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Customer"
- bundleLocation="file:target/wiring/Customer.jar" >
-
- <properties reference="retailer1">
- <property name="retailerName">amazon.com</property>
- </properties>
- <properties reference="retailer2">
- <property name="retailerName">play.com</property>
- </properties>
- <properties reference="retailer3">
- <property name="retailerName">ebay.com</property>
- </properties>
- </implementation.osgi>
-
- <reference name="retailer1" target="RetailerComponent1/Retailer" />
-
- <reference name="retailer2" target="RetailerComponent2/Retailer" />
-
- <reference name="retailer3" target="RetailerComponent3/Retailer" />
- </component>
-
- <component name="RetailerComponent1">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Retailer"
- bundleLocation="file:target/wiring/Retailer.jar" >
- <properties service="Retailer">
- <property name="retailerName">amazon.com</property>
- </properties>
- <properties reference="warehouse">
- <property name="component.name">WarehouseComponent1</property>
- </properties>
- </implementation.osgi>
- <service name="Retailer"/>
-
- <reference name="warehouse" target="WarehouseComponent1"/>
- <property name="retailerName" type="xsd:string" >amazon.com</property>
- </component>
-
- <component name="RetailerComponent2">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Retailer"
- bundleLocation="file:target/wiring/Retailer.jar" >
-
- <properties service="Retailer">
- <property name="retailerName">play.com</property>
- </properties>
-
- <properties reference="warehouse">
- <property name="component.name">WarehouseComponent1</property>
- </properties>
- </implementation.osgi>
- <reference name="warehouse" target="WarehouseComponent1"/>
- <property name="retailerName" type="xsd:string" >play.com</property>
- </component>
-
- <component name="RetailerComponent3">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Retailer"
- bundleLocation="file:target/wiring/Retailer.jar" >
-
- <properties service="Retailer">
- <property name="retailerName">ebay.com</property>
- </properties>
- <properties reference="warehouse">
- <property name="component.name">WarehouseComponent1</property>
- </properties>
- </implementation.osgi>
- <reference name="warehouse" target="WarehouseComponent1"/>
- <property name="retailerName" type="xsd:string" >ebay.com</property>
- </component>
-
- <component name="WarehouseComponent1">
-
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Warehouse"
- bundleLocation="file:target/wiring/Warehouse.jar" >
-
- <properties reference="shipper">
- <property name="shipperName">ParcelForce</property>
- </properties>
- </implementation.osgi>
-
- <reference name="shipper" target="ShipperComponent2" />
- </component>
-
-
- <component name="WarehouseComponent2">
-
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Warehouse"
- bundleLocation="file:target/wiring/Warehouse.jar" >
-
- <properties reference="shipper">
- <property name="shipperName">RoyalMail</property>
- </properties>
- </implementation.osgi>
-
- <reference name="shipper" target="ShipperComponent1" />
- </component>
-
-
- <component name="ShipperComponent1">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Shipper"
- bundleLocation="file:target/wiring/Shipper.jar">
-
- <properties service="Shipper">
- <property name="shipperName">RoyalMail</property>
- </properties>
- </implementation.osgi>
-
- <reference name="customer" target="CustomerComponent" />
- <property name="shipperName" type="xsd:string" >RoyalMail</property>
- </component>
-
- <component name="ShipperComponent2">
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="supplychain.Shipper"
- bundleLocation="file:target/wiring/Shipper.jar">
-
- <properties service="Shipper">
- <property name="shipperName">ParcelForce</property>
- </properties>
- </implementation.osgi>
-
- <reference name="customer" target="CustomerComponent" />
- <property name="shipperName" type="xsd:string" >ParcelForce</property>
-
- </component>
-
-
-</composite>
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/ws-helloworld.composite b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/ws-helloworld.composite deleted file mode 100644 index 30fd337134..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/sca/ws-helloworld.composite +++ /dev/null @@ -1,52 +0,0 @@ -<?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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="HelloWorld">
-
- <service name="helloWorld" promote="HelloWorldService">
- <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
- <!-- interface.java interface="helloworld.ws.HelloWorld" / -->
- <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>
- </service>
-
- <component name="HelloWorldService">
- <implementation.java class="helloworld.ws.HelloWorldService"/>
- </component>
-
- <component name="HelloWorldComponent">
- <!--implementation.java class="helloworld.HelloWorldComponent"/-->
-
- <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
- bundle="helloworld.HelloWorld"
- bundleLocation="file:target/ws/HelloWorld.jar"
- />
-
- <service name="OSGiHelloWorld"/>
-
- <reference name="helloWorldWS" />
- </component>
-
- <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS">
- <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
- <!-- interface.java interface="helloworld.ws.HelloWorld" / -->
- <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>
- </reference>
-
-</composite>
diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType deleted file mode 100644 index 0b0aa0912b..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType +++ /dev/null @@ -1,28 +0,0 @@ -<?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. ---> -<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <service name="StockQuoteService"> - <interface.java interface="stockquote.StockQuote"/> - </service> - - <property name="currency" type="xsd:string" >GBP</property> - <property name="exchangeRate" type="xsd:double" >1.0</property> - -</componentType> diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/Customer.componentType b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/Customer.componentType deleted file mode 100644 index 64986c7dcc..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/Customer.componentType +++ /dev/null @@ -1,34 +0,0 @@ -<?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. ---> -<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0"> - <service name="Customer"> - <interface.java interface="supplychain.customer.Customer"/> - </service> - <reference name="retailer1"> - <interface.java interface="supplychain.retailer.Retailer"/> - </reference> - <reference name="retailer2"> - <interface.java interface="supplychain.retailer.Retailer"/> - </reference> - <reference name="retailer3"> - <interface.java interface="supplychain.retailer.Retailer"/> - </reference> - -</componentType>
\ No newline at end of file diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/CustomerServices.componentType b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/CustomerServices.componentType deleted file mode 100644 index 0cf5563258..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/CustomerServices.componentType +++ /dev/null @@ -1,34 +0,0 @@ -<?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. ---> -<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0"> - <service name="CustomerService"> - <interface.java interface="supplychain.customer.Customer"/> - </service> - <reference name="retailer1"> - <interface.java interface="supplychain.retailer.Retailer"/> - </reference> - <reference name="retailer2"> - <interface.java interface="supplychain.retailer.Retailer"/> - </reference> - <reference name="retailer3"> - <interface.java interface="supplychain.retailer.Retailer"/> - </reference> - -</componentType>
\ No newline at end of file diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/CustomerWithQuery.componentType b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/CustomerWithQuery.componentType deleted file mode 100644 index 9906af1463..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/CustomerWithQuery.componentType +++ /dev/null @@ -1,31 +0,0 @@ -<?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. ---> -<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0"> - <service name="Customer"> - <interface.java interface="supplychain.customer.Customer"/> - </service> - <reference name="retailer"> - <interface.java interface="supplychain.retailer.Retailer"/> - </reference> - <reference name="retailerQuery"> - <interface.java interface="supplychain.retailer.RetailerQuery"/> - </reference> - -</componentType>
\ No newline at end of file diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/Retailer.componentType b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/Retailer.componentType deleted file mode 100644 index 7323b2d9be..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/Retailer.componentType +++ /dev/null @@ -1,29 +0,0 @@ -<?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. ---> -<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <service name="Retailer"> - <interface.java interface="supplychain.retailer.Retailer"/> - </service> - <reference name="warehouse"> - <interface.java interface="supplychain.warehouse.Warehouse"/> - </reference> - <property name="retailerName" type="xsd:string" >default</property> - -</componentType>
\ No newline at end of file diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/RetailerServices.componentType b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/RetailerServices.componentType deleted file mode 100644 index f7ead7eb85..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/RetailerServices.componentType +++ /dev/null @@ -1,33 +0,0 @@ -<?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. ---> -<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <service name="RetailerService1"> - <interface.java interface="supplychain.retailer.Retailer"/> - </service> - <service name="RetailerService2"> - <interface.java interface="supplychain.retailer.Retailer"/> - </service> - <service name="RetailerService3"> - <interface.java interface="supplychain.retailer.Retailer"/> - </service> - <reference name="warehouse"> - <interface.java interface="supplychain.warehouse.Warehouse"/> - </reference> -</componentType>
\ No newline at end of file diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/RetailerWithQuery.componentType b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/RetailerWithQuery.componentType deleted file mode 100644 index f6ac2393dc..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/RetailerWithQuery.componentType +++ /dev/null @@ -1,35 +0,0 @@ -<?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. ---> -<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <service name="Retailer"> - <interface.java interface="supplychain.retailer.Retailer"/> - </service> - <service name="RetailerQuery"> - <interface.java interface="supplychain.retailer.RetailerQuery"/> - </service> - <reference name="warehouse"> - <interface.java interface="supplychain.warehouse.Warehouse"/> - </reference> - <reference name="warehouseQuery"> - <interface.java interface="supplychain.warehouse.WarehouseQuery"/> - </reference> - <property name="retailerName" type="xsd:string" >default</property> - -</componentType>
\ No newline at end of file diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/Shipper.componentType b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/Shipper.componentType deleted file mode 100644 index 7996f0f429..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/Shipper.componentType +++ /dev/null @@ -1,29 +0,0 @@ -<?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. ---> -<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <service name="Shipper"> - <interface.java interface="supplychain.shipper.Shipper"/> - </service> - <reference name="customer"> - <interface.java interface="supplychain.customer.Customer"/> - </reference> - <property name="shipperName" type="xsd:string" >default</property> - -</componentType>
\ No newline at end of file diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/ShipperServices.componentType b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/ShipperServices.componentType deleted file mode 100644 index 2906e0d2ed..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/ShipperServices.componentType +++ /dev/null @@ -1,30 +0,0 @@ -<?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. ---> -<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <service name="ShipperService1"> - <interface.java interface="supplychain.shipper.Shipper"/> - </service> - <service name="ShipperService2"> - <interface.java interface="supplychain.shipper.Shipper"/> - </service> - <reference name="customer"> - <interface.java interface="supplychain.customer.Customer"/> - </reference> -</componentType>
\ No newline at end of file diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/Warehouse.componentType b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/Warehouse.componentType deleted file mode 100644 index c5ae9b76f3..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/Warehouse.componentType +++ /dev/null @@ -1,28 +0,0 @@ -<?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. ---> -<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0"> - <service name="Warehouse"> - <interface.java interface="supplychain.warehouse.Warehouse"/> - </service> - - <reference name="shipper"> - <interface.java interface="supplychain.shipper.Shipper"/> - </reference> -</componentType>
\ No newline at end of file diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/WarehouseServices.componentType b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/WarehouseServices.componentType deleted file mode 100644 index c5ae9b76f3..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/WarehouseServices.componentType +++ /dev/null @@ -1,28 +0,0 @@ -<?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. ---> -<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0"> - <service name="Warehouse"> - <interface.java interface="supplychain.warehouse.Warehouse"/> - </service> - - <reference name="shipper"> - <interface.java interface="supplychain.shipper.Shipper"/> - </reference> -</componentType>
\ No newline at end of file diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/WarehouseWithQuery.componentType b/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/WarehouseWithQuery.componentType deleted file mode 100644 index 24edf697d5..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/main/resources/supplychain/WarehouseWithQuery.componentType +++ /dev/null @@ -1,31 +0,0 @@ -<?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. ---> -<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0"> - <service name="Warehouse"> - <interface.java interface="supplychain.warehouse.Warehouse"/> - </service> - <service name="WarehouseQuery"> - <interface.java interface="supplychain.warehouse.WarehouseQuery"/> - </service> - - <reference name="shipper"> - <interface.java interface="supplychain.shipper.Shipper"/> - </reference> -</componentType>
\ No newline at end of file diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/helloworld/HelloWorldTestCase.java b/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/helloworld/HelloWorldTestCase.java deleted file mode 100644 index ab08fd1982..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/helloworld/HelloWorldTestCase.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * 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. - */ - -package helloworld; - -import helloworld.HelloWorld; -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -import util.OSGiTestUtil; - - -public class HelloWorldTestCase extends TestCase { - - private SCADomain scaDomain; - private HelloWorld helloWorld; - - protected void setUp() throws Exception { - OSGiTestUtil.setUpOSGiTestRutime(); - - scaDomain = SCADomain.newInstance("sca/ws-helloworld.composite"); - helloWorld = scaDomain.getService(HelloWorld.class, "HelloWorldComponent"); - } - - protected void tearDown() throws Exception { - scaDomain.close(); - OSGiTestUtil.shutdownOSGiRuntime(); - } - - - public void testHelloWorld() throws Exception { - String greetings = helloWorld.getGreetings("petra"); - System.out.println(greetings); - assertEquals("Hello petra", greetings); - } - - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/helloworld/PassByRefTestCase.java b/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/helloworld/PassByRefTestCase.java deleted file mode 100644 index 454fc6a7f8..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/helloworld/PassByRefTestCase.java +++ /dev/null @@ -1,135 +0,0 @@ -/* - * 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. - */ - -package helloworld; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -import util.OSGiTestUtil; - - -public class PassByRefTestCase extends TestCase { - - private SCADomain scaDomain; - private Greetings greetingsJava; - private Greetings greetingsOSGi; - private String[] origNames = {"world"}; - private String[] names; - - protected void setUp() throws Exception { - OSGiTestUtil.setUpOSGiTestRutime(); - - scaDomain = SCADomain.newInstance("sca/passbyref-test.composite"); - greetingsJava = scaDomain.getService(Greetings.class, "JavaGreetingsComponent"); - greetingsOSGi = scaDomain.getService(Greetings.class, "OSGiGreetingsComponent"); - - names = new String[origNames.length]; - System.arraycopy(origNames, 0, names, 0, names.length); - } - - protected void tearDown() throws Exception { - scaDomain.close(); - OSGiTestUtil.shutdownOSGiRuntime(); - } - - public void test() throws Exception { - - javaOSGiPassByValue(); - osgiJavaPassByValue(); - javaOSGiPassByRef(); - osgiJavaPassByRef(); - - } - - - public void javaOSGiPassByValue() throws Exception { - - String[] greetings = greetingsJava.getGreetingsFromJava(names); - for (int i = 0; i < origNames.length; i++) { - assertEquals(origNames[i], names[i]); - } - for (int i = 0; i < origNames.length; i++) { - - System.out.println(greetings[i]); - - assertEquals(greetings[i], - "Hello " + origNames[i] + "(From Java)(From OSGi)"); - } - - } - - public void osgiJavaPassByValue() throws Exception { - String[] names = { - "world" - }; - String[] greetings = greetingsOSGi.getGreetingsFromOSGi(names); - - for (int i = 0; i < origNames.length; i++) { - assertEquals(origNames[i], names[i]); - } - for (int i = 0; i < origNames.length; i++) { - - System.out.println(greetings[i]); - - assertEquals(greetings[i], - "Hello " + origNames[i] + "(From OSGi)(From Java)"); - } - - - - } - - public void javaOSGiPassByRef() throws Exception { - String[] names = { - "world" - }; - String[] greetings = greetingsJava.getModifiedGreetingsFromJava(names); - for (int i = 0; i < origNames.length; i++) { - assertEquals("Hello " + origNames[i] + "(From Java)(From OSGi)", names[i]); - } - for (int i = 0; i < origNames.length; i++) { - - System.out.println(greetings[i]); - - assertEquals(greetings[i], - "Hello " + origNames[i] + "(From Java)(From OSGi)"); - } - } - - public void osgiJavaPassByRef() throws Exception { - String[] names = { - "world" - }; - String[] greetings = greetingsOSGi.getModifiedGreetingsFromOSGi(names); - for (int i = 0; i < origNames.length; i++) { - assertEquals("Hello " + origNames[i] + "(From OSGi)(From Java)", names[i]); - } - for (int i = 0; i < origNames.length; i++) { - - System.out.println(greetings[i]); - - assertEquals(greetings[i], - "Hello " + origNames[i] + "(From OSGi)(From Java)"); - } - } - - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java b/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java deleted file mode 100644 index b41c00bd0b..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * 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. - */ -package supplychain; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - - -import supplychain.customer.Customer; -import util.OSGiTestUtil; - -/** - * Test case for supplychain - it is invoked with different composite files to test - * various scenarios. - */ -public abstract class SupplyChainTestCase extends TestCase { - - private String compositeName; - private SCADomain scaDomain; - public Customer customer; - - public SupplyChainTestCase(String compositeName) { - super(); - this.compositeName = compositeName; - } - - protected void setUp() throws Exception { - - OSGiTestUtil.setUpOSGiTestRutime(); - - scaDomain = SCADomain.newInstance(compositeName); - customer = scaDomain.getService(Customer.class, "CustomerComponent"); - } - - protected void tearDown() throws Exception { - scaDomain.close(); - - OSGiTestUtil.shutdownOSGiRuntime(); - } - - - public void test() throws Exception { - - System.out.println("Main thread " + Thread.currentThread()); - customer.purchaseBooks(); - customer.purchaseGames(); - long timeout = 5000L; - while (timeout > 0) { - if (customer.hasOutstandingOrders()) { - Thread.sleep(100); - timeout -= 100; - } else - break; - } - assertFalse(customer.hasOutstandingOrders()); - - System.out.println("Test complete"); - - } - - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java b/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java deleted file mode 100644 index d569cd7189..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * 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. - */ -package supplychain; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -import supplychain.customer.Customer; -import util.OSGiTestUtil; - -/** - * OSGi test program - common code for versioned bundles - */ -public abstract class VersionedSupplyChainTestCase extends TestCase { - - private String compositeName; - private SCADomain scaDomain; - private Customer customer1; - private Customer customer2; - - - public VersionedSupplyChainTestCase(String compositeName) { - super(); - this.compositeName = compositeName; - } - - protected void setUp() throws Exception { - - OSGiTestUtil.setUpOSGiTestRutime(); - - scaDomain = SCADomain.newInstance(compositeName); - customer1 = scaDomain.getService(Customer.class, "CustomerComponent1"); - customer2 = scaDomain.getService(Customer.class, "CustomerComponent2"); - } - - protected void tearDown() throws Exception { - scaDomain.close(); - - OSGiTestUtil.shutdownOSGiRuntime(); - } - - public void test() throws Exception { - - System.out.println("Main thread " + Thread.currentThread()); - customer1.purchaseBooks(); - customer2.purchaseGames(); - long timeout = 5000L; - while (timeout > 0) { - if (customer1.hasOutstandingOrders()) { - Thread.sleep(100); - timeout -= 100; - } else if (customer2.hasOutstandingOrders()) { - Thread.sleep(100); - timeout -= 100; - } else - break; - } - assertFalse(customer1.hasOutstandingOrders()); - assertFalse(customer2.hasOutstandingOrders()); - - System.out.println("Test complete"); - - } -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java b/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java deleted file mode 100644 index eba07d7d93..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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. - */ -package supplychain.factory; - - -/** - * OSGi test program - declarative with scopes other than composites which use OSGi service factories - */ -public class DSFactoryTestCase extends FactoryTestCase { - - public DSFactoryTestCase() { - super("sca/factory-ds-test.composite"); - } - - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java b/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java deleted file mode 100644 index 2f367a2f64..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * 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. - */ -package supplychain.factory; - -import supplychain.SupplyChainTestCase; - -/** - * OSGi test program - declarative with scopes other than composites which use OSGi service factories - */ -public class FactoryTestCase extends SupplyChainTestCase { - - public FactoryTestCase() { - super("sca/factory-test.composite"); - } - - protected FactoryTestCase(String compositeName) { - super(compositeName); - } - - - @Override - public void test() throws Exception { - - System.out.println("Main thread " + Thread.currentThread()); - customer.purchaseBooks(); - assertFalse(customer.hasOutstandingOrders()); - - customer.purchaseGames(); - assertFalse(customer.hasOutstandingOrders()); - - Thread.sleep(1000); - System.out.println("Test complete"); - - } - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java b/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java deleted file mode 100644 index 64610bfff8..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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. - */ -package supplychain.interfaces; - -import supplychain.SupplyChainTestCase; - -/** - * OSGi test program - declarative with components exposing multiple services with multiple interfaces - */ -public class DSInterfacesTestCase extends SupplyChainTestCase { - - public DSInterfacesTestCase() { - super("sca/interfaces-ds-test.composite"); - } - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java b/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java deleted file mode 100644 index 7b7d4f1e04..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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. - */ -package supplychain.interfaces; - -import supplychain.SupplyChainTestCase; - -/** - * OSGi test program - procedural with components exposing multiple services with multiple interfaces - */ -public class InterfacesTestCase extends SupplyChainTestCase { - - public InterfacesTestCase() { - super("sca/interfaces-test.composite"); - } - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java b/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java deleted file mode 100644 index 20dab1ec66..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - */ -package supplychain.properties; - - -/** - * OSGi test program - declarative with business properties - */ -public class DSProperties2TestCase extends Properties2TestCase { - - public DSProperties2TestCase() { - super("sca/properties2-ds-test.composite"); - } - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java b/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java deleted file mode 100644 index 5de9035ace..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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. - */ -package supplychain.properties; - - -/** - * OSGi test program - declarative with business properties - */ -public class DSPropertiesTestCase extends PropertiesTestCase { - - public DSPropertiesTestCase() { - super("sca/properties-ds-test.composite"); - } - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java b/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java deleted file mode 100644 index 51d37a4519..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * 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. - */ -package supplychain.properties; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -import stockquote.StockQuote; -import util.OSGiTestUtil; - -/** - * OSGi test program - procedural with business properties - */ -public class Properties2TestCase extends TestCase { - - - private SCADomain scaDomain; - private StockQuote stockQuoteServiceUSD; - private StockQuote stockQuoteServiceEURO; - private String compositeName; - - public Properties2TestCase() { - super(); - compositeName = "sca/properties2-test.composite"; - } - - protected Properties2TestCase(String compositeName) { - super(); - this.compositeName = compositeName; - } - - protected void setUp() throws Exception { - - OSGiTestUtil.setUpOSGiTestRutime(); - - scaDomain = SCADomain.newInstance(compositeName); - stockQuoteServiceUSD = scaDomain.getService(StockQuote.class, "USDStockQuoteComponent"); - stockQuoteServiceEURO = scaDomain.getService(StockQuote.class, "EUROStockQuoteComponent"); - } - - protected void tearDown() throws Exception { - scaDomain.close(); - OSGiTestUtil.shutdownOSGiRuntime(); - } - - public void test() throws Exception { - - double stockQuote = stockQuoteServiceUSD.getQuote("IBM"); - - double expectedValue = 52.81 * 2.0; - - System.out.println("IBM: $" + stockQuote); - - assertTrue(stockQuote > expectedValue - 0.1 && stockQuote < expectedValue + 0.1); - - double stockQuote2 = stockQuoteServiceEURO.getQuote("IBM"); - - double expectedValue2 = 52.81 * 1.48; - - System.out.println("IBM: Euro " + stockQuote2); - - assertTrue(stockQuote2 > expectedValue2 - 0.1 && stockQuote2 < expectedValue2 + 0.1); - - } - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java b/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java deleted file mode 100644 index 23e1624be1..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * 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. - */ -package supplychain.properties; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -import stockquote.StockQuote; -import util.OSGiTestUtil; - -/** - * OSGi test program - procedural with business properties - */ -public class PropertiesTestCase extends TestCase { - - - private SCADomain scaDomain; - private StockQuote stockQuoteService; - private String compositeName; - - public PropertiesTestCase() { - super(); - compositeName = "sca/properties-test.composite"; - } - - protected PropertiesTestCase(String compositeName) { - super(); - this.compositeName = compositeName; - } - - protected void setUp() throws Exception { - - OSGiTestUtil.setUpOSGiTestRutime(); - - scaDomain = SCADomain.newInstance(compositeName); - stockQuoteService = scaDomain.getService(StockQuote.class, "StockQuoteComponent"); - } - - protected void tearDown() throws Exception { - scaDomain.close(); - OSGiTestUtil.shutdownOSGiRuntime(); - } - - public void test() throws Exception { - - double stockQuote = stockQuoteService.getQuote("IBM"); - - double expectedValue = 52.81 * 2.0; - - System.out.println("IBM: " + stockQuote); - - assertTrue(stockQuote > expectedValue - 0.1 && stockQuote < expectedValue + 0.1); - - } - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java b/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java deleted file mode 100644 index 069a5e538d..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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. - */ -package supplychain.services; - -import supplychain.SupplyChainTestCase; - -/** - * OSGi test program - declarative with components exposing multiple services - */ -public class DSServicesTestCase extends SupplyChainTestCase { - - public DSServicesTestCase() { - super("sca/services-ds-test.composite"); - } - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java b/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java deleted file mode 100644 index 5ec9f51c71..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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. - */ -package supplychain.services; - -import supplychain.SupplyChainTestCase; - -/** - * OSGi test program - procedural with components exposing multiple services - */ -public class ServicesTestCase extends SupplyChainTestCase { - - public ServicesTestCase() { - super("sca/services-test.composite"); - } - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java b/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java deleted file mode 100644 index 3226362335..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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. - */ -package supplychain.version; - -import supplychain.VersionedSupplyChainTestCase; - -/** - * OSGi test program - declarative with versioning - */ -public class DSVersionTestCase extends VersionedSupplyChainTestCase { - - public DSVersionTestCase() { - super("sca/version-ds-test.composite"); - } - - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java b/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java deleted file mode 100644 index 3153399820..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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. - */ -package supplychain.version; - -import supplychain.VersionedSupplyChainTestCase; - -/** - * OSGi test program - procedural with versioning - */ -public class VersionTestCase extends VersionedSupplyChainTestCase { - - public VersionTestCase() { - super("sca/version-test.composite"); - } - - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java b/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java deleted file mode 100644 index 8c50bf89aa..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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. - */ -package supplychain.wiring; - -import supplychain.SupplyChainTestCase; - -/** - * OSGi test program - declarative with SCA wiring - */ -public class DSWiring1TestCase extends SupplyChainTestCase { - - public DSWiring1TestCase() { - super("sca/wiring-ds-test1.composite"); - } - - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java b/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java deleted file mode 100644 index 46d41710c6..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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. - */ -package supplychain.wiring; - -import supplychain.SupplyChainTestCase; - -/** - * OSGi test program - declarative with SCA wiring - */ -public class DSWiring2TestCase extends SupplyChainTestCase { - - public DSWiring2TestCase() { - super("sca/wiring-ds-test2.composite"); - } - - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java b/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java deleted file mode 100644 index 00c6d69678..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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. - */ -package supplychain.wiring; - -import supplychain.SupplyChainTestCase; - -/** - * OSGi test program - procedural with SCA wiring - */ -public class Wiring1TestCase extends SupplyChainTestCase { - - public Wiring1TestCase() { - super("sca/wiring-test1.composite"); - } - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java b/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java deleted file mode 100644 index b7f0ad79d8..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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. - */ -package supplychain.wiring; - -import supplychain.SupplyChainTestCase; - -/** - * OSGi test program - procedural with SCA wiring - */ -public class Wiring2TestCase extends SupplyChainTestCase { - - public Wiring2TestCase() { - super("sca/wiring-test2.composite"); - } - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java b/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java deleted file mode 100644 index ad13e72866..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * 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. - */ -package util; - -import org.apache.tuscany.sca.implementation.osgi.runtime.OSGiRuntime; - - -/** - * OSGi Test Utils - */ -public class OSGiTestUtil { - - public static void setUpOSGiTestRutime() throws Exception { - - setUpFelixTestRutime(); - } - - - private static void setUpFelixTestRutime() throws Exception { - - String felixConfigFileName = "file:target/test-classes/osgi/felix/felix.config.properties"; - - System.setProperty("felix.config.properties", felixConfigFileName); - - try { - - ClassLoader cl = OSGiTestUtil.class.getClassLoader(); - - Class felixMainClass = cl.loadClass("org.apache.felix.main.Main"); - if (felixMainClass != null) { - String felixDir = felixMainClass.getProtectionDomain().getCodeSource().getLocation().getPath(); - int index = 0; - if ((index = felixDir.indexOf("/org.apache.felix.main")) >= 0) { - felixDir = felixDir.substring(0, index); - System.setProperty("FELIX_DIR", felixDir); - } - } - - } catch (Exception e) { - // Ignore - } - - - } - - public static void shutdownOSGiRuntime() { - try { - OSGiRuntime.getRuntime().shutdown(); - - } catch (Exception e) { - // Ignore - } - } - -} diff --git a/branches/sca-java-0.99/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties b/branches/sca-java-0.99/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties deleted file mode 100644 index 72fd6fd843..0000000000 --- a/branches/sca-java-0.99/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties +++ /dev/null @@ -1,44 +0,0 @@ -# -# 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. -# -# -# Framework config properties. -# -org.osgi.framework.system.packages=org.osgi.framework; version=1.3.0, \ - org.osgi.service.packageadmin; version=1.2.0, \ - org.osgi.service.startlevel; version=1.0.0, \ - org.osgi.service.url; version=1.0.0 - - -felix.auto.start.1= \ - "file://${FELIX_DIR}/org.apache.felix.shell/1.0.0/org.apache.felix.shell-1.0.0.jar" \ - "file://${FELIX_DIR}/org.apache.felix.shell.tui/1.0.0/org.apache.felix.shell.tui-1.0.0.jar" \ - "file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.0.0/org.apache.felix.bundlerepository-1.0.0.jar" \ - "file://${FELIX_DIR}/org.apache.felix.scr/0.9.0-SNAPSHOT/org.apache.felix.scr-0.9.0-SNAPSHOT.jar" \ - "file://${FELIX_DIR}/org.apache.felix.log/0.9.0-incubator-SNAPSHOT/org.apache.felix.log-0.9.0-incubator-SNAPSHOT.jar" \ - "file://${FELIX_DIR}/org.apache.felix.configadmin/0.9.0-SNAPSHOT/org.apache.felix.configadmin-0.9.0-SNAPSHOT.jar" - - -felix.startlevel.framework=1 -felix.startlevel.bundle=1 - -# -# Bundle config properties. -# -org.osgi.service.http.port=8080 -obr.shell.telnet=on |