You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cl...@apache.org on 2008/12/01 18:44:17 UTC
svn commit: r722146 [1/15] - in /felix/trunk/ipojo:
examples/junit4osgi/felix-command/ examples/junit4osgi/immediate-launcher/
examples/junit4osgi/junit4osgi/ examples/junit4osgi/maven-junit4osgi-plugin/
examples/junit4osgi/swing-runner/ tests/composit...
Author: clement
Date: Mon Dec 1 09:44:13 2008
New Revision: 722146
URL: http://svn.apache.org/viewvc?rev=722146&view=rev
Log:
Migrate the test suites to the new junit4osgi development model (use getContext() to get the bundle context instead of context).
Add <parent> in pom files
Removed:
felix/trunk/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/util/
Modified:
felix/trunk/ipojo/examples/junit4osgi/felix-command/metadata.xml
felix/trunk/ipojo/examples/junit4osgi/felix-command/pom.xml
felix/trunk/ipojo/examples/junit4osgi/immediate-launcher/metadata.xml
felix/trunk/ipojo/examples/junit4osgi/immediate-launcher/pom.xml
felix/trunk/ipojo/examples/junit4osgi/junit4osgi/metadata.xml
felix/trunk/ipojo/examples/junit4osgi/junit4osgi/pom.xml
felix/trunk/ipojo/examples/junit4osgi/maven-junit4osgi-plugin/pom.xml
felix/trunk/ipojo/examples/junit4osgi/swing-runner/metadata.xml
felix/trunk/ipojo/examples/junit4osgi/swing-runner/pom.xml
felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/component/FooProviderType1.java
felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/EmptyCompositeTest.java
felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/FactoryManagementTest.java
felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/ServiceRangeTest.java
felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/ServiceRegistryTest.java
felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/FilteredExport.java
felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/MultipleExport.java
felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/OptionalExport.java
felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/OptionalMultipleExport.java
felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/SimpleExport.java
felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedFilteredImport.java
felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedMultipleImport.java
felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedOptionalImport.java
felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedOptionalMultipleImport.java
felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedSimpleImport.java
felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/FilteredImport.java
felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/MultipleImport.java
felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/OptionalImport.java
felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/OptionalMultipleImport.java
felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/SimpleImport.java
felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instance/InstanceScopeTest.java
felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instance/SimpleInstance.java
felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/ConfigurableInstantiation.java
felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/MultipleInstantiation.java
felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/OptionalInstantiation.java
felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/OptionalMultipleInstantiation.java
felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/SimpleInstantiation.java
felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp0.java
felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp1.java
felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp2.java
felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp3.java
felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp4.java
felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp5.java
felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp6.java
felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp7.java
felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp8.java
felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/test/CompositeTest.java
felix/trunk/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/annotations/AggregateDependency.java
felix/trunk/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/annotations/Architecture.java
felix/trunk/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/annotations/Dependency.java
felix/trunk/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/annotations/EventAdmin.java
felix/trunk/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/annotations/Extender.java
felix/trunk/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/annotations/Factory.java
felix/trunk/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/annotations/FilteredDependency.java
felix/trunk/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/annotations/JMX.java
felix/trunk/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/annotations/LifecycleCallbacks.java
felix/trunk/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/annotations/LifecycleController.java
felix/trunk/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/annotations/OptionalDependency.java
felix/trunk/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/annotations/PolicyDependency.java
felix/trunk/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/annotations/Properties.java
felix/trunk/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/annotations/RankedDependency.java
felix/trunk/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/annotations/ServiceProdiving.java
felix/trunk/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/annotations/TemporalDependencies.java
felix/trunk/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/annotations/WhiteBoard.java
felix/trunk/ipojo/tests/core/bad-configurations/src/main/java/org/apache/felix/ipojo/test/scenarios/bad/BadFactories.java
felix/trunk/ipojo/tests/core/bad-configurations/src/main/java/org/apache/felix/ipojo/test/scenarios/bad/BadLFCCallback.java
felix/trunk/ipojo/tests/core/bad-configurations/src/main/java/org/apache/felix/ipojo/test/scenarios/bad/BadLFCController.java
felix/trunk/ipojo/tests/core/bad-configurations/src/main/java/org/apache/felix/ipojo/test/scenarios/bad/BadServiceDependencies.java
felix/trunk/ipojo/tests/core/configadmin/src/main/java/org/apache/felix/ipojo/test/scenarios/configadmin/ManagedServiceFactoryTestForImmediate.java
felix/trunk/ipojo/tests/core/configadmin/src/main/java/org/apache/felix/ipojo/test/scenarios/configadmin/ManagedServiceFactoryTestForServices.java
felix/trunk/ipojo/tests/core/configadmin/src/main/java/org/apache/felix/ipojo/test/scenarios/configadmin/ManagedServiceTestForImmediate.java
felix/trunk/ipojo/tests/core/configadmin/src/main/java/org/apache/felix/ipojo/test/scenarios/configadmin/ManagedServiceTestForService.java
felix/trunk/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/DynamicallyConfigurableProperties.java
felix/trunk/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/ManagedServiceConfigurableProperties.java
felix/trunk/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/SimpleProperties.java
felix/trunk/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/TestBothProperties.java
felix/trunk/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/TestComplexProperties.java
felix/trunk/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/TestFieldProperties.java
felix/trunk/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/TestMethodProperties.java
felix/trunk/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/TestPropertyModifier.java
felix/trunk/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/TestSuperMethodProperties.java
felix/trunk/ipojo/tests/core/external-handlers/src/main/java/org/apache/felix/ipojo/test/scenarios/component/FooProviderType1.java
felix/trunk/ipojo/tests/core/external-handlers/src/main/java/org/apache/felix/ipojo/test/scenarios/eh/HandlerTest.java
felix/trunk/ipojo/tests/core/factories/src/main/java/org/apache/felix/ipojo/test/scenarios/component/FooProviderType1.java
felix/trunk/ipojo/tests/core/factories/src/main/java/org/apache/felix/ipojo/test/scenarios/factories/ComponentDesc.java
felix/trunk/ipojo/tests/core/factories/src/main/java/org/apache/felix/ipojo/test/scenarios/factories/ConfigAdminTest.java
felix/trunk/ipojo/tests/core/factories/src/main/java/org/apache/felix/ipojo/test/scenarios/factories/FactoryProps.java
felix/trunk/ipojo/tests/core/factories/src/main/java/org/apache/felix/ipojo/test/scenarios/factories/ObedienceTest.java
felix/trunk/ipojo/tests/core/factories/src/main/java/org/apache/felix/ipojo/test/scenarios/factories/UnacceptableConfigurationTest.java
felix/trunk/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/component/FooProviderType1.java
felix/trunk/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/CallbackTestCase.java
felix/trunk/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/ImmediateCallbackSeveralFactoryTest.java
felix/trunk/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/ImmediateCallbackSingletonFactoryTest.java
felix/trunk/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/ImmediateCallbackTest.java
felix/trunk/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/ImmediateLifeCycleControllerTest.java
felix/trunk/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/ParentCallbackTestCase.java
felix/trunk/ipojo/tests/core/lifecycle-controller/src/main/java/org/apache/felix/ipojo/test/scenarios/lfc/ImmediateLifeCycleControllerTest.java
felix/trunk/ipojo/tests/core/lifecycle-controller/src/main/java/org/apache/felix/ipojo/test/scenarios/lfc/LifeCycleControllerTest.java
felix/trunk/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/dynamic/priority/SimpleDPDependencies.java
felix/trunk/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/statics/MethodOptionalDependencies.java
felix/trunk/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/statics/MethodSimpleDependencies.java
felix/trunk/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/statics/MultipleDependencies.java
felix/trunk/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/statics/OptionalDependencies.java
felix/trunk/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/statics/SimpleDependencies.java
felix/trunk/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/FromDependencies.java
felix/trunk/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/MultipleFilterDependencies.java
felix/trunk/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/OptionalMultipleFilterDependencies.java
felix/trunk/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/OptionalSimpleFilterDependencies.java
felix/trunk/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/SimpleFilterDependencies.java
felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/component/FooProviderType1.java
felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/CollectionMultipleDependencies.java
felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/DelayedMultipleDependencies.java
felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/DelayedOptionalDependencies.java
felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/DelayedOptionalMultipleDependencies.java
felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/DelayedSimpleDependencies.java
felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/DependencyArchitectureTest.java
felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/ListMultipleDependencies.java
felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodDelayedMultipleDependencies.java
felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodDelayedOptionalDependencies.java
felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodDelayedOptionalMultipleDependencies.java
felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodDelayedSimpleDependencies.java
felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodMultipleDependencies.java
felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodOptionalDependencies.java
felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodOptionalMultipleDependencies.java
felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodSimpleDependencies.java
felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MultipleDependencies.java
felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/OptionalDependencies.java
felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/OptionalMultipleDependencies.java
felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/OptionalNoNullableDependencies.java
felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/SetMultipleDependencies.java
felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/SimpleDependencies.java
felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/VectorMultipleDependencies.java
felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/di/DelayedOptionalDependencies.java
felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/di/MethodDelayedOptionalDependencies.java
felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/di/MethodOptionalDependencies.java
felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/di/OptionalDependencies.java
felix/trunk/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/component/FooProviderType1.java
felix/trunk/ipojo/tests/handler/eventadmin/src/main/java/org/apache/felix/ipojo/test/BadTests.java
felix/trunk/ipojo/tests/handler/eventadmin/src/main/java/org/apache/felix/ipojo/test/GoodTests.java
felix/trunk/ipojo/tests/integration-tests/pom.xml
felix/trunk/ipojo/tests/manipulator/creation/src/main/java/org/apache/felix/ipojo/test/scenarios/component/FooProviderType1.java
felix/trunk/ipojo/tests/manipulator/creation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/POJOCreation.java
felix/trunk/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/component/FooProviderType1.java
felix/trunk/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/ExceptionTest.java
felix/trunk/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/GetComponentInstanceTest.java
felix/trunk/ipojo/tests/manipulator/manipulator-java5/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/Annotation.java
felix/trunk/ipojo/tests/manipulator/metadata/src/main/java/org/apache/felix/ipojo/test/scenarios/component/FooProviderType1.java
Modified: felix/trunk/ipojo/examples/junit4osgi/felix-command/metadata.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/junit4osgi/felix-command/metadata.xml?rev=722146&r1=722145&r2=722146&view=diff
==============================================================================
--- felix/trunk/ipojo/examples/junit4osgi/felix-command/metadata.xml (original)
+++ felix/trunk/ipojo/examples/junit4osgi/felix-command/metadata.xml Mon Dec 1 09:44:13 2008
@@ -16,7 +16,6 @@
specific language governing permissions and limitations
under the License.
-->
-<?xml version="1.0" encoding="UTF-8"?>
<iPOJO>
<component
className="org.apache.felix.ipojo.junit4osgi.command.JunitCommand"
Modified: felix/trunk/ipojo/examples/junit4osgi/felix-command/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/junit4osgi/felix-command/pom.xml?rev=722146&r1=722145&r2=722146&view=diff
==============================================================================
--- felix/trunk/ipojo/examples/junit4osgi/felix-command/pom.xml (original)
+++ felix/trunk/ipojo/examples/junit4osgi/felix-command/pom.xml Mon Dec 1 09:44:13 2008
@@ -17,13 +17,17 @@
under the License.
-->
<project>
+ <parent>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix</artifactId>
+ <version>1.0.2</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>Junit4Osgi-Felix-Command</name>
<artifactId>
org.apache.felix.ipojo.junit4osgi.felix-command
</artifactId>
- <groupId>org.apache.felix</groupId>
<version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
Modified: felix/trunk/ipojo/examples/junit4osgi/immediate-launcher/metadata.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/junit4osgi/immediate-launcher/metadata.xml?rev=722146&r1=722145&r2=722146&view=diff
==============================================================================
--- felix/trunk/ipojo/examples/junit4osgi/immediate-launcher/metadata.xml (original)
+++ felix/trunk/ipojo/examples/junit4osgi/immediate-launcher/metadata.xml Mon Dec 1 09:44:13 2008
@@ -16,7 +16,6 @@
specific language governing permissions and limitations
under the License.
-->
-<?xml version="1.0" encoding="UTF-8"?>
<iPOJO>
<component
className="org.apache.felix.ipojo.junit4osgi.command.ImmediateRunner"
Modified: felix/trunk/ipojo/examples/junit4osgi/immediate-launcher/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/junit4osgi/immediate-launcher/pom.xml?rev=722146&r1=722145&r2=722146&view=diff
==============================================================================
--- felix/trunk/ipojo/examples/junit4osgi/immediate-launcher/pom.xml (original)
+++ felix/trunk/ipojo/examples/junit4osgi/immediate-launcher/pom.xml Mon Dec 1 09:44:13 2008
@@ -17,13 +17,17 @@
under the License.
-->
<project>
+ <parent>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix</artifactId>
+ <version>1.0.2</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>Junit4Osgi-Immediate-Runner</name>
<artifactId>
org.apache.felix.ipojo.junit4osgi.immediate-runner
</artifactId>
- <groupId>org.apache.felix</groupId>
<version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
Modified: felix/trunk/ipojo/examples/junit4osgi/junit4osgi/metadata.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/junit4osgi/junit4osgi/metadata.xml?rev=722146&r1=722145&r2=722146&view=diff
==============================================================================
--- felix/trunk/ipojo/examples/junit4osgi/junit4osgi/metadata.xml (original)
+++ felix/trunk/ipojo/examples/junit4osgi/junit4osgi/metadata.xml Mon Dec 1 09:44:13 2008
@@ -16,7 +16,6 @@
specific language governing permissions and limitations
under the License.
-->
-<?xml version="1.0" encoding="UTF-8"?>
<ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/schemas/core.xsd
org.apache.felix.ipojo.extender http://people.apache.org/~clement/ipojo/schemas/extender-pattern.xsd"
Modified: felix/trunk/ipojo/examples/junit4osgi/junit4osgi/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/junit4osgi/junit4osgi/pom.xml?rev=722146&r1=722145&r2=722146&view=diff
==============================================================================
--- felix/trunk/ipojo/examples/junit4osgi/junit4osgi/pom.xml (original)
+++ felix/trunk/ipojo/examples/junit4osgi/junit4osgi/pom.xml Mon Dec 1 09:44:13 2008
@@ -17,11 +17,15 @@
under the License.
-->
<project>
+ <parent>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix</artifactId>
+ <version>1.0.2</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>Junit4Osgi</name>
<artifactId>org.apache.felix.ipojo.junit4osgi</artifactId>
- <groupId>org.apache.felix</groupId>
<version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
Modified: felix/trunk/ipojo/examples/junit4osgi/maven-junit4osgi-plugin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/junit4osgi/maven-junit4osgi-plugin/pom.xml?rev=722146&r1=722145&r2=722146&view=diff
==============================================================================
--- felix/trunk/ipojo/examples/junit4osgi/maven-junit4osgi-plugin/pom.xml (original)
+++ felix/trunk/ipojo/examples/junit4osgi/maven-junit4osgi-plugin/pom.xml Mon Dec 1 09:44:13 2008
@@ -18,8 +18,12 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix</artifactId>
+ <version>1.0.2</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.felix</groupId>
<artifactId>maven-junit4osgi-plugin</artifactId>
<packaging>maven-plugin</packaging>
<version>1.1.0-SNAPSHOT</version>
Modified: felix/trunk/ipojo/examples/junit4osgi/swing-runner/metadata.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/junit4osgi/swing-runner/metadata.xml?rev=722146&r1=722145&r2=722146&view=diff
==============================================================================
--- felix/trunk/ipojo/examples/junit4osgi/swing-runner/metadata.xml (original)
+++ felix/trunk/ipojo/examples/junit4osgi/swing-runner/metadata.xml Mon Dec 1 09:44:13 2008
@@ -16,7 +16,6 @@
specific language governing permissions and limitations
under the License.
-->
-<?xml version="1.0" encoding="UTF-8"?>
<iPOJO>
<component
classname="org.apache.felix.ipojo.junit4osgi.command.SwingRunner">
Modified: felix/trunk/ipojo/examples/junit4osgi/swing-runner/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/examples/junit4osgi/swing-runner/pom.xml?rev=722146&r1=722145&r2=722146&view=diff
==============================================================================
--- felix/trunk/ipojo/examples/junit4osgi/swing-runner/pom.xml (original)
+++ felix/trunk/ipojo/examples/junit4osgi/swing-runner/pom.xml Mon Dec 1 09:44:13 2008
@@ -17,11 +17,15 @@
under the License.
-->
<project>
+ <parent>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix</artifactId>
+ <version>1.0.2</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>Junit4Osgi-Swing-GUI</name>
<artifactId>org.apache.felix.ipojo.junit4osgi.swing-gui</artifactId>
- <groupId>org.apache.felix</groupId>
<version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
Modified: felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/component/FooProviderType1.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/component/FooProviderType1.java?rev=722146&r1=722145&r2=722146&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/component/FooProviderType1.java (original)
+++ felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/component/FooProviderType1.java Mon Dec 1 09:44:13 2008
@@ -37,7 +37,7 @@
if (bc ==null) {
throw new RuntimeException("Injected bundle context null");
}
- m_context = bc;
+ m_context = bc;
}
public boolean foo() {
Modified: felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/EmptyCompositeTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/EmptyCompositeTest.java?rev=722146&r1=722145&r2=722146&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/EmptyCompositeTest.java (original)
+++ felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/EmptyCompositeTest.java Mon Dec 1 09:44:13 2008
@@ -33,7 +33,7 @@
public class EmptyCompositeTest extends OSGiTestCase {
public void testEmptyCompositeCreation() {
- Factory factory = Utils.getFactoryByName(context, "composite.empty");
+ Factory factory = Utils.getFactoryByName(getContext(), "composite.empty");
Properties props = new Properties();
props.put("instance.name","empty");
@@ -61,7 +61,7 @@
CompositeManager cm = (CompositeManager) ci;
ServiceContext sc = cm.getServiceContext();
try {
- assertEquals("Check number of factories imported", sc.getServiceReferences(Factory.class.getName(), null).length, context.getServiceReferences(Factory.class.getName(), null).length);
+ assertEquals("Check number of factories imported", sc.getServiceReferences(Factory.class.getName(), null).length, getContext().getServiceReferences(Factory.class.getName(), null).length);
} catch (InvalidSyntaxException e) {
fail("Invalid filter : " + e.getMessage());
}
@@ -69,7 +69,7 @@
}
public void testInstanceCreation1() {
- Factory factory = Utils.getFactoryByName(context, "composite.empty");
+ Factory factory = Utils.getFactoryByName(getContext(), "composite.empty");
Properties props = new Properties();
props.put("instance.name","empty");
@@ -85,7 +85,7 @@
CompositeManager cm = (CompositeManager) ci;
ServiceContext sc = cm.getServiceContext();
try {
- assertEquals("Check number of factories imported", sc.getServiceReferences(Factory.class.getName(), null).length, context.getServiceReferences(Factory.class.getName(), null).length);
+ assertEquals("Check number of factories imported", sc.getServiceReferences(Factory.class.getName(), null).length, getContext().getServiceReferences(Factory.class.getName(), null).length);
} catch (InvalidSyntaxException e) {
fail("Invalid filter : " + e.getMessage());
}
@@ -119,7 +119,7 @@
}
public void testInstanceCreation2() {
- Factory factory = Utils.getFactoryByName(context, "composite.empty");
+ Factory factory = Utils.getFactoryByName(getContext(), "composite.empty");
Properties props = new Properties();
props.put("instance.name","empty");
@@ -134,7 +134,7 @@
CompositeManager cm = (CompositeManager) ci;
ServiceContext sc = cm.getServiceContext();
try {
- assertEquals("Check number of factories imported", sc.getServiceReferences(Factory.class.getName(), null).length, context.getServiceReferences(Factory.class.getName(), null).length);
+ assertEquals("Check number of factories imported", sc.getServiceReferences(Factory.class.getName(), null).length, getContext().getServiceReferences(Factory.class.getName(), null).length);
} catch (InvalidSyntaxException e) {
fail("Invalid filter : " + e.getMessage());
}
@@ -169,7 +169,7 @@
}
public void testInstanceCreation3() {
- Factory factory = Utils.getFactoryByName(context, "composite.empty");
+ Factory factory = Utils.getFactoryByName(getContext(), "composite.empty");
Properties props = new Properties();
props.put("instance.name","empty");
@@ -184,7 +184,7 @@
CompositeManager cm = (CompositeManager) ci;
ServiceContext sc = cm.getServiceContext();
try {
- assertEquals("Check number of factories imported", sc.getServiceReferences(Factory.class.getName(), null).length, context.getServiceReferences(Factory.class.getName(), null).length);
+ assertEquals("Check number of factories imported", sc.getServiceReferences(Factory.class.getName(), null).length, getContext().getServiceReferences(Factory.class.getName(), null).length);
} catch (InvalidSyntaxException e) {
fail("Invalid filter : " + e.getMessage());
}
Modified: felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/FactoryManagementTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/FactoryManagementTest.java?rev=722146&r1=722145&r2=722146&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/FactoryManagementTest.java (original)
+++ felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/FactoryManagementTest.java Mon Dec 1 09:44:13 2008
@@ -62,12 +62,12 @@
public ComponentTypeDescription getComponentDescription() { return null; }
public String getClassName() { return ""; }
public int getState() { return Factory.VALID; }
- public BundleContext getBundleContext() { return context; }
+ public BundleContext getBundleContext() { return getContext(); }
}
public void setUp() {
- emptyFactory = Utils.getFactoryByName(context, "composite.empty");
+ emptyFactory = Utils.getFactoryByName(getContext(), "composite.empty");
Properties props = new Properties();
props.put("instance.name","empty-1");
try {
@@ -81,20 +81,20 @@
}
public void testOneLevelExposition() {
- ServiceReference[] parentsFactoryReferences = Utils.getServiceReferences(context, Factory.class.getName(), null);
+ ServiceReference[] parentsFactoryReferences = Utils.getServiceReferences(getContext(), Factory.class.getName(), null);
ServiceContext sc = Utils.getServiceContext(empty);
ServiceReference[] internalFactoryReferences = Utils.getServiceReferences(sc, Factory.class.getName(), null);
assertEquals("Check the number of available factories", parentsFactoryReferences.length, internalFactoryReferences.length);
for(int i = 0; i < parentsFactoryReferences.length; i++) {
- Factory factory = (Factory) context.getService(parentsFactoryReferences[i]);
+ Factory factory = (Factory) getContext().getService(parentsFactoryReferences[i]);
assertTrue("Check the avaibility of " + factory.getName(), isExposed(factory, internalFactoryReferences, sc));
}
}
public void testTwoLevelExposition() {
- ServiceReference[] parentsFactoryReferences = Utils.getServiceReferences(context, Factory.class.getName(), null);
+ ServiceReference[] parentsFactoryReferences = Utils.getServiceReferences(getContext(), Factory.class.getName(), null);
ServiceContext sc1 = Utils.getServiceContext(empty);
ServiceReference[] Level1FactoryReferences = Utils.getServiceReferences(sc1, Factory.class.getName(), null);
@@ -116,7 +116,7 @@
assertEquals("Check the number of available factories - 3", Level1FactoryReferences.length, Level2FactoryReferences.length);
for(int i = 0; i < Level1FactoryReferences.length; i++) {
- Factory factory = (Factory) context.getService(parentsFactoryReferences[i]);
+ Factory factory = (Factory) getContext().getService(parentsFactoryReferences[i]);
assertTrue("Check the avaibility of " + factory.getName(), isExposed(factory, Level2FactoryReferences, sc2));
}
@@ -124,7 +124,7 @@
}
public void testDynamism() {
- ServiceReference[] parentsFactoryReferences = Utils.getServiceReferences(context, Factory.class.getName(), null);
+ ServiceReference[] parentsFactoryReferences = Utils.getServiceReferences(getContext(), Factory.class.getName(), null);
ServiceContext sc1 = Utils.getServiceContext(empty);
ServiceReference[] Level1FactoryReferences = Utils.getServiceReferences(sc1, Factory.class.getName(), null);
@@ -146,14 +146,14 @@
assertEquals("Check the number of available factories - 3", Level1FactoryReferences.length, Level2FactoryReferences.length);
for(int i = 0; i < Level1FactoryReferences.length; i++) {
- Factory factory = (Factory) context.getService(parentsFactoryReferences[i]);
+ Factory factory = (Factory) getContext().getService(parentsFactoryReferences[i]);
assertTrue("Check the avaibility of " + factory.getName(), isExposed(factory, Level2FactoryReferences, sc2));
}
// Publish fake1
- ServiceRegistration reg1 = context.registerService(Factory.class.getName(), fake1, null);
+ ServiceRegistration reg1 = getContext().registerService(Factory.class.getName(), fake1, null);
- parentsFactoryReferences = Utils.getServiceReferences(context, Factory.class.getName(), null);
+ parentsFactoryReferences = Utils.getServiceReferences(getContext(), Factory.class.getName(), null);
sc1 = Utils.getServiceContext(empty);
Level1FactoryReferences = Utils.getServiceReferences(sc1, Factory.class.getName(), null);
sc2 = Utils.getServiceContext(empty2);
@@ -164,9 +164,9 @@
assertEquals("Check the number of available factories - 1.3", Level1FactoryReferences.length, Level2FactoryReferences.length);
// Publish fake2
- ServiceRegistration reg2 = context.registerService(Factory.class.getName(), fake2, null);
+ ServiceRegistration reg2 = getContext().registerService(Factory.class.getName(), fake2, null);
- parentsFactoryReferences = Utils.getServiceReferences(context, Factory.class.getName(), null);
+ parentsFactoryReferences = Utils.getServiceReferences(getContext(), Factory.class.getName(), null);
sc1 = Utils.getServiceContext(empty);
Level1FactoryReferences = Utils.getServiceReferences(sc1, Factory.class.getName(), null);
sc2 = Utils.getServiceContext(empty2);
@@ -178,7 +178,7 @@
reg1.unregister();
- parentsFactoryReferences = Utils.getServiceReferences(context, Factory.class.getName(), null);
+ parentsFactoryReferences = Utils.getServiceReferences(getContext(), Factory.class.getName(), null);
sc1 = Utils.getServiceContext(empty);
Level1FactoryReferences = Utils.getServiceReferences(sc1, Factory.class.getName(), null);
sc2 = Utils.getServiceContext(empty2);
@@ -190,7 +190,7 @@
reg2.unregister();
- parentsFactoryReferences = Utils.getServiceReferences(context, Factory.class.getName(), null);
+ parentsFactoryReferences = Utils.getServiceReferences(getContext(), Factory.class.getName(), null);
sc1 = Utils.getServiceContext(empty);
Level1FactoryReferences = Utils.getServiceReferences(sc1, Factory.class.getName(), null);
sc2 = Utils.getServiceContext(empty2);
Modified: felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/ServiceRangeTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/ServiceRangeTest.java?rev=722146&r1=722145&r2=722146&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/ServiceRangeTest.java (original)
+++ felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/ServiceRangeTest.java Mon Dec 1 09:44:13 2008
@@ -37,7 +37,7 @@
public void setUp() {
- emptyFactory = Utils.getFactoryByName(context, "composite.empty");
+ emptyFactory = Utils.getFactoryByName(getContext(), "composite.empty");
Properties props = new Properties();
props.put("instance.name","empty-1");
try {
@@ -82,9 +82,9 @@
assertNotNull("Check foo service visible inside the composite", sc2.getServiceReference(FooService.class.getName()));
assertNotNull("Check check service visible inside the composite", sc2.getServiceReference(CheckService.class.getName()));
// Check invisibilty
- assertNull("Check foo service invisible inside the context", context.getServiceReference(FooService.class.getName()));
+ assertNull("Check foo service invisible inside the context", getContext().getServiceReference(FooService.class.getName()));
try {
- assertNull("Check check service invisible inside the context", context.getServiceReferences(CheckService.class.getName(), "(instance.name=client)"));
+ assertNull("Check check service invisible inside the context", getContext().getServiceReferences(CheckService.class.getName(), "(instance.name=client)"));
} catch (InvalidSyntaxException e) {
fail("Invalid filter : " + e);
}
@@ -94,9 +94,9 @@
assertNull("Check foo service invisible inside the composite", sc2.getServiceReference(FooService.class.getName()));
assertNull("Check check service invisible inside the composite", sc2.getServiceReference(CheckService.class.getName()));
- assertNull("Check foo service invisible from the context", context.getServiceReference(FooService.class.getName()));
+ assertNull("Check foo service invisible from the context", getContext().getServiceReference(FooService.class.getName()));
try {
- assertNull("Check check service invisible inside the context", context.getServiceReferences(CheckService.class.getName(), "(instance.name=client)"));
+ assertNull("Check check service invisible inside the context", getContext().getServiceReferences(CheckService.class.getName(), "(instance.name=client)"));
} catch (InvalidSyntaxException e) {
fail("Invalid filter : " + e);
}
@@ -134,9 +134,9 @@
assertNotNull("Check foo service visible inside the composite", sc2.getServiceReference(FooService.class.getName()));
assertNotNull("Check check service visible inside the composite", sc2.getServiceReference(CheckService.class.getName()));
// Check invisibilty
- assertNull("Check foo service invisible inside the context", context.getServiceReference(FooService.class.getName()));
+ assertNull("Check foo service invisible inside the context", getContext().getServiceReference(FooService.class.getName()));
try {
- assertNull("Check check service invisible inside the context", context.getServiceReferences(CheckService.class.getName(), "(instance.name=client)"));
+ assertNull("Check check service invisible inside the context", getContext().getServiceReferences(CheckService.class.getName(), "(instance.name=client)"));
} catch (InvalidSyntaxException e) {
fail("Invalid filter : " + e);
}
@@ -146,9 +146,9 @@
assertNull("Check foo service visible inside the composite 2", sc2.getServiceReference(FooService.class.getName()));
assertNull("Check check service visible inside the composite 2", sc2.getServiceReference(CheckService.class.getName()));
- assertNull("Check foo service invisible inside the global", context.getServiceReference(FooService.class.getName()));
+ assertNull("Check foo service invisible inside the global", getContext().getServiceReference(FooService.class.getName()));
try {
- assertNull("Check check service invisible inside the context", context.getServiceReferences(CheckService.class.getName(), "(instance.name=client)"));
+ assertNull("Check check service invisible inside the context", getContext().getServiceReferences(CheckService.class.getName(), "(instance.name=client)"));
} catch (InvalidSyntaxException e) {
fail("Invalid filter : " + e);
}
@@ -157,7 +157,7 @@
public void testLevelOne3() {
ServiceContext sc2 = Utils.getServiceContext(empty);
- Factory fact1 = Utils.getFactoryByName(context, "COMPO-SimpleCheckServiceProvider");
+ Factory fact1 = Utils.getFactoryByName(getContext(), "COMPO-SimpleCheckServiceProvider");
Properties props = new Properties();
props.put("instance.name","client");
ComponentInstance client = null;
@@ -165,7 +165,7 @@
client = fact1.createComponentInstance(props, sc2);
} catch(Exception e) { fail("Cannot instantiate the client : " + e.getMessage()); }
- Factory fact2 = Utils.getFactoryByName(context, "COMPO-FooProviderType-1");
+ Factory fact2 = Utils.getFactoryByName(getContext(), "COMPO-FooProviderType-1");
Properties props2 = new Properties();
props2.put("instance.name","provider");
ComponentInstance provider = null;
@@ -186,9 +186,9 @@
assertNotNull("Check foo service visible inside the composite", sc2.getServiceReference(FooService.class.getName()));
assertNotNull("Check check service visible inside the composite", sc2.getServiceReference(CheckService.class.getName()));
// Check invisibilty
- assertNull("Check foo service invisible inside the context", context.getServiceReference(FooService.class.getName()));
+ assertNull("Check foo service invisible inside the context", getContext().getServiceReference(FooService.class.getName()));
try {
- assertNull("Check check service invisible inside the context", context.getServiceReferences(CheckService.class.getName(), "(instance.name=client)"));
+ assertNull("Check check service invisible inside the context", getContext().getServiceReferences(CheckService.class.getName(), "(instance.name=client)"));
} catch (InvalidSyntaxException e) {
fail("Invalid filter : " + e);
}
@@ -198,9 +198,9 @@
assertNull("Check foo service visible inside the composite 2", sc2.getServiceReference(FooService.class.getName()));
assertNull("Check check service visible inside the composite 2", sc2.getServiceReference(CheckService.class.getName()));
- assertNull("Check foo service invisible inside the global", context.getServiceReference(FooService.class.getName()));
+ assertNull("Check foo service invisible inside the global", getContext().getServiceReference(FooService.class.getName()));
try {
- assertNull("Check check service invisible inside the context", context.getServiceReferences(CheckService.class.getName(), "(instance.name=client)"));
+ assertNull("Check check service invisible inside the context", getContext().getServiceReferences(CheckService.class.getName(), "(instance.name=client)"));
} catch (InvalidSyntaxException e) {
fail("Invalid filter : " + e);
}
@@ -251,9 +251,9 @@
// Check invisibilty
assertNull("Check foo service invisible inside the composite 1", sc1.getServiceReference(FooService.class.getName()));
assertNull("Check check service invisible inside the composite 1", sc1.getServiceReference(CheckService.class.getName()));
- assertNull("Check foo service invisible inside the global", context.getServiceReference(FooService.class.getName()));
+ assertNull("Check foo service invisible inside the global", getContext().getServiceReference(FooService.class.getName()));
try {
- assertNull("Check check service invisible inside the context", context.getServiceReferences(CheckService.class.getName(), "(instance.name=client)"));
+ assertNull("Check check service invisible inside the context", getContext().getServiceReferences(CheckService.class.getName(), "(instance.name=client)"));
} catch (InvalidSyntaxException e) {
fail("Invalid filter : " + e);
}
@@ -265,9 +265,9 @@
assertNull("Check check service visible inside the composite 2", sc2.getServiceReference(CheckService.class.getName()));
assertNull("Check foo service invisible inside the composite 1", sc1.getServiceReference(FooService.class.getName()));
assertNull("Check check service invisible inside the composite 1", sc1.getServiceReference(CheckService.class.getName()));
- assertNull("Check foo service invisible inside the global", context.getServiceReference(FooService.class.getName()));
+ assertNull("Check foo service invisible inside the global", getContext().getServiceReference(FooService.class.getName()));
try {
- assertNull("Check check service invisible inside the context", context.getServiceReferences(CheckService.class.getName(), "(instance.name=client)"));
+ assertNull("Check check service invisible inside the context", getContext().getServiceReferences(CheckService.class.getName(), "(instance.name=client)"));
} catch (InvalidSyntaxException e) {
fail("Invalid filter : " + e);
}
@@ -319,9 +319,9 @@
// Check invisibilty
assertNull("Check foo service invisible inside the composite 1", sc1.getServiceReference(FooService.class.getName()));
assertNull("Check check service invisible inside the composite 1", sc1.getServiceReference(CheckService.class.getName()));
- assertNull("Check foo service invisible inside the global", context.getServiceReference(FooService.class.getName()));
+ assertNull("Check foo service invisible inside the global", getContext().getServiceReference(FooService.class.getName()));
try {
- assertNull("Check check service invisible inside the context", context.getServiceReferences(CheckService.class.getName(), "(instance.name=client)"));
+ assertNull("Check check service invisible inside the context", getContext().getServiceReferences(CheckService.class.getName(), "(instance.name=client)"));
} catch (InvalidSyntaxException e) {
fail("Invalid filter : " + e);
}
@@ -333,9 +333,9 @@
assertNull("Check check service visible inside the composite 2", sc2.getServiceReference(CheckService.class.getName()));
assertNull("Check foo service invisible inside the composite 1", sc1.getServiceReference(FooService.class.getName()));
assertNull("Check check service invisible inside the composite 1", sc1.getServiceReference(CheckService.class.getName()));
- assertNull("Check foo service invisible inside the global", context.getServiceReference(FooService.class.getName()));
+ assertNull("Check foo service invisible inside the global", getContext().getServiceReference(FooService.class.getName()));
try {
- assertNull("Check check service invisible inside the context", context.getServiceReferences(CheckService.class.getName(), "(instance.name=client)"));
+ assertNull("Check check service invisible inside the context", getContext().getServiceReferences(CheckService.class.getName(), "(instance.name=client)"));
} catch (InvalidSyntaxException e) {
fail("Invalid filter : " + e);
}
@@ -356,7 +356,7 @@
ServiceContext sc2 = Utils.getServiceContext(empty2);
- Factory fact1 = Utils.getFactoryByName(context, "COMPO-SimpleCheckServiceProvider");
+ Factory fact1 = Utils.getFactoryByName(getContext(), "COMPO-SimpleCheckServiceProvider");
Properties props = new Properties();
props.put("instance.name","client");
ComponentInstance client = null;
@@ -364,7 +364,7 @@
client = fact1.createComponentInstance(props, sc2);
} catch(Exception e) { fail("Cannot instantiate the client : " + e.getMessage()); }
- Factory fact2 = Utils.getFactoryByName(context, "COMPO-FooProviderType-1");
+ Factory fact2 = Utils.getFactoryByName(getContext(), "COMPO-FooProviderType-1");
Properties props2 = new Properties();
props2.put("instance.name","provider");
ComponentInstance provider = null;
@@ -387,9 +387,9 @@
// Check invisibilty
assertNull("Check foo service invisible inside the composite 1", sc1.getServiceReference(FooService.class.getName()));
assertNull("Check check service invisible inside the composite 1", sc1.getServiceReference(CheckService.class.getName()));
- assertNull("Check foo service invisible inside the global", context.getServiceReference(FooService.class.getName()));
+ assertNull("Check foo service invisible inside the global", getContext().getServiceReference(FooService.class.getName()));
try {
- assertNull("Check check service invisible inside the context", context.getServiceReferences(CheckService.class.getName(), "(instance.name=client)"));
+ assertNull("Check check service invisible inside the context", getContext().getServiceReferences(CheckService.class.getName(), "(instance.name=client)"));
} catch (InvalidSyntaxException e) {
fail("Invalid filter : " + e);
}
@@ -401,9 +401,9 @@
assertNull("Check check service visible inside the composite 2", sc2.getServiceReference(CheckService.class.getName()));
assertNull("Check foo service invisible inside the composite 1", sc1.getServiceReference(FooService.class.getName()));
assertNull("Check check service invisible inside the composite 1", sc1.getServiceReference(CheckService.class.getName()));
- assertNull("Check foo service invisible inside the global", context.getServiceReference(FooService.class.getName()));
+ assertNull("Check foo service invisible inside the global", getContext().getServiceReference(FooService.class.getName()));
try {
- assertNull("Check check service invisible inside the context", context.getServiceReferences(CheckService.class.getName(), "(instance.name=client)"));
+ assertNull("Check check service invisible inside the context", getContext().getServiceReferences(CheckService.class.getName(), "(instance.name=client)"));
} catch (InvalidSyntaxException e) {
fail("Invalid filter : " + e);
}
@@ -455,9 +455,9 @@
// Check invisibilty
assertNull("Check foo service invisible inside the composite 1", sc1.getServiceReference(FooService.class.getName()));
assertNull("Check check service invisible inside the composite 1", sc1.getServiceReference(CheckService.class.getName()));
- assertNull("Check foo service invisible inside the global", context.getServiceReference(FooService.class.getName()));
+ assertNull("Check foo service invisible inside the global", getContext().getServiceReference(FooService.class.getName()));
try {
- assertNull("Check check service invisible inside the context", context.getServiceReferences(CheckService.class.getName(), "(instance.name=client)"));
+ assertNull("Check check service invisible inside the context", getContext().getServiceReferences(CheckService.class.getName(), "(instance.name=client)"));
} catch (InvalidSyntaxException e) {
fail("Invalid filter : " + e);
}
@@ -469,9 +469,9 @@
assertNull("Check check service visible inside the composite 2", sc2.getServiceReference(CheckService.class.getName()));
assertNull("Check foo service invisible inside the composite 1", sc1.getServiceReference(FooService.class.getName()));
assertNull("Check check service invisible inside the composite 1", sc1.getServiceReference(CheckService.class.getName()));
- assertNull("Check foo service invisible inside the global", context.getServiceReference(FooService.class.getName()));
+ assertNull("Check foo service invisible inside the global", getContext().getServiceReference(FooService.class.getName()));
try {
- assertNull("Check check service invisible inside the context", context.getServiceReferences(CheckService.class.getName(), "(instance.name=client)"));
+ assertNull("Check check service invisible inside the context", getContext().getServiceReferences(CheckService.class.getName(), "(instance.name=client)"));
} catch (InvalidSyntaxException e) {
fail("Invalid filter : " + e);
}
Modified: felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/ServiceRegistryTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/ServiceRegistryTest.java?rev=722146&r1=722145&r2=722146&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/ServiceRegistryTest.java (original)
+++ felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/ServiceRegistryTest.java Mon Dec 1 09:44:13 2008
@@ -104,7 +104,7 @@
public void testRegistrationAndListener() {
ComponentInstance im = new FakeComponent();
ComponentInstance im2 = new FakeComponent();
- ServiceRegistry registry = new ServiceRegistry(context);
+ ServiceRegistry registry = new ServiceRegistry(getContext());
assertNotNull("Assert registry not null", registry);
svcListener all = new svcListener();
try {
@@ -147,7 +147,7 @@
public void testRegistrationAndFilter() {
ComponentInstance im = new FakeComponent();
ComponentInstance im2 = new FakeComponent();
- ServiceRegistry registry = new ServiceRegistry(context);
+ ServiceRegistry registry = new ServiceRegistry(getContext());
svcListener filtered = new svcListener();
try {
@@ -185,7 +185,7 @@
public void testGetService() {
ComponentInstance im = new FakeComponent();
ComponentInstance im2 = new FakeComponent();
- ServiceRegistry registry = new ServiceRegistry(context);
+ ServiceRegistry registry = new ServiceRegistry(getContext());
try {
assertNull("Check that there is no available service", registry.getServiceReferences(null, null));
@@ -209,7 +209,7 @@
public void testGetFilteredService() {
ComponentInstance im = new FakeComponent();
ComponentInstance im2 = new FakeComponent();
- ServiceRegistry registry = new ServiceRegistry(context);
+ ServiceRegistry registry = new ServiceRegistry(getContext());
try {
assertNull("Check that there is no available service", registry.getServiceReferences(null, null));
Modified: felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/FilteredExport.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/FilteredExport.java?rev=722146&r1=722145&r2=722146&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/FilteredExport.java (original)
+++ felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/FilteredExport.java Mon Dec 1 09:44:13 2008
@@ -35,7 +35,7 @@
ComponentInstance foo1 = null, foo2 = null;
public void setUp() {
- fooProvider = Utils.getFactoryByName(context, "BazProviderType");
+ fooProvider = Utils.getFactoryByName(getContext(), "BazProviderType");
assertNotNull("Check fooProvider availability", fooProvider);
Properties p1 = new Properties();
@@ -53,7 +53,7 @@
foo1.stop();
foo2.stop();
- Factory factory = Utils.getFactoryByName(context, "composite.export.5");
+ Factory factory = Utils.getFactoryByName(getContext(), "composite.export.5");
Properties props = new Properties();
props.put("instance.name","export");
try {
@@ -76,7 +76,7 @@
export1.start();
// Check that no foo service are available
- assertEquals("Check no foo service", Utils.getServiceReferences(context, FooService.class.getName(), null).length, 0);
+ assertEquals("Check no foo service", Utils.getServiceReferences(getContext(), FooService.class.getName(), null).length, 0);
// Test invalidity
assertTrue("Check invalidity - 0", export1.getState() == ComponentInstance.INVALID);
@@ -206,19 +206,19 @@
private boolean isFooServiceProvided() {
- ServiceReference ref = Utils.getServiceReferenceByName(context, BazService.class.getName(), export1.getInstanceName());
+ ServiceReference ref = Utils.getServiceReferenceByName(getContext(), BazService.class.getName(), export1.getInstanceName());
return ref != null;
}
private int countFooServiceProvided() {
- ServiceReference[] refs = Utils.getServiceReferences(context, BazService.class.getName(), "(instance.name="+export1.getInstanceName()+")");
+ ServiceReference[] refs = Utils.getServiceReferences(getContext(), BazService.class.getName(), "(instance.name="+export1.getInstanceName()+")");
return refs.length;
}
private boolean invoke() {
- ServiceReference ref = Utils.getServiceReferenceByName(context, BazService.class.getName(), export1.getInstanceName());
+ ServiceReference ref = Utils.getServiceReferenceByName(getContext(), BazService.class.getName(), export1.getInstanceName());
if(ref == null) { return false; }
- BazService fs = (BazService) context.getService(ref);
+ BazService fs = (BazService) getContext().getService(ref);
return fs.foo();
}
Modified: felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/MultipleExport.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/MultipleExport.java?rev=722146&r1=722145&r2=722146&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/MultipleExport.java (original)
+++ felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/MultipleExport.java Mon Dec 1 09:44:13 2008
@@ -35,7 +35,7 @@
ComponentInstance foo1 = null, foo2 = null;
public void setUp() {
- fooProvider = Utils.getFactoryByName(context, "BazProviderType");
+ fooProvider = Utils.getFactoryByName(getContext(), "BazProviderType");
assertNotNull("Check fooProvider availability", fooProvider);
Properties p1 = new Properties();
@@ -53,7 +53,7 @@
foo1.stop();
foo2.stop();
- Factory factory = Utils.getFactoryByName(context, "composite.export.3");
+ Factory factory = Utils.getFactoryByName(getContext(), "composite.export.3");
Properties props = new Properties();
props.put("instance.name","export");
try {
@@ -76,7 +76,7 @@
export3.start();
// Check that no foo service are available
- assertEquals("Check no foo service", Utils.getServiceReferences(context, FooService.class.getName(), null).length, 0);
+ assertEquals("Check no foo service", Utils.getServiceReferences(getContext(), FooService.class.getName(), null).length, 0);
// Test invalidity
assertTrue("Check invalidity - 0", export3.getState() == ComponentInstance.INVALID);
@@ -210,30 +210,30 @@
private boolean isFooServiceProvided() {
- ServiceReference ref = Utils.getServiceReferenceByName(context, BazService.class.getName(), export3.getInstanceName());
+ ServiceReference ref = Utils.getServiceReferenceByName(getContext(), BazService.class.getName(), export3.getInstanceName());
return ref != null;
}
private int countFooServiceProvided() {
- ServiceReference[] refs = Utils.getServiceReferences(context, BazService.class.getName(), "(instance.name="+export3.getInstanceName()+")");
+ ServiceReference[] refs = Utils.getServiceReferences(getContext(), BazService.class.getName(), "(instance.name="+export3.getInstanceName()+")");
return refs.length;
}
private boolean invoke() {
- ServiceReference ref = Utils.getServiceReferenceByName(context, BazService.class.getName(), export3.getInstanceName());
+ ServiceReference ref = Utils.getServiceReferenceByName(getContext(), BazService.class.getName(), export3.getInstanceName());
if(ref == null) { return false; }
- BazService fs = (BazService) context.getService(ref);
- context.ungetService(ref);
+ BazService fs = (BazService) getContext().getService(ref);
+ getContext().ungetService(ref);
return fs.foo();
}
private boolean invoke(int nb) {
- ServiceReference[] refs = Utils.getServiceReferences(context, BazService.class.getName(), "(instance.name="+export3.getInstanceName()+")");
+ ServiceReference[] refs = Utils.getServiceReferences(getContext(), BazService.class.getName(), "(instance.name="+export3.getInstanceName()+")");
if(refs == null) { return false; }
if (nb > refs.length) { return false; }
for(int i = 0; i < nb; i++) {
- BazService fs = (BazService) context.getService(refs[i]);
- context.ungetService(refs[i]);
+ BazService fs = (BazService) getContext().getService(refs[i]);
+ getContext().ungetService(refs[i]);
if(!fs.foo()) { return false; }
}
return true;
Modified: felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/OptionalExport.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/OptionalExport.java?rev=722146&r1=722145&r2=722146&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/OptionalExport.java (original)
+++ felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/OptionalExport.java Mon Dec 1 09:44:13 2008
@@ -35,7 +35,7 @@
ComponentInstance foo1 = null, foo2 = null;
public void setUp() {
- fooProvider = Utils.getFactoryByName(context, "BazProviderType");
+ fooProvider = Utils.getFactoryByName(getContext(), "BazProviderType");
assertNotNull("Check fooProvider availability", fooProvider);
Properties p1 = new Properties();
@@ -53,7 +53,7 @@
foo1.stop();
foo2.stop();
- Factory factory = Utils.getFactoryByName(context, "composite.export.2");
+ Factory factory = Utils.getFactoryByName(getContext(), "composite.export.2");
Properties props = new Properties();
props.put("instance.name","export");
try {
@@ -76,7 +76,7 @@
export2.start();
// Check that no foo service are available
- assertEquals("Check no foo service", Utils.getServiceReferences(context, FooService.class.getName(), null).length, 0);
+ assertEquals("Check no foo service", Utils.getServiceReferences(getContext(), FooService.class.getName(), null).length, 0);
// Test validity
assertTrue("Check validity - 0", export2.getState() == ComponentInstance.VALID);
@@ -210,19 +210,19 @@
private boolean isFooServiceProvided() {
- ServiceReference ref = Utils.getServiceReferenceByName(context, BazService.class.getName(), export2.getInstanceName());
+ ServiceReference ref = Utils.getServiceReferenceByName(getContext(), BazService.class.getName(), export2.getInstanceName());
return ref != null;
}
private int countFooServiceProvided() {
- ServiceReference[] refs = Utils.getServiceReferences(context, BazService.class.getName(), "(instance.name="+export2.getInstanceName()+")");
+ ServiceReference[] refs = Utils.getServiceReferences(getContext(), BazService.class.getName(), "(instance.name="+export2.getInstanceName()+")");
return refs.length;
}
private boolean invoke() {
- ServiceReference ref = Utils.getServiceReferenceByName(context, BazService.class.getName(), export2.getInstanceName());
+ ServiceReference ref = Utils.getServiceReferenceByName(getContext(), BazService.class.getName(), export2.getInstanceName());
if(ref == null) { return false; }
- BazService fs = (BazService) context.getService(ref);
+ BazService fs = (BazService) getContext().getService(ref);
return fs.foo();
}
Modified: felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/OptionalMultipleExport.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/OptionalMultipleExport.java?rev=722146&r1=722145&r2=722146&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/OptionalMultipleExport.java (original)
+++ felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/OptionalMultipleExport.java Mon Dec 1 09:44:13 2008
@@ -35,7 +35,7 @@
ComponentInstance foo1 = null, foo2 = null;
public void setUp() {
- fooProvider = Utils.getFactoryByName(context, "BazProviderType");
+ fooProvider = Utils.getFactoryByName(getContext(), "BazProviderType");
assertNotNull("Check fooProvider availability", fooProvider);
Properties p1 = new Properties();
@@ -53,7 +53,7 @@
foo1.stop();
foo2.stop();
- Factory factory = Utils.getFactoryByName(context, "composite.export.4");
+ Factory factory = Utils.getFactoryByName(getContext(), "composite.export.4");
Properties props = new Properties();
props.put("instance.name","export");
try {
@@ -76,7 +76,7 @@
export3.start();
// Check that no foo service are available
- assertEquals("Check no foo service", Utils.getServiceReferences(context, FooService.class.getName(), null).length, 0);
+ assertEquals("Check no foo service", Utils.getServiceReferences(getContext(), FooService.class.getName(), null).length, 0);
// Test invalidity
assertTrue("Check validity - 0", export3.getState() == ComponentInstance.VALID);
@@ -210,30 +210,30 @@
private boolean isFooServiceProvided() {
- ServiceReference ref = Utils.getServiceReferenceByName(context, BazService.class.getName(), export3.getInstanceName());
+ ServiceReference ref = Utils.getServiceReferenceByName(getContext(), BazService.class.getName(), export3.getInstanceName());
return ref != null;
}
private int countFooServiceProvided() {
- ServiceReference[] refs = Utils.getServiceReferences(context, BazService.class.getName(), "(instance.name="+export3.getInstanceName()+")");
+ ServiceReference[] refs = Utils.getServiceReferences(getContext(), BazService.class.getName(), "(instance.name="+export3.getInstanceName()+")");
return refs.length;
}
private boolean invoke() {
- ServiceReference ref = Utils.getServiceReferenceByName(context, BazService.class.getName(), export3.getInstanceName());
+ ServiceReference ref = Utils.getServiceReferenceByName(getContext(), BazService.class.getName(), export3.getInstanceName());
if(ref == null) { return false; }
- BazService fs = (BazService) context.getService(ref);
- context.ungetService(ref);
+ BazService fs = (BazService) getContext().getService(ref);
+ getContext().ungetService(ref);
return fs.foo();
}
private boolean invoke(int nb) {
- ServiceReference[] refs = Utils.getServiceReferences(context, BazService.class.getName(), "(instance.name="+export3.getInstanceName()+")");
+ ServiceReference[] refs = Utils.getServiceReferences(getContext(), BazService.class.getName(), "(instance.name="+export3.getInstanceName()+")");
if(refs == null) { return false; }
if (nb > refs.length) { return false; }
for(int i = 0; i < nb; i++) {
- BazService fs = (BazService) context.getService(refs[i]);
- context.ungetService(refs[i]);
+ BazService fs = (BazService) getContext().getService(refs[i]);
+ getContext().ungetService(refs[i]);
if(!fs.foo()) { return false; }
}
return true;
Modified: felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/SimpleExport.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/SimpleExport.java?rev=722146&r1=722145&r2=722146&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/SimpleExport.java (original)
+++ felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/SimpleExport.java Mon Dec 1 09:44:13 2008
@@ -35,7 +35,7 @@
ComponentInstance foo1 = null, foo2 = null;
public void setUp() {
- fooProvider = Utils.getFactoryByName(context, "BazProviderType");
+ fooProvider = Utils.getFactoryByName(getContext(), "BazProviderType");
assertNotNull("Check fooProvider availability", fooProvider);
Properties p1 = new Properties();
@@ -53,7 +53,7 @@
foo1.stop();
foo2.stop();
- Factory factory = Utils.getFactoryByName(context, "composite.export.1");
+ Factory factory = Utils.getFactoryByName(getContext(), "composite.export.1");
Properties props = new Properties();
props.put("instance.name","export");
try {
@@ -76,7 +76,7 @@
export1.start();
// Check that no foo service are available
- assertEquals("Check no foo service", Utils.getServiceReferences(context, FooService.class.getName(), null).length, 0);
+ assertEquals("Check no foo service", Utils.getServiceReferences(getContext(), FooService.class.getName(), null).length, 0);
// Test invalidity
assertTrue("Check invalidity - 0", export1.getState() == ComponentInstance.INVALID);
@@ -210,19 +210,19 @@
private boolean isFooServiceProvided() {
- ServiceReference ref = Utils.getServiceReferenceByName(context, BazService.class.getName(), export1.getInstanceName());
+ ServiceReference ref = Utils.getServiceReferenceByName(getContext(), BazService.class.getName(), export1.getInstanceName());
return ref != null;
}
private int countFooServiceProvided() {
- ServiceReference[] refs = Utils.getServiceReferences(context, BazService.class.getName(), "(instance.name="+export1.getInstanceName()+")");
+ ServiceReference[] refs = Utils.getServiceReferences(getContext(), BazService.class.getName(), "(instance.name="+export1.getInstanceName()+")");
return refs.length;
}
private boolean invoke() {
- ServiceReference ref = Utils.getServiceReferenceByName(context, BazService.class.getName(), export1.getInstanceName());
+ ServiceReference ref = Utils.getServiceReferenceByName(getContext(), BazService.class.getName(), export1.getInstanceName());
if(ref == null) { return false; }
- BazService fs = (BazService) context.getService(ref);
+ BazService fs = (BazService) getContext().getService(ref);
return fs.foo();
}
Modified: felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedFilteredImport.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedFilteredImport.java?rev=722146&r1=722145&r2=722146&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedFilteredImport.java (original)
+++ felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedFilteredImport.java Mon Dec 1 09:44:13 2008
@@ -38,7 +38,7 @@
Properties p = new Properties();
p.put("instance.name","importer");
- Factory compFact = Utils.getFactoryByName(context, "composite.requires.1");
+ Factory compFact = Utils.getFactoryByName(getContext(), "composite.requires.1");
try {
import1 = compFact.createComponentInstance(p);
} catch(Exception e) {
@@ -47,7 +47,7 @@
import1.stop();
- fooProvider = Utils.getFactoryByName(context, "COMPO-FooProviderType-1");
+ fooProvider = Utils.getFactoryByName(getContext(), "COMPO-FooProviderType-1");
assertNotNull("Check fooProvider availability", fooProvider);
Properties p1 = new Properties();
Modified: felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedMultipleImport.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedMultipleImport.java?rev=722146&r1=722145&r2=722146&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedMultipleImport.java (original)
+++ felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedMultipleImport.java Mon Dec 1 09:44:13 2008
@@ -38,7 +38,7 @@
Properties p = new Properties();
p.put("instance.name","importer");
- Factory compFact = Utils.getFactoryByName(context, "composite.requires.2");
+ Factory compFact = Utils.getFactoryByName(getContext(), "composite.requires.2");
try {
import2 = compFact.createComponentInstance(p);
} catch(Exception e) {
@@ -47,7 +47,7 @@
import2.stop();
- fooProvider = Utils.getFactoryByName(context, "COMPO-FooProviderType-1");
+ fooProvider = Utils.getFactoryByName(getContext(), "COMPO-FooProviderType-1");
assertNotNull("Check fooProvider availability", fooProvider);
Properties p1 = new Properties();
Modified: felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedOptionalImport.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedOptionalImport.java?rev=722146&r1=722145&r2=722146&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedOptionalImport.java (original)
+++ felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedOptionalImport.java Mon Dec 1 09:44:13 2008
@@ -38,7 +38,7 @@
Properties p = new Properties();
p.put("instance.name","importer");
- Factory compFact = Utils.getFactoryByName(context, "composite.requires.3");
+ Factory compFact = Utils.getFactoryByName(getContext(), "composite.requires.3");
try {
import3 = compFact.createComponentInstance(p);
} catch(Exception e) {
@@ -47,7 +47,7 @@
import3.stop();
- fooProvider = Utils.getFactoryByName(context, "COMPO-FooProviderType-1");
+ fooProvider = Utils.getFactoryByName(getContext(), "COMPO-FooProviderType-1");
assertNotNull("Check fooProvider availability", fooProvider);
Properties p1 = new Properties();
Modified: felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedOptionalMultipleImport.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedOptionalMultipleImport.java?rev=722146&r1=722145&r2=722146&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedOptionalMultipleImport.java (original)
+++ felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedOptionalMultipleImport.java Mon Dec 1 09:44:13 2008
@@ -38,7 +38,7 @@
Properties p = new Properties();
p.put("instance.name","importer");
- Factory compFact = Utils.getFactoryByName(context, "composite.requires.4");
+ Factory compFact = Utils.getFactoryByName(getContext(), "composite.requires.4");
try {
import4 = compFact.createComponentInstance(p);
} catch(Exception e) {
@@ -47,7 +47,7 @@
import4.stop();
- fooProvider = Utils.getFactoryByName(context, "COMPO-FooProviderType-1");
+ fooProvider = Utils.getFactoryByName(getContext(), "COMPO-FooProviderType-1");
assertNotNull("Check fooProvider availability", fooProvider);
Properties p1 = new Properties();
Modified: felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedSimpleImport.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedSimpleImport.java?rev=722146&r1=722145&r2=722146&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedSimpleImport.java (original)
+++ felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedSimpleImport.java Mon Dec 1 09:44:13 2008
@@ -38,7 +38,7 @@
Properties p = new Properties();
p.put("instance.name","importer");
- Factory compFact = Utils.getFactoryByName(context, "composite.requires.1");
+ Factory compFact = Utils.getFactoryByName(getContext(), "composite.requires.1");
try {
import1 = compFact.createComponentInstance(p);
} catch(Exception e) {
@@ -47,7 +47,7 @@
import1.stop();
- fooProvider = Utils.getFactoryByName(context, "COMPO-FooProviderType-1");
+ fooProvider = Utils.getFactoryByName(getContext(), "COMPO-FooProviderType-1");
assertNotNull("Check fooProvider availability", fooProvider);
Properties p1 = new Properties();
Modified: felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/FilteredImport.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/FilteredImport.java?rev=722146&r1=722145&r2=722146&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/FilteredImport.java (original)
+++ felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/FilteredImport.java Mon Dec 1 09:44:13 2008
@@ -39,7 +39,7 @@
public void setUp() {
Properties p = new Properties();
p.put("instance.name","importer");
- Factory compFact = Utils.getFactoryByName(context, "composite.requires.5");
+ Factory compFact = Utils.getFactoryByName(getContext(), "composite.requires.5");
try {
import1 = compFact.createComponentInstance(p);
} catch(Exception e) {
@@ -47,10 +47,10 @@
}
import1.stop();
- fooProvider = Utils.getFactoryByName(context, "COMPO-FooProviderType-1");
+ fooProvider = Utils.getFactoryByName(getContext(), "COMPO-FooProviderType-1");
assertNotNull("Check fooProvider availability", fooProvider);
- fooProvider2 = Utils.getFactoryByName(context, "COMPO-FooProviderType-2");
+ fooProvider2 = Utils.getFactoryByName(getContext(), "COMPO-FooProviderType-2");
assertNotNull("Check fooProvider availability", fooProvider2);
Properties p1 = new Properties();
Modified: felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/MultipleImport.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/MultipleImport.java?rev=722146&r1=722145&r2=722146&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/MultipleImport.java (original)
+++ felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/MultipleImport.java Mon Dec 1 09:44:13 2008
@@ -34,12 +34,12 @@
Factory fooProvider;
public void setUp() {
- fooProvider = Utils.getFactoryByName(context, "COMPO-FooProviderType-1");
+ fooProvider = Utils.getFactoryByName(getContext(), "COMPO-FooProviderType-1");
assertNotNull("Check fooProvider availability", fooProvider);
Properties p = new Properties();
p.put("instance.name","importer");
- Factory compFact = Utils.getFactoryByName(context, "composite.requires.2");
+ Factory compFact = Utils.getFactoryByName(getContext(), "composite.requires.2");
try {
import2 = compFact.createComponentInstance(p);
} catch(Exception e) {
Modified: felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/OptionalImport.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/OptionalImport.java?rev=722146&r1=722145&r2=722146&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/OptionalImport.java (original)
+++ felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/OptionalImport.java Mon Dec 1 09:44:13 2008
@@ -34,12 +34,12 @@
Factory fooProvider;
public void setUp() {
- fooProvider = Utils.getFactoryByName(context, "COMPO-FooProviderType-1");
+ fooProvider = Utils.getFactoryByName(getContext(), "COMPO-FooProviderType-1");
assertNotNull("Check fooProvider availability", fooProvider);
Properties p = new Properties();
p.put("instance.name","importer");
- Factory compFact = Utils.getFactoryByName(context, "composite.requires.3");
+ Factory compFact = Utils.getFactoryByName(getContext(), "composite.requires.3");
try {
import3 = compFact.createComponentInstance(p);
} catch(Exception e) {
Modified: felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/OptionalMultipleImport.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/OptionalMultipleImport.java?rev=722146&r1=722145&r2=722146&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/OptionalMultipleImport.java (original)
+++ felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/OptionalMultipleImport.java Mon Dec 1 09:44:13 2008
@@ -34,12 +34,12 @@
Factory fooProvider;
public void setUp() {
- fooProvider = Utils.getFactoryByName(context, "COMPO-FooProviderType-1");
+ fooProvider = Utils.getFactoryByName(getContext(), "COMPO-FooProviderType-1");
assertNotNull("Check fooProvider availability", fooProvider);
Properties p = new Properties();
p.put("instance.name","importer");
- Factory compFact = Utils.getFactoryByName(context, "composite.requires.4");
+ Factory compFact = Utils.getFactoryByName(getContext(), "composite.requires.4");
try {
import2 = compFact.createComponentInstance(p);
} catch(Exception e) {