diff options
Diffstat (limited to 'java/sca/modules/node-impl-osgi/src/test/resources')
9 files changed, 15 insertions, 16 deletions
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF index 41c1264364..0aa9cf047e 100644 --- a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF +++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF @@ -3,13 +3,12 @@ Export-Package: calculator.dosgi;version="1.0.0", calculator.dosgi.operations;version="1.0.0"
Bundle-Version: 1.0.0
Bundle-Name: calculator.dosgi
-Bundle-Activator: calculator.dosgi.CalculatorActivator
+Bundle-Activator: calculator.dosgi.impl.CalculatorActivator
Bundle-ManifestVersion: 2
-Import-Package: calculator.dosgi.operations;version="1.0.0",
- org.osgi.framework,
+Import-Package: org.osgi.framework,
+ org.osgi.service.component;resolution:=optional,
org.osgi.service.packageadmin,
- org.osgi.util.tracker,
- org.osgi.service.component;resolution:=optional
+ org.osgi.util.tracker
Bundle-SymbolicName: calculator.dosgi
Bundle-Vendor: The Apache Software Foundation
Bundle-ActivationPolicy: lazy
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/blueprint/calculator-module.xml b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/blueprint/calculator-module.xml index c61fc295a6..fd834e12ef 100644 --- a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/blueprint/calculator-module.xml +++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/blueprint/calculator-module.xml @@ -19,7 +19,7 @@ --> <!-- A sample module-context.xml for OSGI RFC 124 (BluePrint Service) --> <components xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"> - <component id="CalculatorComponent" class="calculator.dosgi.CalculatorServiceImpl"> + <component id="CalculatorComponent" class="calculator.dosgi.impl.CalculatorServiceImpl"> <property name="addService" ref="AddService" /> <property name="subtractService" ref="SubtractService" /> <property name="multiplyService" ref="MultiplyService" /> diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/calculator-component.xml b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/calculator-component.xml index 3e537df732..5daaa59aae 100644 --- a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/calculator-component.xml +++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/calculator-component.xml @@ -19,7 +19,7 @@ --> <scr:component name="CalculatorComponent" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0"> - <implementation class="calculator.dosgi.CalculatorServiceDSImpl" /> + <implementation class="calculator.dosgi.impl.CalculatorServiceDSImpl" /> <service> <provide interface="calculator.dosgi.CalculatorService" /> </service> diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF index eb15e778b1..ccdb755d56 100644 --- a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF +++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Export-Package: calculator.dosgi.operations;version="1.0.0"
Bundle-Version: 1.0.0
Bundle-Name: calculator.dosgi.operations
-Bundle-Activator: calculator.dosgi.operations.OperationsActivator
+Bundle-Activator: calculator.dosgi.operations.impl.OperationsActivator
Bundle-ManifestVersion: 2
Import-Package: calculator.dosgi.operations;version="1.0.0",
org.osgi.framework,
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/add-component.xml b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/add-component.xml index a7d563023c..99845257ff 100644 --- a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/add-component.xml +++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/add-component.xml @@ -18,7 +18,7 @@ * under the License. --> <scr:component name="AddComponent" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0"> - <implementation class="calculator.dosgi.operations.AddServiceImpl" /> + <implementation class="calculator.dosgi.operations.impl.AddServiceImpl" /> <service> <provide interface="calculator.dosgi.operations.AddService" /> </service> diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/blueprint/operations-module.xml b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/blueprint/operations-module.xml index 6410b55129..f6b5f4690e 100644 --- a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/blueprint/operations-module.xml +++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/blueprint/operations-module.xml @@ -19,13 +19,13 @@ --> <!-- A sample module-context.xml for OSGI RFC 124 (BluePrint Service) --> <components xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"> - <component id="AddComponent" class="calculator.dosgi.operations.AddServiceImpl"> + <component id="AddComponent" class="calculator.dosgi.operations.impl.AddServiceImpl"> </component> - <component id="SubtractComponent" class="calculator.dosgi.operations.SubtractServiceImpl"> + <component id="SubtractComponent" class="calculator.dosgi.operations.impl.SubtractServiceImpl"> </component> - <component id="MultiplyComponent" class="calculator.dosgi.operations.MultiplyServiceImpl"> + <component id="MultiplyComponent" class="calculator.dosgi.operations.impl.MultiplyServiceImpl"> </component> - <component id="DivideComponent" class="calculator.dosgi.operations.DivideServiceImpl"> + <component id="DivideComponent" class="calculator.dosgi.operations.impl.DivideServiceImpl"> </component> <!-- We can derive the SCA services for the implementation.osgi --> diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/divide-component.xml b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/divide-component.xml index def7fce23c..322d4daf2f 100644 --- a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/divide-component.xml +++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/divide-component.xml @@ -18,7 +18,7 @@ * under the License. --> <scr:component name="DivideComponent" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0"> - <implementation class="calculator.dosgi.operations.DivideServiceImpl" /> + <implementation class="calculator.dosgi.operations.impl.DivideServiceImpl" /> <service> <provide interface="calculator.dosgi.operations.DivideService" /> </service> diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/multiply-component.xml b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/multiply-component.xml index 57f627f990..b9ca777bd8 100644 --- a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/multiply-component.xml +++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/multiply-component.xml @@ -18,7 +18,7 @@ * under the License. --> <scr:component name="MultiplyComponent" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0"> - <implementation class="calculator.dosgi.operations.MultiplyServiceImpl" /> + <implementation class="calculator.dosgi.operations.impl.MultiplyServiceImpl" /> <service> <provide interface="calculator.dosgi.operations.MultiplyService" /> </service> diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/subtract-component.xml b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/subtract-component.xml index 073ee5ea40..1472f5a976 100644 --- a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/subtract-component.xml +++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/subtract-component.xml @@ -18,7 +18,7 @@ * under the License. --> <scr:component name="SubtractComponent" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0"> - <implementation class="calculator.dosgi.operations.SubtractServiceImpl" /> + <implementation class="calculator.dosgi.operations.impl.SubtractServiceImpl" /> <service> <provide interface="calculator.dosgi.operations.SubtractService" /> </service> |