diff options
Diffstat (limited to '')
47 files changed, 0 insertions, 2242 deletions
diff --git a/branches/sca-android/samples/osgi-supplychain/README b/branches/sca-android/samples/osgi-supplychain/README deleted file mode 100644 index 11fecf2ae8..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/README +++ /dev/null @@ -1,161 +0,0 @@ -osgi-supplychain Sample -======================= - -The Tuscany OSGi supply chain sample shows using the Tuscany SCA runtime in a J2SE environment executing the SCA asynchronous API with OSGi and Java implementation types. - -If you just want to run it to see what happens open a command prompt, navigate -to this sample directory and do: - -ant run - -OR if you don't have ant, on Windows do - -In the directory samples\osgi-supplychain use the JDK 1.5 java command to run the class supplychain.SupplyChainClient - -Linux: java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-osgi-supplychain.jar supplychain.SupplyChainClient -Windows: java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-osgi-supplychain.jar supplychain.SupplyChainClient - -Results ----------- -The sample when run should simply display on the standard output some startup messages followed by: - -Work thread Thread[Thread-1,5,main] - Order, submitted, fulfilled, shipped - - -Sample Overview ---------------- - -The sample provides a Customer service with a purchaseGoods operation -and a notifyShipment operation annotated with the SCA @OneWay annotation. -The SupplyChainClient exercises this interface by calling the -purchaseGoods operation. This results in messages passing to -the Retailer, Warehouse, and Shipper components and the result returned -to the Customer service on a separate callback thread. The Customer -and Shipper components are implemented as OSGi bundles which use -implementation.osgi, while the Retailer and Warehouse components are -implemented using implementation.java. - - -src -+---main - +---java - ¦ +---supplychain - ¦ OSGiBundleImpl.java - ¦ SupplyChainClient.java - ¦ +---customer - ¦ Customer.java - ¦ JavaCustomerComponentImpl.java - ¦ OSGiCustomerComponentImpl.java - ¦ OSGiCustomerImpl.java - ¦ +---retailer - ¦ Retailer.java - ¦ JavaRetailerComponentImpl.java - ¦ OSGiRetailerComponentImpl.java - ¦ OSGiRetailerImpl.java - ¦ +---shipper - ¦ Shipper.java - ¦ JavaShipperComponentImpl.java - ¦ OSGiShipperComponentImpl.java - ¦ OSGiShipperImpl.java - ¦ +---warehouse - ¦ Warehouse.java - ¦ JavaWarehouseComponentImpl.java - ¦ OSGiWarehouseComponentImpl.java - ¦ OSGiWarehouseImpl.java - ¦ - +---resources - ¦ +---osgi - ¦ Customer.mf - ¦ Retailer.mf - ¦ Shipper.mf - ¦ Warehouse.mf - ¦ +---ds - ¦ Customer.mf - ¦ Retailer.mf - ¦ Shipper.mf - ¦ Warehouse.mf - ¦ Customer.xml - ¦ Retailer.xml - ¦ Shipper.xml - ¦ Warehouse.xml - ¦ Customer.componentType - ¦ Retailer.componentType - ¦ Shipper.componentType - ¦ Warehouse.componentType - ¦ supplychain.composite - ¦-- supplychain.ds.composite - - - build.xml - the Ant build file - pom.xml - the Maven build file - -Understanding OSGI implementation files ---------------------------------------- -Some of the files introduced by OSGI implementation are explained below. - -OSG files related to customer. java are: -OSGiCustomerComponentImpl.java: OSGi Declarative Services Implementation of the SCA Customer component. -OSGiCustomerImpl.java: OSGi Procedural Services Implementation of the SCA Customer component. - -You notice the same pattern for shipper.java, retailer.java, SupplyChainClient.java. - -The rest of OSGI related files are: -OSGiBundleImpl.java: Common code for OSGi Procedural Services Implementation of the SCA components - -resources/osgi/*.mf: Manifest files for OSGi bundles for OSGi procedural services implementation - -resources/osgi/ds/*.m:f Manifest files for OSGi bundles for OSGi declarative services implementation - -resources/osgi/ds/*.xml: OSGi Declarative services component xml files - -resources/*.componentType: Component types used by OSGi implementation provider for SCA - -resources/supplychain.composite: Composite file using OSGi and Java implementation types - -resources/supplychain.ds.composite: Composite file using OSGi (declarative services) and Java implementation types - -Building And Running The Sample Using Ant ------------------------------------------ -cd osgi-supplychain -ant compile -ant run - -you should see: -Buildfile: build.xml - -run: - [java] Main thread Thread[main,5,main] - [java] Started OSGi bundle with activator OSGiCustomerImpl - [java] Started OSGi bundle with activator OSGiShipperImpl - [java] Main thread sleeping ... - [java] Work thread Thread[pool-1-thread-1,5,main] - Order, submitted, fulfi -lled, shipped - [java] Stop OSGi bundle with activator OSGiShipperImpl - [java] Stop OSGi bundle with activator OSGiCustomerImpl - - -Building And Running The Sample Using Maven -------------------------------------------- -With either the binary or source distributions the sample can be built and run -using Maven as follows. - -cd osgi-supplychain -mvn - -You should see the following output from the test phase. - -------------------------------------------------------- - T E S T S -------------------------------------------------------- -Running supplychain.SupplyChainClientTestCase -Started OSGi bundle with activator OSGiCustomerImpl -Started OSGi bundle with activator OSGiShipperImpl -Sleeping ... -Work thread Thread[pool-1-thread-1,5,main] - Order, submitted, fulfilled, shippe -d -Test complete -Stop OSGi bundle with activator OSGiShipperImpl -Stop OSGi bundle with activator OSGiCustomerImpl -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.062 sec - -This shows that the Junit test cases have run successfully. diff --git a/branches/sca-android/samples/osgi-supplychain/build-bundles.xml b/branches/sca-android/samples/osgi-supplychain/build-bundles.xml deleted file mode 100644 index 7a31e6016b..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/build-bundles.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. ---> -<project name="OSGiBundleCreator"> - - <target name="create-bundles"> - - <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-android/samples/osgi-supplychain/build.xml b/branches/sca-android/samples/osgi-supplychain/build.xml deleted file mode 100644 index 2e103e5a15..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/build.xml +++ /dev/null @@ -1,128 +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. ---> -<project name="sample-osgi-supplychain" default="compile"> - <property name="test.class" value="supplychain.SupplyChainClient" /> - <property name="test.jar" value="sample-osgi-supplychain.jar" /> - - <target name="init"> - <mkdir dir="target/classes"/> - </target> - - <target name="compile" depends="init"> - <javac srcdir="src/main/java" - destdir="target/classes" - debug="on" - source="1.5" - target="1.5"> - <classpath> - <pathelement location="../../lib/tuscany-sca-manifest.jar"/> - </classpath> - </javac> - <copy todir="target/classes"> - <fileset dir="src/main/resources"/> - </copy> - <jar jarfile="target/classes/Customer.jar" manifest="target/classes/osgi/Customer.mf" > - <fileset dir="target/classes" - includes="supplychain/customer/Customer.class \ - supplychain/OSGiBundleImpl.class \ - supplychain/customer/OSGiCustomerImpl.class" - /> - </jar> - <jar jarfile="target/classes/Retailer.jar" manifest="target/classes/osgi/Retailer.mf" > - <fileset dir="target/classes" - includes="supplychain/retailer/Retailer.class \ - supplychain/OSGiBundleImpl.class \ - supplychain/retailer/OSGiRetailerImpl.class" - /> - </jar> - <jar jarfile="target/classes/Warehouse.jar" manifest="target/classes/osgi/Warehouse.mf" > - <fileset dir="target/classes" - includes="supplychain/warehouse/Warehouse.class \ - supplychain/OSGiBundleImpl.class \ - supplychain/warehouse/OSGiWarehouseImpl.class" - /> - </jar> - <jar jarfile="target/classes/Shipper.jar" manifest="target/classes/osgi/Shipper.mf" > - <fileset dir="target/classes" - includes="supplychain/shipper/Shipper.class \ - supplychain/OSGiBundleImpl.class \ - supplychain/shipper/OSGiShipperImpl.class" - /> - </jar> - <jar jarfile="target/classes/DSCustomer.jar" manifest="target/classes/osgi/ds/Customer.mf" > - <fileset dir="target/classes" - includes="supplychain/customer/Customer.class \ - osgi/ds/Customer.xml \ - supplychain/customer/OSGiCustomerComponentImpl.class" - /> - </jar> - <jar jarfile="target/classes/DSRetailer.jar" manifest="target/classes/osgi/ds/Retailer.mf" > - <fileset dir="target/classes" - includes="supplychain/retailer/Retailer.class \ - Vosgi/ds/Retailer.xml \ - supplychain/retailer/OSGiRetailerComponentImpl.class" - /> - </jar> - <jar jarfile="target/classes/DSWarehouse.jar" manifest="target/classes/osgi/ds/Warehouse.mf" > - <fileset dir="target/classes" - includes="supplychain/warehouse/Warehouse.class \ - osgi/ds/Warehouse.xml \ - supplychain/warehouse/OSGiWarehouseComponentImpl.class" - /> - </jar> - <jar jarfile="target/classes/DSShipper.jar" manifest="target/classes/osgi/ds/Shipper.mf" > - <fileset dir="target/classes" - includes="supplychain/shipper/Shipper.class \ - osgi/ds/Shipper.xml \ - supplychain/shipper/OSGiShipperComponentImpl.class" - /> - </jar> - <jar destfile="target/${test.jar}" basedir="target/classes"> - <manifest> - <attribute name="Main-Class" value="${test.class}" /> - </manifest> - </jar> - </target> - - <target name="run-classes"> - <java classname="${test.class}" - fork="true"> - <classpath> - <pathelement path="target/classes"/> - <pathelement location="../../lib/tuscany-sca-manifest.jar"/> - </classpath> - </java> - </target> - - <target name="run"> - <java classname="${test.class}" - fork="true"> - <classpath> - <pathelement path="target/${test.jar}"/> - <pathelement location="../../lib/tuscany-sca-manifest.jar"/> - </classpath> - </java> - </target> - - <target name="clean"> - <delete quiet="true" includeemptydirs="true"> - <fileset dir="target"/> - </delete> - </target> -</project> diff --git a/branches/sca-android/samples/osgi-supplychain/osgi-supplychain.png b/branches/sca-android/samples/osgi-supplychain/osgi-supplychain.png Binary files differdeleted file mode 100644 index 2bec57ac8a..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/osgi-supplychain.png +++ /dev/null diff --git a/branches/sca-android/samples/osgi-supplychain/osgi-supplychain.svg b/branches/sca-android/samples/osgi-supplychain/osgi-supplychain.svg deleted file mode 100644 index 43cb427944..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/osgi-supplychain.svg +++ /dev/null @@ -1,272 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- - * 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. ---> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://web.resource.org/cc/" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="1052.3622" - height="744.09448" - id="svg2" - sodipodi:version="0.32" - inkscape:version="0.45.1" - sodipodi:docbase="C:\simon\tuscany\java-panic\sca\samples\osgi-supplychain" - sodipodi:docname="osgi-supplychain.svg" - version="1.0" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="C:\simon\tuscany\java-panic\sca\samples\osgi-supplychain\osgi-supplychain.png" - inkscape:export-xdpi="52.84" - inkscape:export-ydpi="52.84"> - <defs - id="defs4" /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - gridtolerance="10000" - guidetolerance="10" - objecttolerance="10" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="1.4" - inkscape:cx="521.44872" - inkscape:cy="414.63224" - inkscape:document-units="px" - inkscape:current-layer="layer1" - inkscape:window-width="1128" - inkscape:window-height="721" - inkscape:window-x="132" - inkscape:window-y="141" /> - <metadata - id="metadata7"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> - <g - id="g2997" - transform="matrix(1.047575,0,0,1,-9.726882,0)"> - <rect - rx="19.999123" - ry="12.692303" - y="192.00233" - x="205.45438" - height="299.99988" - width="647.66394" - id="rect2067" - style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.95405793;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <flowRoot - id="flowRoot2954" - xml:space="preserve" - transform="translate(-38.86527,-2.857143)"><flowRegion - id="flowRegion2956"><rect - y="212.66591" - x="281.42856" - height="61.42857" - width="170" - id="rect2958" /></flowRegion><flowPara - id="flowPara2960">supplychain</flowPara></flowRoot> </g> - <rect - style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect2988" - width="115.66247" - height="85.862968" - x="241.34489" - y="300.02475" - rx="6.9961648" - ry="7.1230249" /> - <flowRoot - xml:space="preserve" - id="flowRoot2966" - transform="translate(-17.674461,94.08621)"><flowRegion - id="flowRegion2968"><rect - id="rect2970" - width="170" - height="61.42857" - x="281.42856" - y="212.66591" /></flowRegion><flowPara - id="flowPara2972">Customer</flowPara><flowPara - id="flowPara1939">Component</flowPara></flowRoot> <path - style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 224.19438,331.87174 L 257.52942,331.87174 L 263.59033,345.00372 L 256.51927,357.12556 L 224.19438,357.12556 L 231.77053,345.00372 L 224.19438,331.87174 z " - id="path3017" /> - <path - style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 337.44682,330.03346 L 370.78186,330.03346 L 376.84277,343.16544 L 369.77171,355.28728 L 337.44682,355.28728 L 345.02297,343.16544 L 337.44682,330.03346 z " - id="path3019" /> - <rect - style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect1897" - width="115.66247" - height="85.862968" - x="405.82632" - y="298.30585" - rx="6.9961648" - ry="7.1230249" /> - <flowRoot - xml:space="preserve" - id="flowRoot1899" - transform="translate(146.80693,92.36731)"><flowRegion - id="flowRegion1901"><rect - id="rect1903" - width="170" - height="61.42857" - x="281.42856" - y="212.66591" /></flowRegion><flowPara - id="flowPara1905">Retailer</flowPara><flowPara - id="flowPara1941">Component </flowPara></flowRoot> <path - style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 388.67581,330.15284 L 422.01085,330.15284 L 428.07176,343.28482 L 421.0007,355.40666 L 388.67581,355.40666 L 396.25196,343.28482 L 388.67581,330.15284 z " - id="path1907" /> - <path - style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 501.92825,328.31456 L 535.26329,328.31456 L 541.3242,341.44654 L 534.25314,353.56838 L 501.92825,353.56838 L 509.5044,341.44654 L 501.92825,328.31456 z " - id="path1909" /> - <rect - style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect1911" - width="115.66247" - height="85.862968" - x="567.96918" - y="296.87729" - rx="6.9961648" - ry="7.1230249" /> - <flowRoot - xml:space="preserve" - id="flowRoot1913" - transform="translate(306.80697,90.93874)"><flowRegion - id="flowRegion1915"><rect - id="rect1917" - width="170" - height="61.42857" - x="281.42856" - y="212.66591" /></flowRegion><flowPara - id="flowPara1919">Wharehouse</flowPara><flowPara - id="flowPara1943">Component </flowPara></flowRoot> <path - style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 550.81867,328.72427 L 584.15371,328.72427 L 590.21462,341.85625 L 583.14356,353.97809 L 550.81867,353.97809 L 558.39482,341.85625 L 550.81867,328.72427 z " - id="path1921" /> - <path - style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 664.07111,326.88599 L 697.40615,326.88599 L 703.46706,340.01797 L 696.396,352.13981 L 664.07111,352.13981 L 671.64726,340.01797 L 664.07111,326.88599 z " - id="path1923" /> - <rect - style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect1925" - width="115.66247" - height="85.862968" - x="727.25488" - y="294.73444" - rx="6.9961648" - ry="7.1230249" /> - <flowRoot - xml:space="preserve" - id="flowRoot1927" - transform="translate(472.52126,89.510176)"><flowRegion - id="flowRegion1929"><rect - id="rect1931" - width="170" - height="61.42857" - x="281.42856" - y="212.66591" /></flowRegion><flowPara - id="flowPara1933">Shipper</flowPara><flowPara - id="flowPara1945">Component </flowPara></flowRoot> <path - style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 710.81866,326.58142 L 744.1537,326.58142 L 750.21461,339.7134 L 743.14355,351.83524 L 710.81866,351.83524 L 718.39481,339.7134 L 710.81866,326.58142 z " - id="path1935" /> - <path - style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 824.0711,324.74314 L 857.40614,324.74314 L 863.46705,337.87512 L 856.39599,349.99696 L 824.0711,349.99696 L 831.64725,337.87512 L 824.0711,324.74314 z " - id="path1937" /> - <path - style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 376.42857,343.3802 C 395.71429,343.3802 395.71429,343.3802 395.71429,343.3802" - id="path1947" /> - <path - style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 540.71429,341.23734 C 557.85714,341.23734 557.85714,341.23734 557.85714,341.23734" - id="path1949" /> - <path - style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 702.14286,340.52305 C 717.85714,340.52305 717.85714,340.52305 717.85714,340.52305" - id="path1951" /> - <path - style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 863.57143,337.66591 C 875.71429,337.66591 875.71429,337.66591 875.71429,337.66591 L 875,427.66591 L 212.14286,429.09448 L 210.71429,344.09448 L 231.42857,344.09448" - id="path1953" - inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\supplychain\supplychain.png" - inkscape:export-xdpi="52.84" - inkscape:export-ydpi="52.84" /> - <text - xml:space="preserve" - style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - x="273.57144" - y="359.09448" - id="text2199"><tspan - sodipodi:role="line" - id="tspan2201" - x="273.57144" - y="359.09448">OSGi</tspan></text> - <text - xml:space="preserve" - style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - x="445" - y="359.80878" - id="text2203"><tspan - sodipodi:role="line" - id="tspan2205" - x="445" - y="359.80878">Java</tspan></text> - <text - xml:space="preserve" - style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - x="608.57141" - y="358.38022" - id="text2207"><tspan - sodipodi:role="line" - id="tspan2209" - x="608.57141" - y="358.38022">Java</tspan></text> - <text - xml:space="preserve" - style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - x="772.85712" - y="358.38019" - id="text2211"><tspan - sodipodi:role="line" - id="tspan2213" - x="772.85712" - y="358.38019">OSGi</tspan></text> - </g> -</svg> diff --git a/branches/sca-android/samples/osgi-supplychain/pom.xml b/branches/sca-android/samples/osgi-supplychain/pom.xml deleted file mode 100644 index e2a2e0574e..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/pom.xml +++ /dev/null @@ -1,187 +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>1.4-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - <artifactId>sample-osgi-supplychain</artifactId> - <name>Apache Tuscany SCA OSGi Supply Chain Sample</name> - - <dependencies> - - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.main</artifactId> - <version>1.0.4</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.4-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-osgi</artifactId> - <version>1.4-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.2</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <finalName>sample-osgi-supplychain</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/classes" /> - <property name="files.dir" value="target/classes" /> - <property name="jar.file.name" value="Customer.jar" /> - <property name="manifest.file.name" value="osgi/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/classes" /> - <property name="files.dir" value="target/classes" /> - <property name="jar.file.name" value="Retailer.jar" /> - <property name="manifest.file.name" value="osgi/Retailer.mf" /> - <property name="files.list" - value="supplychain/retailer/Retailer.class \ - supplychain/OSGiBundleImpl.class \ - supplychain/retailer/OSGiRetailerImpl.class" /> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/classes" /> - <property name="files.dir" value="target/classes" /> - <property name="jar.file.name" value="Shipper.jar" /> - <property name="manifest.file.name" value="osgi/Shipper.mf" /> - <property name="files.list" - value="supplychain/shipper/Shipper.class \ - supplychain/OSGiBundleImpl.class \ - supplychain/shipper/OSGiShipperImpl.class" /> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/classes" /> - <property name="files.dir" value="target/classes" /> - <property name="jar.file.name" value="Warehouse.jar" /> - <property name="manifest.file.name" value="osgi/Warehouse.mf" /> - <property name="files.list" - value="supplychain/warehouse/Warehouse.class \ - supplychain/OSGiBundleImpl.class \ - supplychain/warehouse/OSGiWarehouseImpl.class" /> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/classes" /> - <property name="files.dir" value="target/classes" /> - <property name="jar.file.name" value="DSCustomer.jar" /> - <property name="manifest.file.name" value="osgi/ds/Customer.mf" /> - <property name="files.list" - value="supplychain/customer/Customer.class \ - osgi/ds/Customer.xml \ - supplychain/customer/OSGiCustomerComponentImpl.class" /> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/classes" /> - <property name="files.dir" value="target/classes" /> - <property name="jar.file.name" value="DSRetailer.jar" /> - <property name="manifest.file.name" value="osgi/ds/Retailer.mf" /> - <property name="files.list" - value="supplychain/retailer/Retailer.class \ - osgi/ds/Retailer.xml \ - supplychain/retailer/OSGiRetailerComponentImpl.class" /> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/classes" /> - <property name="files.dir" value="target/classes" /> - <property name="jar.file.name" value="DSShipper.jar" /> - <property name="manifest.file.name" value="osgi/ds/Shipper.mf" /> - <property name="files.list" - value="supplychain/shipper/Shipper.class \ - osgi/ds/Shipper.xml \ - supplychain/shipper/OSGiShipperComponentImpl.class" /> - - </ant> - <ant antfile="./build-bundles.xml" target="create-bundles"> - <property name="jar.dir" value="target/classes" /> - <property name="files.dir" value="target/classes" /> - <property name="jar.file.name" value="DSWarehouse.jar" /> - <property name="manifest.file.name" value="osgi/ds/Warehouse.mf" /> - <property name="files.list" - value="supplychain/warehouse/Warehouse.class \ - osgi/ds/Warehouse.xml \ - supplychain/warehouse/OSGiWarehouseComponentImpl.class" /> - - </ant> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java deleted file mode 100644 index 5f40054ada..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java +++ /dev/null @@ -1,121 +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.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; - - -/** - * Common code for all OSGi bundles which dont use declarative services. - * Registers services and sets references. - */ -public class OSGiBundleImpl implements ServiceListener, BundleActivator { - - - String name; - String serviceName; - String[] references; - Class<?>[] referenceClasses; - Field[] referenceFields; - - Class myClass; - - private BundleContext bundleContext; - - public OSGiBundleImpl(String serviceName, String... references) { - - myClass = this.getClass(); - this.name = this.getClass().getSimpleName(); - this.serviceName = serviceName; - this.references = references; - - try { - referenceClasses = new Class[references.length]; - referenceFields = new Field[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(); - } - - } catch (Exception e) { - throw new RuntimeException(e); - } - - } - - public void start(BundleContext bc) { - - System.out.println("Started OSGi bundle with activator " + name); - - this.bundleContext = bc; - - bundleContext.registerService(serviceName, this, new Hashtable()); - - for (int i = 0; i < references.length; i++) { - - try { - - ServiceReference ref = bundleContext.getServiceReference(referenceClasses[i].getName()); - if (ref != null) { - Object obj = bundleContext.getService(ref); - 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 OSGi bundle with activator " + name); - - } - - - 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(); - } - } - - -} diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java deleted file mode 100644 index 64814487cb..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.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; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -import supplychain.customer.Customer; - - -/** - * This client program shows how to create an SCA runtime, start it, - * locate a Customer service component and invoke it. - */ -public class SupplyChainClient { - - public static final void main(String[] args) throws Exception { - SCADomain scaDomain = SCADomain.newInstance("supplychain.composite"); - Customer customer = scaDomain.getService(Customer.class, "CustomerComponent"); - - System.out.println("Main thread " + Thread.currentThread()); - customer.purchaseGoods(); - System.out.println("Main thread sleeping ..."); - Thread.sleep(1000); - - scaDomain.close(); - } -} diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java deleted file mode 100644 index 225dce0236..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.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.customer; - -import org.osoa.sca.annotations.OneWay; - -/** - * This is the business interface of the Customer service component. - */ -public interface Customer { - - public void purchaseGoods(); - - @OneWay - public void notifyShipment(String order); - -} diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java deleted file mode 100644 index 023d716651..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java +++ /dev/null @@ -1,50 +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.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -import supplychain.retailer.Retailer; - -/** - * This class implements the Customer service component (POJO implementation). - */ -@Service(Customer.class) -@Scope("COMPOSITE") -public class JavaCustomerComponentImpl implements Customer { - - private Retailer retailer; - - @Reference - public void setRetailer(Retailer retailer) { - this.retailer = retailer; - } - - public void purchaseGoods() { - retailer.submitOrder("Order"); - } - - public void notifyShipment(String order) { - System.out.print("Work thread " + Thread.currentThread() + " - "); - System.out.println(order); - } - -} diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java deleted file mode 100644 index a1c7fce60a..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java +++ /dev/null @@ -1,51 +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 supplychain.retailer.Retailer; - -/** - * This class implements the Customer service component (OSGi declarative services implementation). - */ -public class OSGiCustomerComponentImpl implements Customer { - - - private Retailer retailer; - - - protected void setRetailer(Retailer retailer) { - this.retailer = retailer; - } - - protected void unsetRetailer(Retailer retailer) { - this.retailer = null; - } - - public void purchaseGoods() { - retailer.submitOrder("Order"); - } - - public void notifyShipment(String order) { - System.out.print("Work thread " + Thread.currentThread() + " - "); - System.out.println(order); - } - - -} diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java deleted file mode 100644 index 4647a716c7..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.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.customer; - - -import supplychain.OSGiBundleImpl; -import supplychain.retailer.Retailer; - -/** - * This class implements the Customer service component (OSGi procedural services implementation). - */ -public class OSGiCustomerImpl extends OSGiBundleImpl implements Customer { - - private Retailer retailer; - - public OSGiCustomerImpl() { - super("supplychain.customer.Customer", "retailer"); - - } - - public void purchaseGoods() { - retailer.submitOrder("Order"); - } - - public void notifyShipment(String order) { - System.out.print("Work thread " + Thread.currentThread() + " - "); - System.out.println(order); - } - - -} diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java deleted file mode 100644 index d0d29f94f8..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java +++ /dev/null @@ -1,53 +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.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -import supplychain.warehouse.Warehouse; - -/** - * This class implements the Retailer service component (POJO implementation). - */ -@Service(Retailer.class) -@Scope("STATELESS") -public class JavaRetailerComponentImpl implements Retailer { - - private Warehouse warehouse; - - - @Reference - public void setWarehouse(Warehouse warehouse) { - this.warehouse = warehouse; - } - - - public void submitOrder(String order) { - - warehouse.fulfillOrder(order + ", submitted"); - - } - - - - -} diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java deleted file mode 100644 index 1b7fb15bf1..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.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.retailer; - -import supplychain.warehouse.Warehouse; - -/** - * This class implements the Retailer service component (OSGi declarative services implementation). - */ -public class OSGiRetailerComponentImpl implements Retailer { - - private Warehouse warehouse; - - - protected void setWarehouse(Warehouse warehouse) { - this.warehouse = warehouse; - } - - protected void unsetWarehouse(Warehouse warehouse) { - this.warehouse = null; - } - - public void submitOrder(String order) { - - warehouse.fulfillOrder(order + ", submitted"); - - } - - -} diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java deleted file mode 100644 index e97331c06c..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java +++ /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. - */ -package supplychain.retailer; - - -import supplychain.OSGiBundleImpl; -import supplychain.warehouse.Warehouse; - -/** - * This class implements the Retailer service component (OSGi procedural services implementation). - */ -public class OSGiRetailerImpl extends OSGiBundleImpl implements Retailer { - - private Warehouse warehouse; - - public OSGiRetailerImpl() { - - super("supplychain.retailer.Retailer", "warehouse"); - } - - public void submitOrder(String order) { - warehouse.fulfillOrder(order + ", submitted"); - - } - - - -} diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java deleted file mode 100644 index 1e87d59af1..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/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-android/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java deleted file mode 100644 index 4206ce7dc8..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.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.shipper; - - -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 (POJO implementation). - */ -@Service(Shipper.class) -@Scope("COMPOSITE") -public class JavaShipperComponentImpl implements Shipper { - - private Customer customer; - - @Reference - public void setCustomer(Customer customer) { - this.customer = customer; - } - - public void processShipment(String order) { - customer.notifyShipment(order + ", shipped"); - } - - -} diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java deleted file mode 100644 index 0f88cca213..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.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.shipper; - - -import supplychain.customer.Customer; - -/** - * This class implements the Shipper service component (OSGi declarative services implementation). - */ -public class OSGiShipperComponentImpl implements Shipper { - - private Customer customer; - - - protected void setCustomer(Customer customer) { - this.customer = customer; - } - - protected void unsetCustomer(Customer customer) { - this.customer = null; - } - - public void processShipment(String order) { - customer.notifyShipment(order + ", shipped"); - } - - -} diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java deleted file mode 100644 index f55a068ede..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java +++ /dev/null @@ -1,42 +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 supplychain.OSGiBundleImpl; -import supplychain.customer.Customer; - -/** - * This class implements the Shipper service component (OSGi procedural services implementation). - */ -public class OSGiShipperImpl extends OSGiBundleImpl implements Shipper { - - private Customer customer; - - public OSGiShipperImpl() { - super("supplychain.shipper.Shipper", "customer"); - } - - - public void processShipment(String order) { - customer.notifyShipment(order + ", shipped"); - } - - -} diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java deleted file mode 100644 index 2514928c10..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/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-android/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java deleted file mode 100644 index 72eec76cc2..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.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.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 (POJO implementation). - */ -@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) { - shipper.processShipment(order + ", fulfilled"); - } - - -} diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java deleted file mode 100644 index 600f3f0c74..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.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.warehouse; - -import supplychain.shipper.Shipper; - -/** - * This class implements the Warehouse service component (OSGi declarative services implementation). - */ - -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) { - shipper.processShipment(order + ", fulfilled"); - - } - - - -} diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java deleted file mode 100644 index b8bca97bd0..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java +++ /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. - */ -package supplychain.warehouse; - - -import supplychain.OSGiBundleImpl; -import supplychain.shipper.Shipper; - -/** - * This class implements the Warehouse service componentm (OSGi procedural services implementation). - */ - -public class OSGiWarehouseImpl extends OSGiBundleImpl implements Warehouse { - - private Shipper shipper; - - public OSGiWarehouseImpl() { - super("supplychain.warehouse.Warehouse", "shipper"); - } - - - public void fulfillOrder(String order) { - shipper.processShipment(order + ", fulfilled"); - - } - - -} diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java b/branches/sca-android/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java deleted file mode 100644 index 6f1f6b8730..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/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-android/samples/osgi-supplychain/src/main/resources/Customer.componentType b/branches/sca-android/samples/osgi-supplychain/src/main/resources/Customer.componentType deleted file mode 100644 index 5c61a0961c..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/Customer.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="supplychain.customer.Customer"> - <interface.java interface="supplychain.customer.Customer"/> - </service> - <reference name="retailer"> - <interface.java interface="supplychain.retailer.Retailer"/> - </reference> - -</componentType>
\ No newline at end of file diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType b/branches/sca-android/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType deleted file mode 100644 index 87a184d968..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/DSCustomer.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="supplychain.customer.Customer">
- <interface.java interface="supplychain.customer.Customer"/>
- </service>
- <reference name="retailer">
- <interface.java interface="supplychain.retailer.Retailer"/>
- </reference>
-
-</componentType>
diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType b/branches/sca-android/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType deleted file mode 100644 index 872ab6601a..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/DSRetailer.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="supplychain.retailer.Retailer">
- <interface.java interface="supplychain.retailer.Retailer"/>
- </service>
- <reference name="warehouse">
- <interface.java interface="supplychain.warehouse.Warehouse"/>
- </reference>
-
-</componentType>
diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/resources/DSShipper.componentType b/branches/sca-android/samples/osgi-supplychain/src/main/resources/DSShipper.componentType deleted file mode 100644 index 57fcbbc5d1..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/DSShipper.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="supplychain.shipper.Shipper">
- <interface.java interface="supplychain.shipper.Shipper"/>
- </service>
- <reference name="customer">
- <interface.java interface="supplychain.customer.Customer"/>
- </reference>
-
-</componentType>
diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType b/branches/sca-android/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType deleted file mode 100644 index 75fa8029f7..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/DSWarehouse.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="supplychain.warehouse.Warehouse">
- <interface.java interface="supplychain.warehouse.Warehouse"/>
- </service>
-
- <reference name="shipper">
- <interface.java interface="supplychain.shipper.Shipper"/>
- </reference>
-</componentType>
diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/resources/Retailer.componentType b/branches/sca-android/samples/osgi-supplychain/src/main/resources/Retailer.componentType deleted file mode 100644 index 15185f2bf9..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/Retailer.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="supplychain.retailer.Retailer"> - <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-android/samples/osgi-supplychain/src/main/resources/Shipper.componentType b/branches/sca-android/samples/osgi-supplychain/src/main/resources/Shipper.componentType deleted file mode 100644 index 675597d80b..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/Shipper.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="supplychain.shipper.Shipper"> - <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-android/samples/osgi-supplychain/src/main/resources/Warehouse.componentType b/branches/sca-android/samples/osgi-supplychain/src/main/resources/Warehouse.componentType deleted file mode 100644 index 6e1ac3e5a9..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/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="supplychain.warehouse.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-android/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf b/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf deleted file mode 100644 index 88d79e5219..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf +++ /dev/null @@ -1,11 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Customer
-Bundle-SymbolicName: 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-android/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf b/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf deleted file mode 100644 index d95ef5d582..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Retailer
-Bundle-SymbolicName: 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-android/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf b/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf deleted file mode 100644 index de7ac7ec7a..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Shipper
-Bundle-SymbolicName: 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-android/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf b/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf deleted file mode 100644 index 21241a6899..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Warehouse
-Bundle-SymbolicName: 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-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf b/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf deleted file mode 100644 index b5c5a862be..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Customer
-Bundle-SymbolicName: ds.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/ds/Customer.xml
diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml b/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml deleted file mode 100644 index 5b368afd5b..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.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="CustomerComponent" immediate="true"> - <implementation class="supplychain.customer.OSGiCustomerComponentImpl" /> - <service> - <provide interface="supplychain.customer.Customer" /> - </service> - <reference - name="retailer" - interface="supplychain.retailer.Retailer" - bind="setRetailer" - unbind="unsetRetailer" - policy="dynamic" - /> -</component> diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf b/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf deleted file mode 100644 index 47897d16ca..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf +++ /dev/null @@ -1,11 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Retailer
-Bundle-SymbolicName: ds.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/ds/Retailer.xml
diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml b/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml deleted file mode 100644 index cae7fdfde2..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.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="RetailerComponent" immediate="true" > - <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" /> - <service> - <provide interface="supplychain.retailer.Retailer" /> - </service> - <reference - name="warehouse" - interface="supplychain.warehouse.Warehouse" - bind="setWarehouse" - unbind="unsetWarehouse" - policy="dynamic" - /> -</component> diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf b/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf deleted file mode 100644 index f5333c7caa..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Shipper
-Bundle-SymbolicName: ds.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/ds/Shipper.xml
diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml b/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml deleted file mode 100644 index d894309b71..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.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="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" - /> -</component> diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf b/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf deleted file mode 100644 index 6166549e5a..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf +++ /dev/null @@ -1,11 +0,0 @@ -Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Warehouse
-Bundle-SymbolicName: ds.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/ds/Warehouse.xml
diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml b/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml deleted file mode 100644 index fc86a76784..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/osgi/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-android/samples/osgi-supplychain/src/main/resources/supplychain.composite b/branches/sca-android/samples/osgi-supplychain/src/main/resources/supplychain.composite deleted file mode 100644 index 0bbfed9176..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/supplychain.composite +++ /dev/null @@ -1,61 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://supplychain"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:sp="http://supplychain"
- name="supplychain">
-
- <component name="CustomerComponent">
- <tuscany:implementation.osgi
- bundleSymbolicName="supplychain.customer.Customer"
- />
-
- <!--implementation.java class="supplychain.customer.JavaCustomerComponentImpl" -->
- <reference name="retailer" target="RetailerComponent" />
- </component>
-
- <component name="RetailerComponent">
- <implementation.java class="supplychain.retailer.JavaRetailerComponentImpl" />
- <!--implementation.osgi
- bundleSymbolicName="supplychain.retailer.Retailer"
- /-->
- <reference name="warehouse" target="WarehouseComponent"/>
- </component>
-
- <component name="WarehouseComponent">
- <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
- <!--implementation.osgi
- bundleSymbolicName="supplychain.warehouse.Warehouse"
- /-->
- <reference name="shipper" target="ShipperComponent" />
- </component>
-
- <component name="ShipperComponent">
- <tuscany:implementation.osgi
- bundleSymbolicName="supplychain.shipper.Shipper"
- />
- <!--implementation.java class="supplychain.shipper.JavaShipperComponentImpl" /-->
- <reference name="customer" target="CustomerComponent" />
- </component>
-
-
-</composite>
diff --git a/branches/sca-android/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite b/branches/sca-android/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite deleted file mode 100644 index d1e11168e2..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite +++ /dev/null @@ -1,61 +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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://supplychain"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:sp="http://supplychain"
- name="supplychain">
-
- <component name="CustomerComponent">
- <tuscany:implementation.osgi
- bundleSymbolicName="ds.supplychain.customer.Customer"
- />
-
- <!--implementation.java class="supplychain.customer.JavaCustomerComponentImpl" -->
- <reference name="retailer" target="RetailerComponent" />
- </component>
-
- <component name="RetailerComponent">
- <implementation.java class="supplychain.retailer.JavaRetailerComponentImpl" />
- <!--tuscany:implementation.osgi
- bundleSymbolicName="ds.supplychain.retailer.Retailer"
- /-->
- <reference name="warehouse" target="WarehouseComponent"/>
- </component>
-
- <component name="WarehouseComponent">
- <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
- <!--implementation.osgi
- bundleSymbolicName="ds.supplychain.warehouse.Warehouse"
- /-->
- <reference name="shipper" target="ShipperComponent" />
- </component>
-
- <component name="ShipperComponent">
- <tuscany:implementation.osgi
- bundleSymbolicName="ds.supplychain.shipper.Shipper"
- />
- <!--implementation.java class="supplychain.shipper.JavaShipperComponentImpl" /-->
- <reference name="customer" target="CustomerComponent" />
- </component>
-
-
-</composite>
diff --git a/branches/sca-android/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java b/branches/sca-android/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java deleted file mode 100644 index ff15c0d9a2..0000000000 --- a/branches/sca-android/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java +++ /dev/null @@ -1,60 +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; - -/** - * This client program shows how to create an SCA runtime, start it, locate a simple HelloWorld service component and - * invoke it. - */ -public class SupplyChainClientTestCase extends TestCase { - - private SCADomain scaDomain; - private Customer customer; - - @Override - protected void setUp() throws Exception { - scaDomain = SCADomain.newInstance("supplychain.composite"); - customer = scaDomain.getService(Customer.class, "CustomerComponent"); - } - - @Override - protected void tearDown() throws Exception { - scaDomain.close(); - } - - - public void test() throws Exception { - - customer.purchaseGoods(); - - System.out.println("Sleeping ..."); - Thread.sleep(2000); - System.out.println("Test complete"); - - } - - -} |
