diff options
Diffstat (limited to '')
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/LICENSE (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/LICENSE) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/META-INF/MANIFEST.MF (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/META-INF/MANIFEST.MF) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/NOTICE (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/NOTICE) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/pom.xml (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/pom.xml) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiDistributionProvider.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiDistributionProvider.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationRuntimeActivator.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationRuntimeActivator.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/resources/META-INF/definitions.xml (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/resources/META-INF/definitions.xml) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/resources/impl-osgi-validation-messages.properties (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/resources/impl-osgi-validation-messages.properties) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/LICENSE (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/LICENSE) | 0 | ||||
| -rwxr-xr-x | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/META-INF/MANIFEST.MF (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/META-INF/MANIFEST.MF) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/NOTICE (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/NOTICE) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/pom.xml (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/pom.xml) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/DefaultOSGiImplementationFactory.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/DefaultOSGiImplementationFactory.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/DefaultServiceDescriptionsFactory.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/DefaultServiceDescriptionsFactory.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationFactory.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationFactory.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiProperty.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiProperty.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescription.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescription.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptions.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptions.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptionsFactory.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptionsFactory.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationFactoryImpl.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationFactoryImpl.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiPropertyImpl.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiPropertyImpl.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionImpl.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionImpl.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsFactoryImpl.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsFactoryImpl.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsImpl.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsImpl.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/BluePrintComponentsProcessor.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/BluePrintComponentsProcessor.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiComponentProcessor.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiComponentProcessor.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationActivator.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationActivator.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiPropertyProcessor.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiPropertyProcessor.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsDocumentProcessor.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsDocumentProcessor.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsModelResolver.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsModelResolver.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsProcessor.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsProcessor.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/definitions.xml (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/definitions.xml) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.osgi.OSGiImplementationFactory (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.osgi.OSGiImplementationFactory) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.osgi.ServiceDescriptionsFactory (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.osgi.ServiceDescriptionsFactory) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/calculator/dosgi/CalculatorService.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/calculator/dosgi/CalculatorService.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/AddService.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/AddService.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/DivideService.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/DivideService.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/BluePrintComponentsProcessorTestCase.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/BluePrintComponentsProcessorTestCase.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiComponentProcessorTestCase.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiComponentProcessorTestCase.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsTestCase.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsTestCase.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/resources/OSGI-INF/calculator-component.xml (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/resources/OSGI-INF/calculator-component.xml) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/resources/OSGI-INF/sca/bundle.componentType (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/resources/OSGI-INF/sca/bundle.componentType) | 0 | ||||
| -rw-r--r-- | sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/resources/osgitest.composite (renamed from branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/resources/osgitest.composite) | 0 |
58 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/LICENSE index 6b0b1270ff..6b0b1270ff 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/LICENSE +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/LICENSE diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/META-INF/MANIFEST.MF index 3dd9f9c272..3dd9f9c272 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/META-INF/MANIFEST.MF +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/META-INF/MANIFEST.MF diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/NOTICE index 25bb89c9b2..25bb89c9b2 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/NOTICE +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/NOTICE diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/pom.xml index 958bc2a4c9..958bc2a4c9 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/pom.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/pom.xml diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiDistributionProvider.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiDistributionProvider.java index ff30730c78..ff30730c78 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiDistributionProvider.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiDistributionProvider.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java index c6e01564db..c6e01564db 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java index 0e4a3ef995..0e4a3ef995 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationRuntimeActivator.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationRuntimeActivator.java index f3d59cc513..f3d59cc513 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationRuntimeActivator.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationRuntimeActivator.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java index 52313a84e7..52313a84e7 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/resources/META-INF/definitions.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/resources/META-INF/definitions.xml index f531c2c4ed..f531c2c4ed 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/resources/META-INF/definitions.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/resources/META-INF/definitions.xml diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory index c2cd957351..c2cd957351 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/resources/impl-osgi-validation-messages.properties b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/resources/impl-osgi-validation-messages.properties index 2503be0b13..2503be0b13 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/resources/impl-osgi-validation-messages.properties +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi-runtime/src/main/resources/impl-osgi-validation-messages.properties diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/LICENSE index 6b0b1270ff..6b0b1270ff 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/LICENSE +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/LICENSE diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/META-INF/MANIFEST.MF index f417c651b2..f417c651b2 100755 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/META-INF/MANIFEST.MF +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/META-INF/MANIFEST.MF diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/NOTICE index 25bb89c9b2..25bb89c9b2 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/NOTICE +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/NOTICE diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/pom.xml index 973a289c9c..973a289c9c 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/pom.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/pom.xml diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/DefaultOSGiImplementationFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/DefaultOSGiImplementationFactory.java index 545898fe5f..545898fe5f 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/DefaultOSGiImplementationFactory.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/DefaultOSGiImplementationFactory.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/DefaultServiceDescriptionsFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/DefaultServiceDescriptionsFactory.java index d7296e24bb..d7296e24bb 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/DefaultServiceDescriptionsFactory.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/DefaultServiceDescriptionsFactory.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java index 4551821f5a..4551821f5a 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationFactory.java index 0a83624e76..0a83624e76 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationFactory.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationFactory.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiProperty.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiProperty.java index 26b588a099..26b588a099 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiProperty.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiProperty.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescription.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescription.java index 119d7ed657..119d7ed657 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescription.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescription.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptions.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptions.java index 35866938d6..35866938d6 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptions.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptions.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptionsFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptionsFactory.java index 0e4c51b1f9..0e4c51b1f9 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptionsFactory.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptionsFactory.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationFactoryImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationFactoryImpl.java index 80b68d1728..80b68d1728 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationFactoryImpl.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationFactoryImpl.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java index 41deef131f..41deef131f 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiPropertyImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiPropertyImpl.java index ec8b98f53f..ec8b98f53f 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiPropertyImpl.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiPropertyImpl.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionImpl.java index b990cf5980..b990cf5980 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionImpl.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionImpl.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsFactoryImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsFactoryImpl.java index 8cd3867610..8cd3867610 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsFactoryImpl.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsFactoryImpl.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsImpl.java index c249c053a4..c249c053a4 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsImpl.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsImpl.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/BluePrintComponentsProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/BluePrintComponentsProcessor.java index 92b0316b9c..92b0316b9c 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/BluePrintComponentsProcessor.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/BluePrintComponentsProcessor.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiComponentProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiComponentProcessor.java index d70458053e..d70458053e 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiComponentProcessor.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiComponentProcessor.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationActivator.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationActivator.java index b604447696..b604447696 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationActivator.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationActivator.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java index c3b293ab5d..c3b293ab5d 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiPropertyProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiPropertyProcessor.java index 5a8f5c4694..5a8f5c4694 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiPropertyProcessor.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiPropertyProcessor.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsDocumentProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsDocumentProcessor.java index b692531a38..b692531a38 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsDocumentProcessor.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsDocumentProcessor.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsModelResolver.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsModelResolver.java index deafe8ccc9..deafe8ccc9 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsModelResolver.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsModelResolver.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsProcessor.java index bef07d159d..bef07d159d 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsProcessor.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsProcessor.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/definitions.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/definitions.xml index f531c2c4ed..f531c2c4ed 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/definitions.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/definitions.xml diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor index 6407305a77..6407305a77 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor index d4b5dd8dce..d4b5dd8dce 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver index 57bf18d9ce..57bf18d9ce 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.osgi.OSGiImplementationFactory b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.osgi.OSGiImplementationFactory index 6ec156ae81..6ec156ae81 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.osgi.OSGiImplementationFactory +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.osgi.OSGiImplementationFactory diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.osgi.ServiceDescriptionsFactory b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.osgi.ServiceDescriptionsFactory index 0d01b7d6a5..0d01b7d6a5 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.osgi.ServiceDescriptionsFactory +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.osgi.ServiceDescriptionsFactory diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties index a406ea21c3..a406ea21c3 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/calculator/dosgi/CalculatorService.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/calculator/dosgi/CalculatorService.java index 656b78b717..656b78b717 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/calculator/dosgi/CalculatorService.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/calculator/dosgi/CalculatorService.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/AddService.java index 971500782f..971500782f 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/AddService.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/AddService.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/DivideService.java index 49b8a1c0bf..49b8a1c0bf 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/DivideService.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/DivideService.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java index f4e59d12ea..f4e59d12ea 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java index bfb9b820f7..bfb9b820f7 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/BluePrintComponentsProcessorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/BluePrintComponentsProcessorTestCase.java index fd1a89ccf3..fd1a89ccf3 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/BluePrintComponentsProcessorTestCase.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/BluePrintComponentsProcessorTestCase.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiComponentProcessorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiComponentProcessorTestCase.java index 5f2a7d690c..5f2a7d690c 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiComponentProcessorTestCase.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiComponentProcessorTestCase.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java index 43cca15341..43cca15341 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsTestCase.java index d6728f8e1f..d6728f8e1f 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsTestCase.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsTestCase.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java index 7cae6abda2..7cae6abda2 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/resources/OSGI-INF/calculator-component.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/resources/OSGI-INF/calculator-component.xml index 3e537df732..3e537df732 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/resources/OSGI-INF/calculator-component.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/resources/OSGI-INF/calculator-component.xml diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/resources/OSGI-INF/sca/bundle.componentType b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/resources/OSGI-INF/sca/bundle.componentType index 7860094626..7860094626 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/resources/OSGI-INF/sca/bundle.componentType +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/resources/OSGI-INF/sca/bundle.componentType diff --git a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/resources/osgitest.composite b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/resources/osgitest.composite index 24c5716abd..24c5716abd 100644 --- a/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/resources/osgitest.composite +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/implementation-osgi/src/test/resources/osgitest.composite |