diff options
Diffstat (limited to '')
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java (renamed from branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java (renamed from branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java (renamed from branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java (renamed from branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java (renamed from branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java (renamed from branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java (renamed from branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiInstanceWrapper.java (renamed from branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiInstanceWrapper.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRemotableInvoker.java (renamed from branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRemotableInvoker.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java (renamed from branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java (renamed from branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.5.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory (renamed from branches/sca-java-1.5.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties (renamed from branches/sca-java-1.5.1/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiPropertyTestCase.java (renamed from branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiPropertyTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java (renamed from branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java (renamed from branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java (renamed from branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java (renamed from branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java (renamed from branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java (renamed from branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java (renamed from branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType (renamed from branches/sca-java-1.5.1/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/resources/osgiproptest.composite (renamed from branches/sca-java-1.5.1/modules/implementation-osgi/src/test/resources/osgiproptest.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/resources/osgitest.composite (renamed from branches/sca-java-1.5.1/modules/implementation-osgi/src/test/resources/osgitest.composite) | 0 |
25 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java index 7bcb0a1da5..7bcb0a1da5 100644 --- a/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java +++ b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java diff --git a/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java index 33c790585c..33c790585c 100644 --- a/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java +++ b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java diff --git a/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java index 0264f0b102..0264f0b102 100644 --- a/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java +++ b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java diff --git a/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java index 38befa611b..38befa611b 100644 --- a/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java +++ b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java diff --git a/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java index fe3efd22cd..fe3efd22cd 100644 --- a/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java diff --git a/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java index b49f94c1e0..b49f94c1e0 100644 --- a/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java +++ b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java diff --git a/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java index 1a13ef99f7..1a13ef99f7 100644 --- a/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java +++ b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java diff --git a/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiInstanceWrapper.java b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiInstanceWrapper.java index e775041592..e775041592 100644 --- a/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiInstanceWrapper.java +++ b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiInstanceWrapper.java diff --git a/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRemotableInvoker.java b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRemotableInvoker.java index deb44d26fb..deb44d26fb 100644 --- a/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRemotableInvoker.java +++ b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRemotableInvoker.java diff --git a/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java index deb39a47cd..deb39a47cd 100644 --- a/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java +++ b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java diff --git a/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java index 20e999bca8..20e999bca8 100644 --- a/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java +++ b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java diff --git a/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor index 9ecff71874..9ecff71874 100644 --- a/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor +++ b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor diff --git a/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory index c2cd957351..c2cd957351 100644 --- a/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory +++ b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory diff --git a/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties index 2503be0b13..2503be0b13 100644 --- a/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties +++ b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties diff --git a/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiPropertyTestCase.java b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiPropertyTestCase.java index fb4cb4207a..fb4cb4207a 100644 --- a/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiPropertyTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiPropertyTestCase.java diff --git a/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java index 6a6d80f15e..6a6d80f15e 100644 --- a/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java diff --git a/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java index 93b4dee033..93b4dee033 100644 --- a/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java +++ b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java diff --git a/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java index d412f6bd6a..d412f6bd6a 100644 --- a/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java diff --git a/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java index feb9ce177e..feb9ce177e 100644 --- a/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java +++ b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java diff --git a/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java index 630c1502d1..630c1502d1 100644 --- a/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java diff --git a/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java index 1831587896..1831587896 100644 --- a/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java diff --git a/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java index e1bbd97655..e1bbd97655 100644 --- a/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java +++ b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java diff --git a/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType index 254ce99d59..254ce99d59 100644 --- a/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType +++ b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType diff --git a/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/resources/osgiproptest.composite b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/resources/osgiproptest.composite index 0b31145407..0b31145407 100644 --- a/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/resources/osgiproptest.composite +++ b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/resources/osgiproptest.composite diff --git a/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/resources/osgitest.composite b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/resources/osgitest.composite index 5465eec8d9..5465eec8d9 100644 --- a/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/resources/osgitest.composite +++ b/sca-java-1.x/branches/sca-java-1.5.1/modules/implementation-osgi/src/test/resources/osgitest.composite |