summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/LICENSE (renamed from branches/sca-java-2.0-M3/modules/interface-java-jaxws/LICENSE)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/META-INF/MANIFEST.MF (renamed from branches/sca-java-2.0-M3/modules/interface-java-jaxws/META-INF/MANIFEST.MF)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/NOTICE (renamed from branches/sca-java-2.0-M3/modules/interface-java-jaxws/NOTICE)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/pom.xml (renamed from branches/sca-java-2.0-M3/modules/interface-java-jaxws/pom.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java (renamed from branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/CodeGenerationHelper.java (renamed from branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/CodeGenerationHelper.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGenerator.java (renamed from branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGenerator.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedClassLoader.java (renamed from branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedClassLoader.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedDataTypeImpl.java (renamed from branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedDataTypeImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java (renamed from branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java (renamed from branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WebServiceInterfaceProcessor.java (renamed from branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WebServiceInterfaceProcessor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGenerator.java (renamed from branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGenerator.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.FaultExceptionMapper (renamed from branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.FaultExceptionMapper)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java (renamed from branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java (renamed from branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java (renamed from branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BeanInterface.java (renamed from branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BeanInterface.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BeanInterfaceImpl.java (renamed from branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BeanInterfaceImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGeneratorTestCase.java (renamed from branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGeneratorTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java (renamed from branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JavaReflectionHelperTestCase.java (renamed from branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JavaReflectionHelperTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyException.java (renamed from branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyException.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java (renamed from branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestAdapter.java (renamed from branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestAdapter.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestGenericClass.java (renamed from branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestGenericClass.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java (renamed from branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGeneratorTestCase.java (renamed from branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGeneratorTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/resources/wsdl/Stock.wsdl (renamed from branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/resources/wsdl/Stock.wsdl)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl (renamed from branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/LICENSE (renamed from branches/sca-java-2.0-M3/modules/interface-java/LICENSE)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/META-INF/MANIFEST.MF (renamed from branches/sca-java-2.0-M3/modules/interface-java/META-INF/MANIFEST.MF)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/NOTICE (renamed from branches/sca-java-2.0-M3/modules/interface-java/NOTICE)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/pom.xml (renamed from branches/sca-java-2.0-M3/modules/interface-java/pom.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java (renamed from branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java (renamed from branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java (renamed from branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java (renamed from branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java (renamed from branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java (renamed from branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java (renamed from branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java (renamed from branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java (renamed from branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java (renamed from branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java (renamed from branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java (renamed from branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java (renamed from branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java (renamed from branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java (renamed from branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-2.0-M3/modules/interface-java/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/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory (renamed from branches/sca-java-2.0-M3/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/resources/interface-javaxml-validation-messages.properties (renamed from branches/sca-java-2.0-M3/modules/interface-java/src/main/resources/interface-javaxml-validation-messages.properties)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java (renamed from branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java (renamed from branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java (renamed from branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java.fixme (renamed from branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java.fixme)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java (renamed from branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java (renamed from branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java (renamed from branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite (renamed from branches/sca-java-2.0-M3/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType (renamed from branches/sca-java-2.0-M3/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType (renamed from branches/sca-java-2.0-M3/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType)0
62 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/LICENSE
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/LICENSE
diff --git a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/META-INF/MANIFEST.MF
index 4fa91e0b45..4fa91e0b45 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/NOTICE
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/NOTICE
diff --git a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/pom.xml
index 5f27f46601..5f27f46601 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/pom.xml
diff --git a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java
index 6c64ad0689..6c64ad0689 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/CodeGenerationHelper.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/CodeGenerationHelper.java
index b05715b54e..b05715b54e 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/CodeGenerationHelper.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/CodeGenerationHelper.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGenerator.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGenerator.java
index 40fbefa3ed..40fbefa3ed 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGenerator.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGenerator.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedClassLoader.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedClassLoader.java
index f36dd3a443..f36dd3a443 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedClassLoader.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedClassLoader.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedDataTypeImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedDataTypeImpl.java
index c3f568ef48..c3f568ef48 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedDataTypeImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedDataTypeImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java
index 1733b02aba..1733b02aba 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
index 50cdde658e..50cdde658e 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WebServiceInterfaceProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WebServiceInterfaceProcessor.java
index 18eda13efb..18eda13efb 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WebServiceInterfaceProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WebServiceInterfaceProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGenerator.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGenerator.java
index 764c10ff00..764c10ff00 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGenerator.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGenerator.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.FaultExceptionMapper b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.FaultExceptionMapper
index 207381d72f..207381d72f 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.FaultExceptionMapper
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.FaultExceptionMapper
diff --git a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java
index 1b07e25bad..1b07e25bad 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java
index d38a21ba52..d38a21ba52 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java
index 7b9375063d..7b9375063d 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BeanInterface.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BeanInterface.java
index 67b9c84399..67b9c84399 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BeanInterface.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BeanInterface.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BeanInterfaceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BeanInterfaceImpl.java
index f964ea374b..f964ea374b 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BeanInterfaceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BeanInterfaceImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGeneratorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGeneratorTestCase.java
index 4caeb79fca..4caeb79fca 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGeneratorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGeneratorTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java
index f82342fe28..f82342fe28 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JavaReflectionHelperTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JavaReflectionHelperTestCase.java
index 6315e12ff8..6315e12ff8 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JavaReflectionHelperTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JavaReflectionHelperTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyException.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyException.java
index 4df0517de6..4df0517de6 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyException.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java
index 78527193d5..78527193d5 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestAdapter.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestAdapter.java
index fb319a3b0f..fb319a3b0f 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestAdapter.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestAdapter.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestGenericClass.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestGenericClass.java
index 2ecf822904..2ecf822904 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestGenericClass.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestGenericClass.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java
index 1f8e6cb445..1f8e6cb445 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGeneratorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGeneratorTestCase.java
index b14ef19939..b14ef19939 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGeneratorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGeneratorTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/resources/wsdl/Stock.wsdl b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/resources/wsdl/Stock.wsdl
index 882408ade6..882408ade6 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/resources/wsdl/Stock.wsdl
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/resources/wsdl/Stock.wsdl
diff --git a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
index e92409bfdb..e92409bfdb 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
diff --git a/branches/sca-java-2.0-M3/modules/interface-java/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java/LICENSE
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/LICENSE
diff --git a/branches/sca-java-2.0-M3/modules/interface-java/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/META-INF/MANIFEST.MF
index 333ed8a54d..333ed8a54d 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M3/modules/interface-java/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java/NOTICE
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/NOTICE
diff --git a/branches/sca-java-2.0-M3/modules/interface-java/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/pom.xml
index 0621ce5262..0621ce5262 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/pom.xml
diff --git a/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
index 41cf08d771..41cf08d771 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
index 0a2edb02c7..0a2edb02c7 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
index e3a84c63f0..e3a84c63f0 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
index 9225926269..9225926269 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java
index e6cb35cc4b..e6cb35cc4b 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
index d43ebe558b..d43ebe558b 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
index 1454851fb1..1454851fb1 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
index 294127910f..294127910f 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
index 029af36d55..029af36d55 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
index 2a9e3c5329..2a9e3c5329 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java
index 4384213bf5..4384213bf5 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java
index bf80bef175..bf80bef175 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
index 3bc03a528e..3bc03a528e 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
index 5e8cf6a433..5e8cf6a433 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
index 1eb38592b7..1eb38592b7 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java/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/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 15e027cb2a..15e027cb2a 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java/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/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-2.0-M3/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory
index 5ba12ec137..5ba12ec137 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory
diff --git a/branches/sca-java-2.0-M3/modules/interface-java/src/main/resources/interface-javaxml-validation-messages.properties b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/resources/interface-javaxml-validation-messages.properties
index 4f55c0b3e1..4f55c0b3e1 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java/src/main/resources/interface-javaxml-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/main/resources/interface-javaxml-validation-messages.properties
diff --git a/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java
index c0b1443207..c0b1443207 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
index 86a38fa0c4..86a38fa0c4 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java
index 638603a02e..638603a02e 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java.fixme b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java.fixme
index 14ac8b0134..14ac8b0134 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java.fixme
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java.fixme
diff --git a/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java
index 3833699421..3833699421 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java
index 6008840389..6008840389 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java
index b21505936b..b21505936b 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
index ffc38c7f04..ffc38c7f04 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
diff --git a/branches/sca-java-2.0-M3/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType
index af9c11f341..af9c11f341 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType
diff --git a/branches/sca-java-2.0-M3/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
index bf58f29447..bf58f29447 100644
--- a/branches/sca-java-2.0-M3/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType