2693 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-1.x/itest/admin/README b/sca-java-1.x/trunk/itest/admin/README
index c4e96d7af0..c4e96d7af0 100644
--- a/branches/sca-java-1.x/itest/admin/README
+++ b/sca-java-1.x/trunk/itest/admin/README
diff --git a/branches/sca-java-1.x/itest/admin/pom.xml b/sca-java-1.x/trunk/itest/admin/pom.xml
index 5030ef4c47..5030ef4c47 100644
--- a/branches/sca-java-1.x/itest/admin/pom.xml
+++ b/sca-java-1.x/trunk/itest/admin/pom.xml
diff --git a/branches/sca-java-1.x/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java b/sca-java-1.x/trunk/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java
index b3d2137767..b3d2137767 100644
--- a/branches/sca-java-1.x/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java
+++ b/sca-java-1.x/trunk/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java
diff --git a/branches/sca-java-1.x/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java b/sca-java-1.x/trunk/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java
index 025302fb6d..025302fb6d 100644
--- a/branches/sca-java-1.x/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java
+++ b/sca-java-1.x/trunk/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java
diff --git a/branches/sca-java-1.x/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java b/sca-java-1.x/trunk/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java
index de480e6d85..de480e6d85 100644
--- a/branches/sca-java-1.x/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java b/sca-java-1.x/trunk/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java
index 8ff146b630..8ff146b630 100644
--- a/branches/sca-java-1.x/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java
+++ b/sca-java-1.x/trunk/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java
diff --git a/branches/sca-java-1.x/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.java b/sca-java-1.x/trunk/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.java
index 638c6aff8c..638c6aff8c 100644
--- a/branches/sca-java-1.x/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.java
+++ b/sca-java-1.x/trunk/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.java
diff --git a/branches/sca-java-1.x/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java b/sca-java-1.x/trunk/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java
index bd820884e7..bd820884e7 100644
--- a/branches/sca-java-1.x/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java
+++ b/sca-java-1.x/trunk/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java
diff --git a/branches/sca-java-1.x/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java b/sca-java-1.x/trunk/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java
index fa2720001b..fa2720001b 100644
--- a/branches/sca-java-1.x/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java b/sca-java-1.x/trunk/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java
index eec64fa0d8..eec64fa0d8 100644
--- a/branches/sca-java-1.x/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java
+++ b/sca-java-1.x/trunk/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java
diff --git a/branches/sca-java-1.x/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java b/sca-java-1.x/trunk/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java
index d712662cb3..d712662cb3 100644
--- a/branches/sca-java-1.x/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.java b/sca-java-1.x/trunk/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.java
index 42fa3f0c41..42fa3f0c41 100644
--- a/branches/sca-java-1.x/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.java
+++ b/sca-java-1.x/trunk/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.java
diff --git a/branches/sca-java-1.x/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java b/sca-java-1.x/trunk/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java
index bcf4153064..bcf4153064 100644
--- a/branches/sca-java-1.x/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java
+++ b/sca-java-1.x/trunk/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java
diff --git a/branches/sca-java-1.x/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java b/sca-java-1.x/trunk/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java
index 747f71576c..747f71576c 100644
--- a/branches/sca-java-1.x/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java
+++ b/sca-java-1.x/trunk/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java
diff --git a/branches/sca-java-1.x/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java b/sca-java-1.x/trunk/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java
index 6c2dffb7b4..6c2dffb7b4 100644
--- a/branches/sca-java-1.x/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java
+++ b/sca-java-1.x/trunk/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java
diff --git a/branches/sca-java-1.x/itest/admin/src/test/resources/Iteration1Composite.composite b/sca-java-1.x/trunk/itest/admin/src/test/resources/Iteration1Composite.composite
index 95dbbf0124..95dbbf0124 100644
--- a/branches/sca-java-1.x/itest/admin/src/test/resources/Iteration1Composite.composite
+++ b/sca-java-1.x/trunk/itest/admin/src/test/resources/Iteration1Composite.composite
diff --git a/branches/sca-java-1.x/itest/admin/src/test/resources/Iteration3Composite.composite b/sca-java-1.x/trunk/itest/admin/src/test/resources/Iteration3Composite.composite
index dd06d030d6..dd06d030d6 100644
--- a/branches/sca-java-1.x/itest/admin/src/test/resources/Iteration3Composite.composite
+++ b/sca-java-1.x/trunk/itest/admin/src/test/resources/Iteration3Composite.composite
diff --git a/branches/sca-java-1.x/itest/admin/src/test/resources/MySimpleService.composite b/sca-java-1.x/trunk/itest/admin/src/test/resources/MySimpleService.composite
index a1f8abb8da..a1f8abb8da 100644
--- a/branches/sca-java-1.x/itest/admin/src/test/resources/MySimpleService.composite
+++ b/sca-java-1.x/trunk/itest/admin/src/test/resources/MySimpleService.composite
diff --git a/branches/sca-java-1.x/itest/atom/pom.xml b/sca-java-1.x/trunk/itest/atom/pom.xml
index 44e6d8dc30..44e6d8dc30 100644
--- a/branches/sca-java-1.x/itest/atom/pom.xml
+++ b/sca-java-1.x/trunk/itest/atom/pom.xml
diff --git a/branches/sca-java-1.x/itest/atom/src/main/java/test/abdera/impl/NewsServiceImpl.java b/sca-java-1.x/trunk/itest/atom/src/main/java/test/abdera/impl/NewsServiceImpl.java
index 09789b4bb5..09789b4bb5 100644
--- a/branches/sca-java-1.x/itest/atom/src/main/java/test/abdera/impl/NewsServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/atom/src/main/java/test/abdera/impl/NewsServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/atom/src/test/java/test/abdera/NewsServiceTestCase.java b/sca-java-1.x/trunk/itest/atom/src/test/java/test/abdera/NewsServiceTestCase.java
index b9f2b4e2fc..b9f2b4e2fc 100644
--- a/branches/sca-java-1.x/itest/atom/src/test/java/test/abdera/NewsServiceTestCase.java
+++ b/sca-java-1.x/trunk/itest/atom/src/test/java/test/abdera/NewsServiceTestCase.java
diff --git a/branches/sca-java-1.x/itest/atom/src/test/resources/news/news.composite b/sca-java-1.x/trunk/itest/atom/src/test/resources/news/news.composite
index f3a3b165cc..f3a3b165cc 100644
--- a/branches/sca-java-1.x/itest/atom/src/test/resources/news/news.composite
+++ b/sca-java-1.x/trunk/itest/atom/src/test/resources/news/news.composite
diff --git a/branches/sca-java-1.x/itest/atom/src/test/resources/news/news.wsdl b/sca-java-1.x/trunk/itest/atom/src/test/resources/news/news.wsdl
index 62d46e66c9..62d46e66c9 100644
--- a/branches/sca-java-1.x/itest/atom/src/test/resources/news/news.wsdl
+++ b/sca-java-1.x/trunk/itest/atom/src/test/resources/news/news.wsdl
diff --git a/branches/sca-java-1.x/itest/atom/src/test/resources/news/news.xsd b/sca-java-1.x/trunk/itest/atom/src/test/resources/news/news.xsd
index 0a59f9311e..0a59f9311e 100644
--- a/branches/sca-java-1.x/itest/atom/src/test/resources/news/news.xsd
+++ b/sca-java-1.x/trunk/itest/atom/src/test/resources/news/news.xsd
diff --git a/branches/sca-java-1.x/itest/binding-sca-jms/client/pom.xml b/sca-java-1.x/trunk/itest/binding-sca-jms/client/pom.xml
index f71d028291..f71d028291 100644
--- a/branches/sca-java-1.x/itest/binding-sca-jms/client/pom.xml
+++ b/sca-java-1.x/trunk/itest/binding-sca-jms/client/pom.xml
diff --git a/branches/sca-java-1.x/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java b/sca-java-1.x/trunk/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java
index d1b4ecbd15..d1b4ecbd15 100644
--- a/branches/sca-java-1.x/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java
+++ b/sca-java-1.x/trunk/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java
diff --git a/branches/sca-java-1.x/itest/binding-sca-jms/client/src/main/java/itest/MyService.java b/sca-java-1.x/trunk/itest/binding-sca-jms/client/src/main/java/itest/MyService.java
index e5123f087c..e5123f087c 100644
--- a/branches/sca-java-1.x/itest/binding-sca-jms/client/src/main/java/itest/MyService.java
+++ b/sca-java-1.x/trunk/itest/binding-sca-jms/client/src/main/java/itest/MyService.java
diff --git a/branches/sca-java-1.x/itest/binding-sca-jms/client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/binding-sca-jms/client/src/main/resources/META-INF/sca-contribution.xml
index 8c311553c3..8c311553c3 100644
--- a/branches/sca-java-1.x/itest/binding-sca-jms/client/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/binding-sca-jms/client/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/binding-sca-jms/client/src/main/resources/MyClient.composite b/sca-java-1.x/trunk/itest/binding-sca-jms/client/src/main/resources/MyClient.composite
index 81aa3ed98d..81aa3ed98d 100644
--- a/branches/sca-java-1.x/itest/binding-sca-jms/client/src/main/resources/MyClient.composite
+++ b/sca-java-1.x/trunk/itest/binding-sca-jms/client/src/main/resources/MyClient.composite
diff --git a/branches/sca-java-1.x/itest/binding-sca-jms/client/src/test/java/itest/MyClientTestCase.java b/sca-java-1.x/trunk/itest/binding-sca-jms/client/src/test/java/itest/MyClientTestCase.java
index d28d4a51b5..d28d4a51b5 100644
--- a/branches/sca-java-1.x/itest/binding-sca-jms/client/src/test/java/itest/MyClientTestCase.java
+++ b/sca-java-1.x/trunk/itest/binding-sca-jms/client/src/test/java/itest/MyClientTestCase.java
diff --git a/branches/sca-java-1.x/itest/binding-sca-jms/pom.xml b/sca-java-1.x/trunk/itest/binding-sca-jms/pom.xml
index 96f7eb6ff2..96f7eb6ff2 100644
--- a/branches/sca-java-1.x/itest/binding-sca-jms/pom.xml
+++ b/sca-java-1.x/trunk/itest/binding-sca-jms/pom.xml
diff --git a/branches/sca-java-1.x/itest/binding-sca-jms/service/pom.xml b/sca-java-1.x/trunk/itest/binding-sca-jms/service/pom.xml
index 64480b4163..64480b4163 100644
--- a/branches/sca-java-1.x/itest/binding-sca-jms/service/pom.xml
+++ b/sca-java-1.x/trunk/itest/binding-sca-jms/service/pom.xml
diff --git a/branches/sca-java-1.x/itest/binding-sca-jms/service/src/main/java/itest/MyService.java b/sca-java-1.x/trunk/itest/binding-sca-jms/service/src/main/java/itest/MyService.java
index e5123f087c..e5123f087c 100644
--- a/branches/sca-java-1.x/itest/binding-sca-jms/service/src/main/java/itest/MyService.java
+++ b/sca-java-1.x/trunk/itest/binding-sca-jms/service/src/main/java/itest/MyService.java
diff --git a/branches/sca-java-1.x/itest/binding-sca-jms/service/src/main/java/itest/MyServiceImpl.java b/sca-java-1.x/trunk/itest/binding-sca-jms/service/src/main/java/itest/MyServiceImpl.java
index d0f8dcc393..d0f8dcc393 100644
--- a/branches/sca-java-1.x/itest/binding-sca-jms/service/src/main/java/itest/MyServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/binding-sca-jms/service/src/main/java/itest/MyServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/binding-sca-jms/service/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/binding-sca-jms/service/src/main/resources/META-INF/sca-contribution.xml
index 8c311553c3..8c311553c3 100644
--- a/branches/sca-java-1.x/itest/binding-sca-jms/service/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/binding-sca-jms/service/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/binding-sca-jms/service/src/main/resources/MyService.composite b/sca-java-1.x/trunk/itest/binding-sca-jms/service/src/main/resources/MyService.composite
index 03ac786809..03ac786809 100644
--- a/branches/sca-java-1.x/itest/binding-sca-jms/service/src/main/resources/MyService.composite
+++ b/sca-java-1.x/trunk/itest/binding-sca-jms/service/src/main/resources/MyService.composite
diff --git a/branches/sca-java-1.x/itest/binding-sca-jms/service/src/test/java/itest/MyServiceTestCase.java b/sca-java-1.x/trunk/itest/binding-sca-jms/service/src/test/java/itest/MyServiceTestCase.java
index 3ec979065d..3ec979065d 100644
--- a/branches/sca-java-1.x/itest/binding-sca-jms/service/src/test/java/itest/MyServiceTestCase.java
+++ b/sca-java-1.x/trunk/itest/binding-sca-jms/service/src/test/java/itest/MyServiceTestCase.java
diff --git a/branches/sca-java-1.x/itest/bpel/helloworld-reference/pom.xml b/sca-java-1.x/trunk/itest/bpel/helloworld-reference/pom.xml
index 7f36ef03f4..7f36ef03f4 100644
--- a/branches/sca-java-1.x/itest/bpel/helloworld-reference/pom.xml
+++ b/sca-java-1.x/trunk/itest/bpel/helloworld-reference/pom.xml
diff --git a/branches/sca-java-1.x/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java b/sca-java-1.x/trunk/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
index 532b84bd22..532b84bd22 100644
--- a/branches/sca-java-1.x/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
+++ b/sca-java-1.x/trunk/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
diff --git a/branches/sca-java-1.x/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java b/sca-java-1.x/trunk/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
index 86d7f245e8..86d7f245e8 100644
--- a/branches/sca-java-1.x/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java b/sca-java-1.x/trunk/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
index 8dea2715bf..8dea2715bf 100644
--- a/branches/sca-java-1.x/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
+++ b/sca-java-1.x/trunk/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
diff --git a/branches/sca-java-1.x/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java b/sca-java-1.x/trunk/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
index 672dbdc0b5..672dbdc0b5 100644
--- a/branches/sca-java-1.x/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/trunk/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.x/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/trunk/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
index d7ebd5cbb8..d7ebd5cbb8 100644
--- a/branches/sca-java-1.x/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-1.x/trunk/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
index bdfedee2f8..bdfedee2f8 100644
--- a/branches/sca-java-1.x/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-1.x/trunk/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/branches/sca-java-1.x/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite b/sca-java-1.x/trunk/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
index dfec43e8e1..dfec43e8e1 100644
--- a/branches/sca-java-1.x/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
+++ b/sca-java-1.x/trunk/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
diff --git a/branches/sca-java-1.x/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl b/sca-java-1.x/trunk/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
index e768707ccd..e768707ccd 100644
--- a/branches/sca-java-1.x/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
+++ b/sca-java-1.x/trunk/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
diff --git a/branches/sca-java-1.x/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel b/sca-java-1.x/trunk/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
index 5ec2cc9f2e..5ec2cc9f2e 100644
--- a/branches/sca-java-1.x/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-1.x/trunk/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
diff --git a/branches/sca-java-1.x/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite b/sca-java-1.x/trunk/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
index 504e2ccc5d..504e2ccc5d 100644
--- a/branches/sca-java-1.x/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl b/sca-java-1.x/trunk/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
index 0f51b96b27..0f51b96b27 100644
--- a/branches/sca-java-1.x/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-1.x/trunk/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
diff --git a/branches/sca-java-1.x/itest/bpel/helloworld-reference/src/test/resources/log4j.properties b/sca-java-1.x/trunk/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
index 4e13380e0b..4e13380e0b 100644
--- a/branches/sca-java-1.x/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
+++ b/sca-java-1.x/trunk/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
diff --git a/branches/sca-java-1.x/itest/bpel/helloworld-ws/pom.xml b/sca-java-1.x/trunk/itest/bpel/helloworld-ws/pom.xml
index 6b241ea748..6b241ea748 100644
--- a/branches/sca-java-1.x/itest/bpel/helloworld-ws/pom.xml
+++ b/sca-java-1.x/trunk/itest/bpel/helloworld-ws/pom.xml
diff --git a/branches/sca-java-1.x/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java b/sca-java-1.x/trunk/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java
index ffdbc50a22..ffdbc50a22 100644
--- a/branches/sca-java-1.x/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java
+++ b/sca-java-1.x/trunk/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java
diff --git a/branches/sca-java-1.x/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-1.x/trunk/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java
index 6971151a77..6971151a77 100644
--- a/branches/sca-java-1.x/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-1.x/trunk/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/branches/sca-java-1.x/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel b/sca-java-1.x/trunk/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel
index 8cf91adc2c..8cf91adc2c 100644
--- a/branches/sca-java-1.x/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-1.x/trunk/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel
diff --git a/branches/sca-java-1.x/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite b/sca-java-1.x/trunk/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite
index f864f45613..f864f45613 100644
--- a/branches/sca-java-1.x/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl b/sca-java-1.x/trunk/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl
index 610bda3cc4..610bda3cc4 100644
--- a/branches/sca-java-1.x/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-1.x/trunk/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl
diff --git a/branches/sca-java-1.x/itest/bpel/helloworld-ws/src/test/resources/log4j.properties b/sca-java-1.x/trunk/itest/bpel/helloworld-ws/src/test/resources/log4j.properties
index 37f66e4189..37f66e4189 100644
--- a/branches/sca-java-1.x/itest/bpel/helloworld-ws/src/test/resources/log4j.properties
+++ b/sca-java-1.x/trunk/itest/bpel/helloworld-ws/src/test/resources/log4j.properties
diff --git a/branches/sca-java-1.x/itest/bpel/helloworld/pom.xml b/sca-java-1.x/trunk/itest/bpel/helloworld/pom.xml
index 638c0a3cb9..638c0a3cb9 100644
--- a/branches/sca-java-1.x/itest/bpel/helloworld/pom.xml
+++ b/sca-java-1.x/trunk/itest/bpel/helloworld/pom.xml
diff --git a/branches/sca-java-1.x/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java b/sca-java-1.x/trunk/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
index ffdbc50a22..ffdbc50a22 100644
--- a/branches/sca-java-1.x/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
+++ b/sca-java-1.x/trunk/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
diff --git a/branches/sca-java-1.x/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-1.x/trunk/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
index 76fcd35c2d..76fcd35c2d 100644
--- a/branches/sca-java-1.x/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-1.x/trunk/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/branches/sca-java-1.x/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel b/sca-java-1.x/trunk/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
index 8cf91adc2c..8cf91adc2c 100644
--- a/branches/sca-java-1.x/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-1.x/trunk/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
diff --git a/branches/sca-java-1.x/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite b/sca-java-1.x/trunk/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
index f6b12fb14b..f6b12fb14b 100644
--- a/branches/sca-java-1.x/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl b/sca-java-1.x/trunk/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
index 610bda3cc4..610bda3cc4 100644
--- a/branches/sca-java-1.x/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-1.x/trunk/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
diff --git a/branches/sca-java-1.x/itest/bpel/helloworld/src/test/resources/log4j.properties b/sca-java-1.x/trunk/itest/bpel/helloworld/src/test/resources/log4j.properties
index 37f66e4189..37f66e4189 100644
--- a/branches/sca-java-1.x/itest/bpel/helloworld/src/test/resources/log4j.properties
+++ b/sca-java-1.x/trunk/itest/bpel/helloworld/src/test/resources/log4j.properties
diff --git a/branches/sca-java-1.x/itest/bpel/pom.xml b/sca-java-1.x/trunk/itest/bpel/pom.xml
index 85b0f79737..85b0f79737 100644
--- a/branches/sca-java-1.x/itest/bpel/pom.xml
+++ b/sca-java-1.x/trunk/itest/bpel/pom.xml
diff --git a/branches/sca-java-1.x/itest/build-was-integration.xml b/sca-java-1.x/trunk/itest/build-was-integration.xml
index 03de4c050f..03de4c050f 100644
--- a/branches/sca-java-1.x/itest/build-was-integration.xml
+++ b/sca-java-1.x/trunk/itest/build-was-integration.xml
diff --git a/branches/sca-java-1.x/itest/builder/pom.xml b/sca-java-1.x/trunk/itest/builder/pom.xml
index a2ab7226b7..a2ab7226b7 100644
--- a/branches/sca-java-1.x/itest/builder/pom.xml
+++ b/sca-java-1.x/trunk/itest/builder/pom.xml
diff --git a/branches/sca-java-1.x/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java b/sca-java-1.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
index 932ae3987a..932ae3987a 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
+++ b/sca-java-1.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
diff --git a/branches/sca-java-1.x/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java b/sca-java-1.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
index f9ef0a1b4f..f9ef0a1b4f 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
+++ b/sca-java-1.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
diff --git a/branches/sca-java-1.x/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java b/sca-java-1.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
index c041a76b47..c041a76b47 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
+++ b/sca-java-1.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
diff --git a/branches/sca-java-1.x/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java b/sca-java-1.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
index ccfeff0997..ccfeff0997 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
+++ b/sca-java-1.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
diff --git a/branches/sca-java-1.x/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java b/sca-java-1.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
index 9a775feec9..9a775feec9 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
+++ b/sca-java-1.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
diff --git a/branches/sca-java-1.x/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java b/sca-java-1.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
index 98a1741fb6..98a1741fb6 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
+++ b/sca-java-1.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
index 256d01be58..256d01be58 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario1/scenario1.composite b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario1/scenario1.composite
index 5c2a98ab40..5c2a98ab40 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario1/scenario1.composite
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario1/scenario1.composite
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario1/scenario1a.composite b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario1/scenario1a.composite
index 21b5897aa1..21b5897aa1 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario1/scenario1a.composite
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario1/scenario1a.composite
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
index 083079ba42..083079ba42 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario10/scenario10.composite b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario10/scenario10.composite
index c24b7f0046..c24b7f0046 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario10/scenario10.composite
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario10/scenario10.composite
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario10/scenario10a.composite b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario10/scenario10a.composite
index 27a73d5c41..27a73d5c41 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario10/scenario10a.composite
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario10/scenario10a.composite
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario10/service3.wsdl b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario10/service3.wsdl
index 14edcc00e6..14edcc00e6 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario10/service3.wsdl
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario10/service3.wsdl
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
index a6e4b65970..a6e4b65970 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario11/scenario11.composite b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario11/scenario11.composite
index 3a94152e6a..3a94152e6a 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario11/scenario11.composite
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario11/scenario11.composite
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario11/scenario11a.composite b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario11/scenario11a.composite
index 6130c68651..6130c68651 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario11/scenario11a.composite
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario11/scenario11a.composite
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario11/service3.wsdl b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario11/service3.wsdl
index 14edcc00e6..14edcc00e6 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario11/service3.wsdl
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario11/service3.wsdl
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
index 125bdc5e53..125bdc5e53 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario12/scenario12.composite b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario12/scenario12.composite
index aabd445e23..aabd445e23 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario12/scenario12.composite
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario12/scenario12.composite
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario12/scenario12a.composite b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario12/scenario12a.composite
index a2ccc47c28..a2ccc47c28 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario12/scenario12a.composite
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario12/scenario12a.composite
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
index c906c6c5b0..c906c6c5b0 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario13/scenario13.composite b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario13/scenario13.composite
index ed59cd2adf..ed59cd2adf 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario13/scenario13.composite
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario13/scenario13.composite
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario13/scenario13a.composite b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario13/scenario13a.composite
index 41150f78fd..41150f78fd 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario13/scenario13a.composite
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario13/scenario13a.composite
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
index 6fa901c4df..6fa901c4df 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario2/scenario2.composite b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario2/scenario2.composite
index 66f88294ff..66f88294ff 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario2/scenario2.composite
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario2/scenario2.composite
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario2/scenario2a.composite b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario2/scenario2a.composite
index db1af4743f..db1af4743f 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario2/scenario2a.composite
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario2/scenario2a.composite
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
index f5899ab1f0..f5899ab1f0 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario3/scenario3.composite b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario3/scenario3.composite
index 4b37c19e4e..4b37c19e4e 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario3/scenario3.composite
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario3/scenario3.composite
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario3/scenario3a.composite b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario3/scenario3a.composite
index fedd79ff3d..fedd79ff3d 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario3/scenario3a.composite
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario3/scenario3a.composite
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
index 642245ea7e..642245ea7e 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario4/scenario4.composite b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario4/scenario4.composite
index 1bb876b33d..1bb876b33d 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario4/scenario4.composite
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario4/scenario4.composite
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario4/scenario4a.composite b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario4/scenario4a.composite
index 55e13700a6..55e13700a6 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario4/scenario4a.composite
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario4/scenario4a.composite
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
index 92da17179f..92da17179f 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario5/scenario5.composite b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario5/scenario5.composite
index 403e19b087..403e19b087 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario5/scenario5.composite
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario5/scenario5.composite
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario5/scenario5a.composite b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario5/scenario5a.composite
index 0e37ded0e4..0e37ded0e4 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario5/scenario5a.composite
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario5/scenario5a.composite
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario5/scenarios.wsdl b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario5/scenarios.wsdl
index 7480419231..7480419231 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario5/scenarios.wsdl
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario5/scenarios.wsdl
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
index 42d45b0b98..42d45b0b98 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario6/scenario6.composite b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario6/scenario6.composite
index 1c89139905..1c89139905 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario6/scenario6.composite
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario6/scenario6.composite
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario6/scenario6a.composite b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario6/scenario6a.composite
index 853703a353..853703a353 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario6/scenario6a.composite
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario6/scenario6a.composite
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario6/scenarios.wsdl b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario6/scenarios.wsdl
index 7480419231..7480419231 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario6/scenarios.wsdl
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario6/scenarios.wsdl
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
index 44c471cc65..44c471cc65 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario7/scenario7.composite b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario7/scenario7.composite
index 6b1ac24cec..6b1ac24cec 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario7/scenario7.composite
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario7/scenario7.composite
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario7/scenario7a.composite b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario7/scenario7a.composite
index 8e0cebbdd5..8e0cebbdd5 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario7/scenario7a.composite
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario7/scenario7a.composite
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario7/scenarios.wsdl b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario7/scenarios.wsdl
index 7480419231..7480419231 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario7/scenarios.wsdl
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario7/scenarios.wsdl
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
index 7cb09d0a74..7cb09d0a74 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario8/scenario8.composite b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario8/scenario8.composite
index 26e5ee33fa..26e5ee33fa 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario8/scenario8.composite
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario8/scenario8.composite
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario8/scenario8a.composite b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario8/scenario8a.composite
index 4fa0712199..4fa0712199 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario8/scenario8a.composite
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario8/scenario8a.composite
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario8/scenarios.wsdl b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario8/scenarios.wsdl
index 7480419231..7480419231 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario8/scenarios.wsdl
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario8/scenarios.wsdl
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
index 6e0908702b..6e0908702b 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario9/scenario9.composite b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario9/scenario9.composite
index 3fce35470e..3fce35470e 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario9/scenario9.composite
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario9/scenario9.composite
diff --git a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario9/scenario9a.composite b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario9/scenario9a.composite
index 6e86c547b3..6e86c547b3 100644
--- a/branches/sca-java-1.x/itest/builder/src/main/resources/scenario9/scenario9a.composite
+++ b/sca-java-1.x/trunk/itest/builder/src/main/resources/scenario9/scenario9a.composite
diff --git a/branches/sca-java-1.x/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java b/sca-java-1.x/trunk/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
index 1f45cb4a66..1f45cb4a66 100644
--- a/branches/sca-java-1.x/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
+++ b/sca-java-1.x/trunk/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
diff --git a/branches/sca-java-1.x/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java b/sca-java-1.x/trunk/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java
index cad09920e8..cad09920e8 100644
--- a/branches/sca-java-1.x/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java
+++ b/sca-java-1.x/trunk/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java
diff --git a/branches/sca-java-1.x/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java b/sca-java-1.x/trunk/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
index d4996c7418..d4996c7418 100644
--- a/branches/sca-java-1.x/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
+++ b/sca-java-1.x/trunk/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
diff --git a/branches/sca-java-1.x/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java b/sca-java-1.x/trunk/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
index 9bff4d394e..9bff4d394e 100644
--- a/branches/sca-java-1.x/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
+++ b/sca-java-1.x/trunk/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
diff --git a/branches/sca-java-1.x/itest/callablereferences-ws/pom.xml b/sca-java-1.x/trunk/itest/callablereferences-ws/pom.xml
index 6e4f8d1070..6e4f8d1070 100644
--- a/branches/sca-java-1.x/itest/callablereferences-ws/pom.xml
+++ b/sca-java-1.x/trunk/itest/callablereferences-ws/pom.xml
diff --git a/branches/sca-java-1.x/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java b/sca-java-1.x/trunk/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java
index ecf1ac27e1..ecf1ac27e1 100644
--- a/branches/sca-java-1.x/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java
+++ b/sca-java-1.x/trunk/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java
diff --git a/branches/sca-java-1.x/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java b/sca-java-1.x/trunk/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java
index c46087d865..c46087d865 100644
--- a/branches/sca-java-1.x/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java
+++ b/sca-java-1.x/trunk/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java
diff --git a/branches/sca-java-1.x/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java b/sca-java-1.x/trunk/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java
index 670c145cc3..670c145cc3 100644
--- a/branches/sca-java-1.x/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java
+++ b/sca-java-1.x/trunk/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java
diff --git a/branches/sca-java-1.x/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java b/sca-java-1.x/trunk/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java
index eb4d647a22..eb4d647a22 100644
--- a/branches/sca-java-1.x/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java b/sca-java-1.x/trunk/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java
index bb5e57397d..bb5e57397d 100644
--- a/branches/sca-java-1.x/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java
+++ b/sca-java-1.x/trunk/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java
diff --git a/branches/sca-java-1.x/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java b/sca-java-1.x/trunk/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java
index 6e5f1cedf9..6e5f1cedf9 100644
--- a/branches/sca-java-1.x/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java
+++ b/sca-java-1.x/trunk/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java
diff --git a/branches/sca-java-1.x/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java b/sca-java-1.x/trunk/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java
index 995e4fcf39..995e4fcf39 100644
--- a/branches/sca-java-1.x/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java
+++ b/sca-java-1.x/trunk/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java
diff --git a/branches/sca-java-1.x/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java b/sca-java-1.x/trunk/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java
index be72fd779e..be72fd779e 100644
--- a/branches/sca-java-1.x/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java
+++ b/sca-java-1.x/trunk/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java
diff --git a/branches/sca-java-1.x/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java b/sca-java-1.x/trunk/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java
index b73f26b573..b73f26b573 100644
--- a/branches/sca-java-1.x/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java
+++ b/sca-java-1.x/trunk/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java
diff --git a/branches/sca-java-1.x/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java b/sca-java-1.x/trunk/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java
index c3abc4c65d..c3abc4c65d 100644
--- a/branches/sca-java-1.x/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java
+++ b/sca-java-1.x/trunk/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java
diff --git a/branches/sca-java-1.x/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite b/sca-java-1.x/trunk/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite
index 3d782a0b84..3d782a0b84 100644
--- a/branches/sca-java-1.x/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite
+++ b/sca-java-1.x/trunk/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite
diff --git a/branches/sca-java-1.x/itest/callablereferences-ws/src/main/resources/example.composite b/sca-java-1.x/trunk/itest/callablereferences-ws/src/main/resources/example.composite
index ea0819a32e..ea0819a32e 100644
--- a/branches/sca-java-1.x/itest/callablereferences-ws/src/main/resources/example.composite
+++ b/sca-java-1.x/trunk/itest/callablereferences-ws/src/main/resources/example.composite
diff --git a/branches/sca-java-1.x/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java b/sca-java-1.x/trunk/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java
index 310e31fb02..310e31fb02 100644
--- a/branches/sca-java-1.x/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java
+++ b/sca-java-1.x/trunk/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java
diff --git a/branches/sca-java-1.x/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java b/sca-java-1.x/trunk/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java
index 66fb2ef96c..66fb2ef96c 100644
--- a/branches/sca-java-1.x/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java
+++ b/sca-java-1.x/trunk/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java
diff --git a/branches/sca-java-1.x/itest/callablereferences/pom.xml b/sca-java-1.x/trunk/itest/callablereferences/pom.xml
index 7b4e3ee6f8..7b4e3ee6f8 100644
--- a/branches/sca-java-1.x/itest/callablereferences/pom.xml
+++ b/sca-java-1.x/trunk/itest/callablereferences/pom.xml
diff --git a/branches/sca-java-1.x/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java b/sca-java-1.x/trunk/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java
index 5934f16851..5934f16851 100644
--- a/branches/sca-java-1.x/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java
+++ b/sca-java-1.x/trunk/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java
diff --git a/branches/sca-java-1.x/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java b/sca-java-1.x/trunk/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java
index 7c2fd092dc..7c2fd092dc 100644
--- a/branches/sca-java-1.x/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java b/sca-java-1.x/trunk/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java
index ade672b0ab..ade672b0ab 100644
--- a/branches/sca-java-1.x/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java
+++ b/sca-java-1.x/trunk/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java
diff --git a/branches/sca-java-1.x/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java b/sca-java-1.x/trunk/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java
index 518e77d3a8..518e77d3a8 100644
--- a/branches/sca-java-1.x/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java b/sca-java-1.x/trunk/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java
index fdf80cc1c8..fdf80cc1c8 100644
--- a/branches/sca-java-1.x/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java
+++ b/sca-java-1.x/trunk/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java
diff --git a/branches/sca-java-1.x/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java b/sca-java-1.x/trunk/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java
index cc8ec8f000..cc8ec8f000 100644
--- a/branches/sca-java-1.x/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java b/sca-java-1.x/trunk/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java
index 48b697df31..48b697df31 100644
--- a/branches/sca-java-1.x/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java
+++ b/sca-java-1.x/trunk/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java
diff --git a/branches/sca-java-1.x/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java b/sca-java-1.x/trunk/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java
index 27ad48b9fe..27ad48b9fe 100644
--- a/branches/sca-java-1.x/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java b/sca-java-1.x/trunk/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java
index abcedfa6e1..abcedfa6e1 100644
--- a/branches/sca-java-1.x/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java
+++ b/sca-java-1.x/trunk/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java
diff --git a/branches/sca-java-1.x/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java b/sca-java-1.x/trunk/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java
index f2e0ce7582..f2e0ce7582 100644
--- a/branches/sca-java-1.x/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java b/sca-java-1.x/trunk/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java
index ab21421c4d..ab21421c4d 100644
--- a/branches/sca-java-1.x/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java
+++ b/sca-java-1.x/trunk/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java
diff --git a/branches/sca-java-1.x/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java b/sca-java-1.x/trunk/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java
index 5b5984b164..5b5984b164 100644
--- a/branches/sca-java-1.x/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java
+++ b/sca-java-1.x/trunk/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java
diff --git a/branches/sca-java-1.x/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java b/sca-java-1.x/trunk/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java
index 223c467f47..223c467f47 100644
--- a/branches/sca-java-1.x/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java
+++ b/sca-java-1.x/trunk/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java
diff --git a/branches/sca-java-1.x/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java b/sca-java-1.x/trunk/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java
index ed4e66bec3..ed4e66bec3 100644
--- a/branches/sca-java-1.x/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java
+++ b/sca-java-1.x/trunk/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java
diff --git a/branches/sca-java-1.x/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java b/sca-java-1.x/trunk/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java
index e32051373f..e32051373f 100644
--- a/branches/sca-java-1.x/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java
+++ b/sca-java-1.x/trunk/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java
diff --git a/branches/sca-java-1.x/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java b/sca-java-1.x/trunk/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java
index adf5a1c1ce..adf5a1c1ce 100644
--- a/branches/sca-java-1.x/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java
+++ b/sca-java-1.x/trunk/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java
diff --git a/branches/sca-java-1.x/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite b/sca-java-1.x/trunk/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite
index 0bf8f7ef1e..0bf8f7ef1e 100644
--- a/branches/sca-java-1.x/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite
+++ b/sca-java-1.x/trunk/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite
diff --git a/branches/sca-java-1.x/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite b/sca-java-1.x/trunk/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite
index 5b3add1e61..5b3add1e61 100644
--- a/branches/sca-java-1.x/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite
+++ b/sca-java-1.x/trunk/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite
diff --git a/branches/sca-java-1.x/itest/callablereferences/src/main/resources/CallableReferenceTest.composite b/sca-java-1.x/trunk/itest/callablereferences/src/main/resources/CallableReferenceTest.composite
index 49b75f56e4..49b75f56e4 100644
--- a/branches/sca-java-1.x/itest/callablereferences/src/main/resources/CallableReferenceTest.composite
+++ b/sca-java-1.x/trunk/itest/callablereferences/src/main/resources/CallableReferenceTest.composite
diff --git a/branches/sca-java-1.x/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite b/sca-java-1.x/trunk/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite
index 9216f44191..9216f44191 100644
--- a/branches/sca-java-1.x/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite
+++ b/sca-java-1.x/trunk/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite
diff --git a/branches/sca-java-1.x/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml
index 95021f72a4..95021f72a4 100644
--- a/branches/sca-java-1.x/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite b/sca-java-1.x/trunk/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite
index 42d739564c..42d739564c 100644
--- a/branches/sca-java-1.x/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite
+++ b/sca-java-1.x/trunk/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite
diff --git a/branches/sca-java-1.x/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml
index 2edda61601..2edda61601 100644
--- a/branches/sca-java-1.x/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java b/sca-java-1.x/trunk/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java
index a9cbb5d0a1..a9cbb5d0a1 100644
--- a/branches/sca-java-1.x/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java
+++ b/sca-java-1.x/trunk/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java
diff --git a/branches/sca-java-1.x/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java b/sca-java-1.x/trunk/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
index ba9020811c..ba9020811c 100644
--- a/branches/sca-java-1.x/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
+++ b/sca-java-1.x/trunk/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
diff --git a/branches/sca-java-1.x/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java b/sca-java-1.x/trunk/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java
index f2d8fe5d64..f2d8fe5d64 100644
--- a/branches/sca-java-1.x/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java
+++ b/sca-java-1.x/trunk/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java
diff --git a/branches/sca-java-1.x/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java b/sca-java-1.x/trunk/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java
index d785a6a397..d785a6a397 100644
--- a/branches/sca-java-1.x/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java
+++ b/sca-java-1.x/trunk/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java
diff --git a/branches/sca-java-1.x/itest/callback-api/pom.xml b/sca-java-1.x/trunk/itest/callback-api/pom.xml
index 001d1a0fd4..001d1a0fd4 100644
--- a/branches/sca-java-1.x/itest/callback-api/pom.xml
+++ b/sca-java-1.x/trunk/itest/callback-api/pom.xml
diff --git a/branches/sca-java-1.x/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java b/sca-java-1.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
index de17ba2f0d..de17ba2f0d 100644
--- a/branches/sca-java-1.x/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
+++ b/sca-java-1.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
diff --git a/branches/sca-java-1.x/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java b/sca-java-1.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
index 5fd4a71466..5fd4a71466 100644
--- a/branches/sca-java-1.x/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
+++ b/sca-java-1.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
diff --git a/branches/sca-java-1.x/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java b/sca-java-1.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
index 274984abb3..274984abb3 100644
--- a/branches/sca-java-1.x/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
+++ b/sca-java-1.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
diff --git a/branches/sca-java-1.x/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java b/sca-java-1.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
index 33de1e7739..33de1e7739 100644
--- a/branches/sca-java-1.x/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
+++ b/sca-java-1.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
diff --git a/branches/sca-java-1.x/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java b/sca-java-1.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
index 61e2c7ee8f..61e2c7ee8f 100644
--- a/branches/sca-java-1.x/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/callback-api/src/main/resources/CallBackApiTest.composite b/sca-java-1.x/trunk/itest/callback-api/src/main/resources/CallBackApiTest.composite
index 946c4862ee..946c4862ee 100644
--- a/branches/sca-java-1.x/itest/callback-api/src/main/resources/CallBackApiTest.composite
+++ b/sca-java-1.x/trunk/itest/callback-api/src/main/resources/CallBackApiTest.composite
diff --git a/branches/sca-java-1.x/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
index 19eb25631e..19eb25631e 100644
--- a/branches/sca-java-1.x/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java b/sca-java-1.x/trunk/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
index 9471049c74..9471049c74 100644
--- a/branches/sca-java-1.x/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
+++ b/sca-java-1.x/trunk/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
diff --git a/branches/sca-java-1.x/itest/callback-basic/pom.xml b/sca-java-1.x/trunk/itest/callback-basic/pom.xml
index 2f207b264f..2f207b264f 100644
--- a/branches/sca-java-1.x/itest/callback-basic/pom.xml
+++ b/sca-java-1.x/trunk/itest/callback-basic/pom.xml
diff --git a/branches/sca-java-1.x/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/sca-java-1.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
index 5e9d3d6821..5e9d3d6821 100644
--- a/branches/sca-java-1.x/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
+++ b/sca-java-1.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
diff --git a/branches/sca-java-1.x/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/sca-java-1.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
index 9f4019f28c..9f4019f28c 100644
--- a/branches/sca-java-1.x/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
+++ b/sca-java-1.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
diff --git a/branches/sca-java-1.x/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/sca-java-1.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
index e0e6d7eb8c..e0e6d7eb8c 100644
--- a/branches/sca-java-1.x/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
+++ b/sca-java-1.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
diff --git a/branches/sca-java-1.x/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/sca-java-1.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
index bd41fa7037..bd41fa7037 100644
--- a/branches/sca-java-1.x/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
+++ b/sca-java-1.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
diff --git a/branches/sca-java-1.x/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/sca-java-1.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
index 4ca2dc9af9..4ca2dc9af9 100644
--- a/branches/sca-java-1.x/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/callback-basic/src/main/resources/CallBackBasicTest.composite b/sca-java-1.x/trunk/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
index c506956088..c506956088 100644
--- a/branches/sca-java-1.x/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
+++ b/sca-java-1.x/trunk/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
diff --git a/branches/sca-java-1.x/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
index adf28214f6..adf28214f6 100644
--- a/branches/sca-java-1.x/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java b/sca-java-1.x/trunk/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
index 32c26a348a..32c26a348a 100644
--- a/branches/sca-java-1.x/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
+++ b/sca-java-1.x/trunk/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
diff --git a/branches/sca-java-1.x/itest/callback-complex-type/pom.xml b/sca-java-1.x/trunk/itest/callback-complex-type/pom.xml
index d88c594b1a..d88c594b1a 100644
--- a/branches/sca-java-1.x/itest/callback-complex-type/pom.xml
+++ b/sca-java-1.x/trunk/itest/callback-complex-type/pom.xml
diff --git a/branches/sca-java-1.x/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java b/sca-java-1.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
index 9fddb850ba..9fddb850ba 100644
--- a/branches/sca-java-1.x/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
+++ b/sca-java-1.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
diff --git a/branches/sca-java-1.x/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java b/sca-java-1.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
index 739983c277..739983c277 100644
--- a/branches/sca-java-1.x/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
+++ b/sca-java-1.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
diff --git a/branches/sca-java-1.x/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java b/sca-java-1.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
index d2b03fcde7..d2b03fcde7 100644
--- a/branches/sca-java-1.x/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
+++ b/sca-java-1.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
diff --git a/branches/sca-java-1.x/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java b/sca-java-1.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
index ffbf4f35fa..ffbf4f35fa 100644
--- a/branches/sca-java-1.x/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
+++ b/sca-java-1.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
diff --git a/branches/sca-java-1.x/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java b/sca-java-1.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
index dc31ed156b..dc31ed156b 100644
--- a/branches/sca-java-1.x/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite b/sca-java-1.x/trunk/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
index 3f48f16389..3f48f16389 100644
--- a/branches/sca-java-1.x/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
+++ b/sca-java-1.x/trunk/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
diff --git a/branches/sca-java-1.x/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType b/sca-java-1.x/trunk/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
index ff38134df5..ff38134df5 100644
--- a/branches/sca-java-1.x/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
+++ b/sca-java-1.x/trunk/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
diff --git a/branches/sca-java-1.x/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java b/sca-java-1.x/trunk/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java
index 33d1afaecd..33d1afaecd 100644
--- a/branches/sca-java-1.x/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java
+++ b/sca-java-1.x/trunk/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java
diff --git a/branches/sca-java-1.x/itest/callback-composite-scope/pom.xml b/sca-java-1.x/trunk/itest/callback-composite-scope/pom.xml
index 73122234ae..73122234ae 100644
--- a/branches/sca-java-1.x/itest/callback-composite-scope/pom.xml
+++ b/sca-java-1.x/trunk/itest/callback-composite-scope/pom.xml
diff --git a/branches/sca-java-1.x/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/Helloworld.java b/sca-java-1.x/trunk/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/Helloworld.java
index a5320a6492..a5320a6492 100644
--- a/branches/sca-java-1.x/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/Helloworld.java
+++ b/sca-java-1.x/trunk/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/Helloworld.java
diff --git a/branches/sca-java-1.x/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldCallback.java b/sca-java-1.x/trunk/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldCallback.java
index c37c2f57a2..c37c2f57a2 100644
--- a/branches/sca-java-1.x/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldCallback.java
+++ b/sca-java-1.x/trunk/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldCallback.java
diff --git a/branches/sca-java-1.x/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegate.java b/sca-java-1.x/trunk/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegate.java
index 0d56e440cd..0d56e440cd 100644
--- a/branches/sca-java-1.x/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegate.java
+++ b/sca-java-1.x/trunk/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegate.java
diff --git a/branches/sca-java-1.x/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegateImpl.java b/sca-java-1.x/trunk/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegateImpl.java
index aa7217eb2a..aa7217eb2a 100644
--- a/branches/sca-java-1.x/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegateImpl.java
+++ b/sca-java-1.x/trunk/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegateImpl.java
diff --git a/branches/sca-java-1.x/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldImpl.java b/sca-java-1.x/trunk/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldImpl.java
index 8107bcf42b..8107bcf42b 100644
--- a/branches/sca-java-1.x/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldImpl.java
+++ b/sca-java-1.x/trunk/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldImpl.java
diff --git a/branches/sca-java-1.x/itest/callback-composite-scope/src/main/resources/HelloworldDelegate.composite b/sca-java-1.x/trunk/itest/callback-composite-scope/src/main/resources/HelloworldDelegate.composite
index 1593c1dc23..1593c1dc23 100644
--- a/branches/sca-java-1.x/itest/callback-composite-scope/src/main/resources/HelloworldDelegate.composite
+++ b/sca-java-1.x/trunk/itest/callback-composite-scope/src/main/resources/HelloworldDelegate.composite
diff --git a/branches/sca-java-1.x/itest/callback-composite-scope/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/callback-composite-scope/src/main/resources/META-INF/sca-contribution.xml
index 65b9ca501f..65b9ca501f 100644
--- a/branches/sca-java-1.x/itest/callback-composite-scope/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/callback-composite-scope/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/callback-composite-scope/src/test/java/org/apache/tuscany/sca/test/CallbackTestCase.java b/sca-java-1.x/trunk/itest/callback-composite-scope/src/test/java/org/apache/tuscany/sca/test/CallbackTestCase.java
index bd967099dc..bd967099dc 100644
--- a/branches/sca-java-1.x/itest/callback-composite-scope/src/test/java/org/apache/tuscany/sca/test/CallbackTestCase.java
+++ b/sca-java-1.x/trunk/itest/callback-composite-scope/src/test/java/org/apache/tuscany/sca/test/CallbackTestCase.java
diff --git a/branches/sca-java-1.x/itest/callback-id/pom.xml b/sca-java-1.x/trunk/itest/callback-id/pom.xml
index 7899562aa3..7899562aa3 100644
--- a/branches/sca-java-1.x/itest/callback-id/pom.xml
+++ b/sca-java-1.x/trunk/itest/callback-id/pom.xml
diff --git a/branches/sca-java-1.x/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java b/sca-java-1.x/trunk/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
index b14560a8c3..b14560a8c3 100644
--- a/branches/sca-java-1.x/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
+++ b/sca-java-1.x/trunk/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
diff --git a/branches/sca-java-1.x/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java b/sca-java-1.x/trunk/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
index a9e551f8b4..a9e551f8b4 100644
--- a/branches/sca-java-1.x/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
+++ b/sca-java-1.x/trunk/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
diff --git a/branches/sca-java-1.x/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java b/sca-java-1.x/trunk/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
index 59c9c3d069..59c9c3d069 100644
--- a/branches/sca-java-1.x/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
+++ b/sca-java-1.x/trunk/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
diff --git a/branches/sca-java-1.x/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java b/sca-java-1.x/trunk/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
index 18c592a1c1..18c592a1c1 100644
--- a/branches/sca-java-1.x/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
+++ b/sca-java-1.x/trunk/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
diff --git a/branches/sca-java-1.x/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java b/sca-java-1.x/trunk/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
index 8b0a4b69cf..8b0a4b69cf 100644
--- a/branches/sca-java-1.x/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/callback-id/src/main/resources/CallBackIdClient.composite b/sca-java-1.x/trunk/itest/callback-id/src/main/resources/CallBackIdClient.composite
index c9a6ba6258..c9a6ba6258 100644
--- a/branches/sca-java-1.x/itest/callback-id/src/main/resources/CallBackIdClient.composite
+++ b/sca-java-1.x/trunk/itest/callback-id/src/main/resources/CallBackIdClient.composite
diff --git a/branches/sca-java-1.x/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java b/sca-java-1.x/trunk/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java
index 771fbb8ff7..771fbb8ff7 100644
--- a/branches/sca-java-1.x/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java
+++ b/sca-java-1.x/trunk/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java
diff --git a/branches/sca-java-1.x/itest/callback-multiple-wires/pom.xml b/sca-java-1.x/trunk/itest/callback-multiple-wires/pom.xml
index b9da775638..b9da775638 100644
--- a/branches/sca-java-1.x/itest/callback-multiple-wires/pom.xml
+++ b/sca-java-1.x/trunk/itest/callback-multiple-wires/pom.xml
diff --git a/branches/sca-java-1.x/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java b/sca-java-1.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
index 7c80d222fc..7c80d222fc 100644
--- a/branches/sca-java-1.x/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
+++ b/sca-java-1.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
diff --git a/branches/sca-java-1.x/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java b/sca-java-1.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
index df91f3d268..df91f3d268 100644
--- a/branches/sca-java-1.x/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
+++ b/sca-java-1.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
diff --git a/branches/sca-java-1.x/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java b/sca-java-1.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
index a0a9564002..a0a9564002 100644
--- a/branches/sca-java-1.x/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
+++ b/sca-java-1.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
diff --git a/branches/sca-java-1.x/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java b/sca-java-1.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
index cfd601f546..cfd601f546 100644
--- a/branches/sca-java-1.x/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
+++ b/sca-java-1.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
diff --git a/branches/sca-java-1.x/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java b/sca-java-1.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
index f198efae51..f198efae51 100644
--- a/branches/sca-java-1.x/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
+++ b/sca-java-1.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
diff --git a/branches/sca-java-1.x/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java b/sca-java-1.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
index d19b3fe355..d19b3fe355 100644
--- a/branches/sca-java-1.x/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite b/sca-java-1.x/trunk/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
index 3dae3ca3a8..3dae3ca3a8 100644
--- a/branches/sca-java-1.x/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
+++ b/sca-java-1.x/trunk/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
diff --git a/branches/sca-java-1.x/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java b/sca-java-1.x/trunk/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
index 3c83e4bedd..3c83e4bedd 100644
--- a/branches/sca-java-1.x/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
+++ b/sca-java-1.x/trunk/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
diff --git a/branches/sca-java-1.x/itest/callback-separatethread/pom.xml b/sca-java-1.x/trunk/itest/callback-separatethread/pom.xml
index 71e5b38736..71e5b38736 100644
--- a/branches/sca-java-1.x/itest/callback-separatethread/pom.xml
+++ b/sca-java-1.x/trunk/itest/callback-separatethread/pom.xml
diff --git a/branches/sca-java-1.x/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java b/sca-java-1.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
index f812a39058..f812a39058 100644
--- a/branches/sca-java-1.x/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
+++ b/sca-java-1.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
diff --git a/branches/sca-java-1.x/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java b/sca-java-1.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
index e861f8a3d1..e861f8a3d1 100644
--- a/branches/sca-java-1.x/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
+++ b/sca-java-1.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
diff --git a/branches/sca-java-1.x/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java b/sca-java-1.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
index ae41f596fc..ae41f596fc 100644
--- a/branches/sca-java-1.x/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
+++ b/sca-java-1.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
diff --git a/branches/sca-java-1.x/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java b/sca-java-1.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
index c22b8cceec..c22b8cceec 100644
--- a/branches/sca-java-1.x/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
+++ b/sca-java-1.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
diff --git a/branches/sca-java-1.x/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java b/sca-java-1.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
index 4d672b3a8b..4d672b3a8b 100644
--- a/branches/sca-java-1.x/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite b/sca-java-1.x/trunk/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
index e111e5074c..e111e5074c 100644
--- a/branches/sca-java-1.x/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
+++ b/sca-java-1.x/trunk/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
diff --git a/branches/sca-java-1.x/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java b/sca-java-1.x/trunk/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
index f7e7be2133..f7e7be2133 100644
--- a/branches/sca-java-1.x/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
+++ b/sca-java-1.x/trunk/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
diff --git a/branches/sca-java-1.x/itest/callback-set-callback/pom.xml b/sca-java-1.x/trunk/itest/callback-set-callback/pom.xml
index 2968f8938c..2968f8938c 100644
--- a/branches/sca-java-1.x/itest/callback-set-callback/pom.xml
+++ b/sca-java-1.x/trunk/itest/callback-set-callback/pom.xml
diff --git a/branches/sca-java-1.x/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java b/sca-java-1.x/trunk/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
index 3b9599f53f..3b9599f53f 100644
--- a/branches/sca-java-1.x/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
+++ b/sca-java-1.x/trunk/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
diff --git a/branches/sca-java-1.x/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java b/sca-java-1.x/trunk/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
index 48752f2ea1..48752f2ea1 100644
--- a/branches/sca-java-1.x/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
+++ b/sca-java-1.x/trunk/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
diff --git a/branches/sca-java-1.x/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java b/sca-java-1.x/trunk/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
index ad0e0603a3..ad0e0603a3 100644
--- a/branches/sca-java-1.x/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
+++ b/sca-java-1.x/trunk/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
diff --git a/branches/sca-java-1.x/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java b/sca-java-1.x/trunk/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
index 0a22b0e01f..0a22b0e01f 100644
--- a/branches/sca-java-1.x/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
+++ b/sca-java-1.x/trunk/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
diff --git a/branches/sca-java-1.x/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java b/sca-java-1.x/trunk/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
index 94cb6aa73b..94cb6aa73b 100644
--- a/branches/sca-java-1.x/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
+++ b/sca-java-1.x/trunk/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
diff --git a/branches/sca-java-1.x/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java b/sca-java-1.x/trunk/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
index 66e4d3fc05..66e4d3fc05 100644
--- a/branches/sca-java-1.x/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
+++ b/sca-java-1.x/trunk/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
diff --git a/branches/sca-java-1.x/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java b/sca-java-1.x/trunk/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
index afedcdf7f1..afedcdf7f1 100644
--- a/branches/sca-java-1.x/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
+++ b/sca-java-1.x/trunk/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
diff --git a/branches/sca-java-1.x/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java b/sca-java-1.x/trunk/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
index 4a6c9dbaa6..4a6c9dbaa6 100644
--- a/branches/sca-java-1.x/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite b/sca-java-1.x/trunk/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
index 3552ddecab..3552ddecab 100644
--- a/branches/sca-java-1.x/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
+++ b/sca-java-1.x/trunk/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
diff --git a/branches/sca-java-1.x/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java b/sca-java-1.x/trunk/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java
index 496ae0b1a5..496ae0b1a5 100644
--- a/branches/sca-java-1.x/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java
+++ b/sca-java-1.x/trunk/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java
diff --git a/branches/sca-java-1.x/itest/callback-set-conversation/pom.xml b/sca-java-1.x/trunk/itest/callback-set-conversation/pom.xml
index e08231f266..e08231f266 100644
--- a/branches/sca-java-1.x/itest/callback-set-conversation/pom.xml
+++ b/sca-java-1.x/trunk/itest/callback-set-conversation/pom.xml
diff --git a/branches/sca-java-1.x/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java b/sca-java-1.x/trunk/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
index d97c69eaed..d97c69eaed 100644
--- a/branches/sca-java-1.x/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
+++ b/sca-java-1.x/trunk/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
diff --git a/branches/sca-java-1.x/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java b/sca-java-1.x/trunk/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
index a704fd0ece..a704fd0ece 100644
--- a/branches/sca-java-1.x/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
+++ b/sca-java-1.x/trunk/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
diff --git a/branches/sca-java-1.x/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java b/sca-java-1.x/trunk/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
index 013424bf5e..013424bf5e 100644
--- a/branches/sca-java-1.x/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
+++ b/sca-java-1.x/trunk/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
diff --git a/branches/sca-java-1.x/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java b/sca-java-1.x/trunk/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
index 5d692e7728..5d692e7728 100644
--- a/branches/sca-java-1.x/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
+++ b/sca-java-1.x/trunk/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
diff --git a/branches/sca-java-1.x/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java b/sca-java-1.x/trunk/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
index 75a4a3a6a0..75a4a3a6a0 100644
--- a/branches/sca-java-1.x/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
+++ b/sca-java-1.x/trunk/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
diff --git a/branches/sca-java-1.x/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java b/sca-java-1.x/trunk/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
index e7a3b144f6..e7a3b144f6 100644
--- a/branches/sca-java-1.x/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
+++ b/sca-java-1.x/trunk/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
diff --git a/branches/sca-java-1.x/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java b/sca-java-1.x/trunk/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
index 692b6dfc35..692b6dfc35 100644
--- a/branches/sca-java-1.x/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
+++ b/sca-java-1.x/trunk/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
diff --git a/branches/sca-java-1.x/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java b/sca-java-1.x/trunk/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
index bca94ce407..bca94ce407 100644
--- a/branches/sca-java-1.x/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite b/sca-java-1.x/trunk/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
index ce73417f94..ce73417f94 100644
--- a/branches/sca-java-1.x/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
+++ b/sca-java-1.x/trunk/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
diff --git a/branches/sca-java-1.x/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java b/sca-java-1.x/trunk/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java
index 45bdaea9ab..45bdaea9ab 100644
--- a/branches/sca-java-1.x/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java
+++ b/sca-java-1.x/trunk/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java
diff --git a/branches/sca-java-1.x/itest/component-type/pom.xml b/sca-java-1.x/trunk/itest/component-type/pom.xml
index 053eec830e..053eec830e 100644
--- a/branches/sca-java-1.x/itest/component-type/pom.xml
+++ b/sca-java-1.x/trunk/itest/component-type/pom.xml
diff --git a/branches/sca-java-1.x/itest/component-type/src/main/java/calculator/AddService.java b/sca-java-1.x/trunk/itest/component-type/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-java-1.x/itest/component-type/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/trunk/itest/component-type/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.x/itest/component-type/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/trunk/itest/component-type/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/branches/sca-java-1.x/itest/component-type/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/component-type/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/component-type/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/trunk/itest/component-type/src/main/java/calculator/CalculatorClient.java
index 08afd922b3..08afd922b3 100644
--- a/branches/sca-java-1.x/itest/component-type/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/trunk/itest/component-type/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.x/itest/component-type/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/trunk/itest/component-type/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-1.x/itest/component-type/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/trunk/itest/component-type/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.x/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/trunk/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
index 1209ac128a..1209ac128a 100644
--- a/branches/sca-java-1.x/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/component-type/src/main/java/calculator/DivideService.java b/sca-java-1.x/trunk/itest/component-type/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-1.x/itest/component-type/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/trunk/itest/component-type/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.x/itest/component-type/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/trunk/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-java-1.x/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/component-type/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/trunk/itest/component-type/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.x/itest/component-type/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/trunk/itest/component-type/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.x/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/trunk/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-java-1.x/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/component-type/src/main/java/calculator/SubtractService.java b/sca-java-1.x/trunk/itest/component-type/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-java-1.x/itest/component-type/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/trunk/itest/component-type/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.x/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/trunk/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/branches/sca-java-1.x/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/component-type/src/main/resources/Calculator.composite b/sca-java-1.x/trunk/itest/component-type/src/main/resources/Calculator.composite
index b229787657..b229787657 100644
--- a/branches/sca-java-1.x/itest/component-type/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/component-type/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType b/sca-java-1.x/trunk/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
index 00c48e5a35..00c48e5a35 100644
--- a/branches/sca-java-1.x/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
+++ b/sca-java-1.x/trunk/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
diff --git a/branches/sca-java-1.x/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType b/sca-java-1.x/trunk/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
index 74bedc0a98..74bedc0a98 100644
--- a/branches/sca-java-1.x/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
+++ b/sca-java-1.x/trunk/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
diff --git a/branches/sca-java-1.x/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType b/sca-java-1.x/trunk/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
index 289fcc3e11..289fcc3e11 100644
--- a/branches/sca-java-1.x/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
+++ b/sca-java-1.x/trunk/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
diff --git a/branches/sca-java-1.x/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType b/sca-java-1.x/trunk/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
index 2d8a879cda..2d8a879cda 100644
--- a/branches/sca-java-1.x/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
+++ b/sca-java-1.x/trunk/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
diff --git a/branches/sca-java-1.x/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType b/sca-java-1.x/trunk/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
index 6214955141..6214955141 100644
--- a/branches/sca-java-1.x/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
+++ b/sca-java-1.x/trunk/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
diff --git a/branches/sca-java-1.x/itest/component-type/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/trunk/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
index 08fc8e33bf..08fc8e33bf 100644
--- a/branches/sca-java-1.x/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/trunk/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/build-jar.xml b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/build-jar.xml
index 299ce6864f..299ce6864f 100644
--- a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/build-jar.xml
+++ b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/build-jar.xml
diff --git a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/pom.xml b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/pom.xml
index c709557967..c709557967 100644
--- a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
index 814c38777a..814c38777a 100644
--- a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
diff --git a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index e4daf0ec02..e4daf0ec02 100644
--- a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
index e4b3bc7048..e4b3bc7048 100644
--- a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index 698aa2aa5d..698aa2aa5d 100644
--- a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
diff --git a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index 9e01f00a79..9e01f00a79 100644
--- a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
diff --git a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index cdd12d589d..cdd12d589d 100644
--- a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
index 714d1826e1..714d1826e1 100644
--- a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
index 7f7dc969e2..7f7dc969e2 100644
--- a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
index 7f7dc969e2..7f7dc969e2 100644
--- a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
index 8a2bec308f..8a2bec308f 100644
--- a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
index c77c4c1c7e..c77c4c1c7e 100644
--- a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
index 210a68011f..210a68011f 100644
--- a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
index d118cceef9..d118cceef9 100644
--- a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
index d37b6659da..d37b6659da 100644
--- a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
index 77b28d9023..77b28d9023 100644
--- a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
index 8ec290a831..8ec290a831 100644
--- a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
index 1398416978..1398416978 100644
--- a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
index db1f0d34e7..db1f0d34e7 100644
--- a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
+++ b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
diff --git a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
index 5be79b741a..5be79b741a 100644
--- a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
+++ b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
diff --git a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
index a76fae8090..a76fae8090 100644
--- a/branches/sca-java-1.x/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
+++ b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
diff --git a/branches/sca-java-1.x/itest/contribution-classloader/contribution-test/pom.xml b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-test/pom.xml
index ff2d0d3633..ff2d0d3633 100644
--- a/branches/sca-java-1.x/itest/contribution-classloader/contribution-test/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-test/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java
index 692f16f6f6..692f16f6f6 100644
--- a/branches/sca-java-1.x/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java
+++ b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java
diff --git a/branches/sca-java-1.x/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
index 1ec7aaaa3a..1ec7aaaa3a 100644
--- a/branches/sca-java-1.x/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
+++ b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
diff --git a/branches/sca-java-1.x/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
index b123951ef6..b123951ef6 100644
--- a/branches/sca-java-1.x/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
+++ b/sca-java-1.x/trunk/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
diff --git a/branches/sca-java-1.x/itest/contribution-classloader/pom.xml b/sca-java-1.x/trunk/itest/contribution-classloader/pom.xml
index 2708a74229..2708a74229 100644
--- a/branches/sca-java-1.x/itest/contribution-classloader/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-classloader/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-folder/pom.xml b/sca-java-1.x/trunk/itest/contribution-folder/pom.xml
index 783288eea8..783288eea8 100644
--- a/branches/sca-java-1.x/itest/contribution-folder/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-folder/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-folder/src/test/java/ContributionFolderTestCase.java b/sca-java-1.x/trunk/itest/contribution-folder/src/test/java/ContributionFolderTestCase.java
index 9f9c15c14d..9f9c15c14d 100644
--- a/branches/sca-java-1.x/itest/contribution-folder/src/test/java/ContributionFolderTestCase.java
+++ b/sca-java-1.x/trunk/itest/contribution-folder/src/test/java/ContributionFolderTestCase.java
diff --git a/branches/sca-java-1.x/itest/contribution-folder/src/test/java/ContributionZIPTestCase.java b/sca-java-1.x/trunk/itest/contribution-folder/src/test/java/ContributionZIPTestCase.java
index 98bbe3935a..98bbe3935a 100644
--- a/branches/sca-java-1.x/itest/contribution-folder/src/test/java/ContributionZIPTestCase.java
+++ b/sca-java-1.x/trunk/itest/contribution-folder/src/test/java/ContributionZIPTestCase.java
diff --git a/branches/sca-java-1.x/itest/contribution-folder/src/test/java/calculator/CalculatorService.java b/sca-java-1.x/trunk/itest/contribution-folder/src/test/java/calculator/CalculatorService.java
index a318cf50d9..a318cf50d9 100644
--- a/branches/sca-java-1.x/itest/contribution-folder/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/trunk/itest/contribution-folder/src/test/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite b/sca-java-1.x/trunk/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite
index ac88b2ac48..ac88b2ac48 100644
--- a/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml
index 8b60ae590c..8b60ae590c 100644
--- a/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar b/sca-java-1.x/trunk/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar
index 7e4a7132a3..7e4a7132a3 100644
--- a/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar
+++ b/sca-java-1.x/trunk/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar
diff --git a/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar b/sca-java-1.x/trunk/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar
index 0e16e11b0b..0e16e11b0b 100644
--- a/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar
+++ b/sca-java-1.x/trunk/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar
diff --git a/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository3/contribution.zip b/sca-java-1.x/trunk/itest/contribution-folder/src/test/resources/repository3/contribution.zip
index b293aa4bcc..b293aa4bcc 100644
--- a/branches/sca-java-1.x/itest/contribution-folder/src/test/resources/repository3/contribution.zip
+++ b/sca-java-1.x/trunk/itest/contribution-folder/src/test/resources/repository3/contribution.zip
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/export-composite/pom.xml b/sca-java-1.x/trunk/itest/contribution-import-export/export-composite/pom.xml
index 38e37a7080..38e37a7080 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/export-composite/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/export-composite/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java b/sca-java-1.x/trunk/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
index e65422136f..e65422136f 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java b/sca-java-1.x/trunk/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
index 5369c18497..5369c18497 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
index 3c14560a56..3c14560a56 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/export-composite/src/main/resources/hello.composite b/sca-java-1.x/trunk/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
index 636b7111d9..636b7111d9 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java b/sca-java-1.x/trunk/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
index 72b77564d2..72b77564d2 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/export-java/pom.xml b/sca-java-1.x/trunk/itest/contribution-import-export/export-java/pom.xml
index 4f361a12f5..4f361a12f5 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/export-java/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/export-java/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/trunk/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
index 74d22ed830..74d22ed830 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
index dc33dfa560..dc33dfa560 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType b/sca-java-1.x/trunk/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
index 5a14b41650..5a14b41650 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/export-resource/pom.xml b/sca-java-1.x/trunk/itest/contribution-import-export/export-resource/pom.xml
index d8133c4acc..d8133c4acc 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/export-resource/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/export-resource/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
index f11eacb416..f11eacb416 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html b/sca-java-1.x/trunk/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
index 1ff281373a..1ff281373a 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/export-wsdl/pom.xml b/sca-java-1.x/trunk/itest/contribution-import-export/export-wsdl/pom.xml
index 9f81cd92ca..9f81cd92ca 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/export-wsdl/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/export-wsdl/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
index b7394ec14b..b7394ec14b 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl b/sca-java-1.x/trunk/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
index 9b31363e1a..9b31363e1a 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd b/sca-java-1.x/trunk/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
index d3c83b08c6..d3c83b08c6 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/import-composite/pom.xml b/sca-java-1.x/trunk/itest/contribution-import-export/import-composite/pom.xml
index d13f2e2a87..d13f2e2a87 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/import-composite/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/import-composite/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/trunk/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
index 966f56d7d5..966f56d7d5 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/trunk/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
index 3d43290380..3d43290380 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/trunk/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
index 74d22ed830..74d22ed830 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
index 9f3f5be452..9f3f5be452 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl b/sca-java-1.x/trunk/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
index 9b31363e1a..9b31363e1a 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd b/sca-java-1.x/trunk/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
index d3c83b08c6..d3c83b08c6 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite b/sca-java-1.x/trunk/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
index e2f852ff7e..e2f852ff7e 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java b/sca-java-1.x/trunk/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
index 1176a89143..1176a89143 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/import-java/pom.xml b/sca-java-1.x/trunk/itest/contribution-import-export/import-java/pom.xml
index f05c62f8ca..f05c62f8ca 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/import-java/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/import-java/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/trunk/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
index 4cdcc1fd0b..4cdcc1fd0b 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
index 224e2c4d79..224e2c4d79 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite b/sca-java-1.x/trunk/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
index 9b650e4acc..9b650e4acc 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/sca-java-1.x/trunk/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
index 431988cc04..431988cc04 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/import-resource/pom.xml b/sca-java-1.x/trunk/itest/contribution-import-export/import-resource/pom.xml
index 0696df1951..0696df1951 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/import-resource/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/import-resource/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
index ac6d7becb3..ac6d7becb3 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/import-resource/src/main/resources/store.composite b/sca-java-1.x/trunk/itest/contribution-import-export/import-resource/src/main/resources/store.composite
index bb5a7b764f..bb5a7b764f 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/import-resource/src/main/resources/store.composite
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/import-resource/src/main/resources/store.composite
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java b/sca-java-1.x/trunk/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
index 1b7542b7d9..1b7542b7d9 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/import-wsdl/pom.xml b/sca-java-1.x/trunk/itest/contribution-import-export/import-wsdl/pom.xml
index 59bee4125e..59bee4125e 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/import-wsdl/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/import-wsdl/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/trunk/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
index 4cdcc1fd0b..4cdcc1fd0b 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/trunk/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
index 3d43290380..3d43290380 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/trunk/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
index 74d22ed830..74d22ed830 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
index d46fe0b57c..d46fe0b57c 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite b/sca-java-1.x/trunk/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
index 5008a2ea5b..5008a2ea5b 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/sca-java-1.x/trunk/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
index 5c40606e50..5c40606e50 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
diff --git a/branches/sca-java-1.x/itest/contribution-import-export/pom.xml b/sca-java-1.x/trunk/itest/contribution-import-export/pom.xml
index ff6a4bbf12..ff6a4bbf12 100644
--- a/branches/sca-java-1.x/itest/contribution-import-export/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-import-export/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/pom.xml
index 74687aedbf..74687aedbf 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/src/main/application/META-INF/application.composite b/sca-java-1.x/trunk/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/src/main/application/META-INF/application.composite
index 3b1555f567..3b1555f567 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/src/main/application/META-INF/application.composite
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/src/main/application/META-INF/application.composite
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml
index 32aa604cba..32aa604cba 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite b/sca-java-1.x/trunk/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite
index b131d375b0..b131d375b0 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/resources/isthisignored.composite b/sca-java-1.x/trunk/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/resources/isthisignored.composite
index 90872041b0..90872041b0 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/resources/isthisignored.composite
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/resources/isthisignored.composite
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/ear-nonenhanced/pom.xml
index 57054b4a5d..57054b4a5d 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ear-nonenhanced/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/pom.xml
index e7ea217b2a..e7ea217b2a 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/java/sample/ejb3/HelloworldService.java
index 73d816311f..73d816311f 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/java/sample/ejb3/HelloworldService.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/java/sample/ejb3/HelloworldService.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/java/sample/ejb3/HelloworldServiceBean.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/java/sample/ejb3/HelloworldServiceBean.java
index 19879d9c42..19879d9c42 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/java/sample/ejb3/HelloworldServiceBean.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/java/sample/ejb3/HelloworldServiceBean.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/resources/META-INF/ejb-jar.composite b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/resources/META-INF/ejb-jar.composite
index a6701d36cb..a6701d36cb 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/resources/META-INF/ejb-jar.composite
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/resources/META-INF/ejb-jar.composite
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/resources/META-INF/openejb-jar.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/resources/META-INF/openejb-jar.xml
index 13a375bc0b..13a375bc0b 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/resources/META-INF/openejb-jar.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/resources/META-INF/openejb-jar.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/resources/META-INF/sca-contribution.xml
index bc8fb5366d..bc8fb5366d 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-explicit/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/pom.xml
index 1bf1c63799..1bf1c63799 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java
index 0194d1870c..0194d1870c 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldServiceBean.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldServiceBean.java
index ad9003dc67..ad9003dc67 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldServiceBean.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldServiceBean.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/ejb-jar.composite b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/ejb-jar.composite
index bcaa154913..bcaa154913 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/ejb-jar.composite
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/ejb-jar.composite
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/openejb-jar.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/openejb-jar.xml
index 9a97cbd535..9a97cbd535 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/openejb-jar.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/openejb-jar.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-enhanced/pom.xml
index 44a0b85dc2..44a0b85dc2 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-enhanced/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldLocal8.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldLocal8.java
index b5224a2319..b5224a2319 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldLocal8.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldLocal8.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8.java
index e5e9fe6a82..e5e9fe6a82 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java
index a6d7f2dd04..a6d7f2dd04 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/META-INF/openejb-jar.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/META-INF/openejb-jar.xml
index db36c4b140..db36c4b140 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/META-INF/openejb-jar.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/META-INF/openejb-jar.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/isthisignored.composite b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/isthisignored.composite
index 90872041b0..90872041b0 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/isthisignored.composite
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/isthisignored.composite
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml
index 29690543e8..29690543e8 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldLocal7.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldLocal7.java
index 4df5cd37de..4df5cd37de 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldLocal7.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldLocal7.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7.java
index 41ecddb62e..41ecddb62e 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7Bean.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7Bean.java
index 403ead623c..403ead623c 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7Bean.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7Bean.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7aBean.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7aBean.java
index 97242bff96..97242bff96 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7aBean.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7aBean.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml
index 7428735903..7428735903 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/jar-shared/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/jar-shared/pom.xml
index f32ff8f6ab..f32ff8f6ab 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/jar-shared/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/jar-shared/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJava.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJava.java
index 5a08769550..5a08769550 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJava.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJava.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJavaImpl.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJavaImpl.java
index 265af5b3a0..265af5b3a0 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJavaImpl.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJavaImpl.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/JarMain.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/JarMain.java
index 81793e47e6..81793e47e6 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/JarMain.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/JarMain.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/pom.xml
index a1a80f047c..a1a80f047c 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/sample-11-client/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/sample-11-client/pom.xml
index 15eaa7f3f3..15eaa7f3f3 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/sample-11-client/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/sample-11-client/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/sample-11-client/src/main/java/sample/HelloworldServlet.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/sample-11-client/src/main/java/sample/HelloworldServlet.java
index 43870422c0..43870422c0 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/sample-11-client/src/main/java/sample/HelloworldServlet.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/sample-11-client/src/main/java/sample/HelloworldServlet.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/sample-11-client/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/sample-11-client/src/main/java/sample/ejb3/HelloworldService.java
index 73d816311f..73d816311f 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/sample-11-client/src/main/java/sample/ejb3/HelloworldService.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/sample-11-client/src/main/java/sample/ejb3/HelloworldService.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/geronimo-web.xml
index 1f4d7195c0..1f4d7195c0 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/web.composite b/sca-java-1.x/trunk/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/web.composite
index b284b201e4..b284b201e4 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/web.composite
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/web.xml
index 1947a53cf0..1947a53cf0 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/sample-11-client/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/sample-11-client/src/main/webapp/hello.html b/sca-java-1.x/trunk/itest/contribution-jee-samples/sample-11-client/src/main/webapp/hello.html
index bba288b4aa..bba288b4aa 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/sample-11-client/src/main/webapp/hello.html
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/sample-11-client/src/main/webapp/hello.html
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/pom.xml
index 7852f46dd3..7852f46dd3 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java
index 0194d1870c..0194d1870c 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/java/HelloworldServiceJava.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/java/HelloworldServiceJava.java
index 1fad282a75..1fad282a75 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/java/HelloworldServiceJava.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/java/HelloworldServiceJava.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2.java
index 8adb6a5995..8adb6a5995 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java
index ae16263505..ae16263505 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java
index 05885cead7..05885cead7 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/resources/helloworld.composite b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/resources/helloworld.composite
index e9346fb2bb..e9346fb2bb 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/resources/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/resources/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml
index 306b27fd5c..306b27fd5c 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java
index 0194d1870c..0194d1870c 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/java/HelloworldServiceJava.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/java/HelloworldServiceJava.java
index 1fad282a75..1fad282a75 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/java/HelloworldServiceJava.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/java/HelloworldServiceJava.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2.java
index 8adb6a5995..8adb6a5995 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java
index ae16263505..ae16263505 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java
index 05885cead7..05885cead7 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite
index 8f8d46ccd7..8f8d46ccd7 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml
index d13e11262c..d13e11262c 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
index 0194d1870c..0194d1870c 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java
index 6f37c9b272..6f37c9b272 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java
index a38c4a773f..a38c4a773f 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite
index 79c9dd3243..79c9dd3243 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ejb-nonenhanced/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ejb-nonenhanced/pom.xml
index 258e7c73d1..258e7c73d1 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ejb-nonenhanced/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ejb-nonenhanced/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
index 0194d1870c..0194d1870c 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java
index 6f37c9b272..6f37c9b272 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java
index a38c4a773f..a38c4a773f 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/resources/helloworld.composite b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/resources/helloworld.composite
index 5fa7cda269..5fa7cda269 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/resources/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scajar-ejb-nonenhanced/src/main/resources/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-ejb-appcomp/build.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-ejb-appcomp/build.xml
index bdbe79a46d..bdbe79a46d 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-ejb-appcomp/build.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-ejb-appcomp/build.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml
index 417a97c087..417a97c087 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/ejb3/HelloworldService.java
index 0194d1870c..0194d1870c 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/ejb3/HelloworldService.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/ejb3/HelloworldService.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClient.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClient.java
index 6f37c9b272..6f37c9b272 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClient.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClient.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java
index a38c4a773f..a38c4a773f 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite
index 909b8a1484..909b8a1484 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/build.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-war-appcomp/build.xml
index bdbe79a46d..bdbe79a46d 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/build.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-war-appcomp/build.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml
index 5965b2aaa8..5965b2aaa8 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java
index 0194d1870c..0194d1870c 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClient.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClient.java
index 6f37c9b272..6f37c9b272 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClient.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClient.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java
index a38c4a773f..a38c4a773f 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite
index eaa567595e..eaa567595e 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml
index 4129a0702b..4129a0702b 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java
index ae8613f8db..ae8613f8db 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java
index 0194d1870c..0194d1870c 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml
index 2563c8b7c8..2563c8b7c8 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite
index 823085e81f..823085e81f 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml
index 628588a974..628588a974 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html
index 69473543c9..69473543c9 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-nonenhanced/pom.xml
index 26f996bd6a..26f996bd6a 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-nonenhanced/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java
index 71055bbdfe..71055bbdfe 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
index 0194d1870c..0194d1870c 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml
index 2563c8b7c8..2563c8b7c8 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml
index 628588a974..628588a974 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html
index 69473543c9..69473543c9 100644
--- a/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html
+++ b/sca-java-1.x/trunk/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html
diff --git a/branches/sca-java-1.x/itest/contribution-jee/pom.xml b/sca-java-1.x/trunk/itest/contribution-jee/pom.xml
index 05076abb79..05076abb79 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-jee/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProvider.java b/sca-java-1.x/trunk/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProvider.java
index e7e1d90797..e7e1d90797 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProvider.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProvider.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProviderFactory.java b/sca-java-1.x/trunk/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProviderFactory.java
index 4660fee7fd..4660fee7fd 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProviderFactory.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProviderFactory.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java b/sca-java-1.x/trunk/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java
index 1c4bd34352..1c4bd34352 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/trunk/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index a39171507c..a39171507c 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/trunk/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index adc93d9015..adc93d9015 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java
index b81f67c287..b81f67c287 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/EjbAppcompTestCase.java b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/EjbAppcompTestCase.java
index 4241b7928f..4241b7928f 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/EjbAppcompTestCase.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/EjbAppcompTestCase.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java
index 64c31b4393..64c31b4393 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompWarAppcompTestCase.java b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompWarAppcompTestCase.java
index 9f50ea573c..9f50ea573c 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompWarAppcompTestCase.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompWarAppcompTestCase.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java
index 97e23d1bf7..97e23d1bf7 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEjbNonenhancedTestCase.java b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEjbNonenhancedTestCase.java
index fd556493bc..fd556493bc 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEjbNonenhancedTestCase.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEjbNonenhancedTestCase.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java
index db4d9e5bf6..db4d9e5bf6 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipWarAppcompTestCase.java b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipWarAppcompTestCase.java
index 211f51c9bd..211f51c9bd 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipWarAppcompTestCase.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipWarAppcompTestCase.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java
index 7696b64f9c..7696b64f9c 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WarAppcompTestCase.java b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WarAppcompTestCase.java
index f54a4f98df..f54a4f98df 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WarAppcompTestCase.java
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WarAppcompTestCase.java
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear
index 11d2a029ec..11d2a029ec 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar
index a5b160c875..a5b160c875 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear
index 9fb1ed9d14..9fb1ed9d14 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar
index 3a704137ed..3a704137ed 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar
index 228f4d27d7..228f4d27d7 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war
index 0b75db2745..0b75db2745 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/helloworld-web.war b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/helloworld-web.war
index 938ea75941..938ea75941 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/helloworld-web.war
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/helloworld-web.war
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar
index 24f55a5f63..24f55a5f63 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar
diff --git a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/simple-app.ear b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/simple-app.ear
index c912e64237..c912e64237 100644
--- a/branches/sca-java-1.x/itest/contribution-jee/src/test/resources/repository/simple-app.ear
+++ b/sca-java-1.x/trunk/itest/contribution-jee/src/test/resources/repository/simple-app.ear
diff --git a/branches/sca-java-1.x/itest/contribution-multiple/pom.xml b/sca-java-1.x/trunk/itest/contribution-multiple/pom.xml
index b5c6cafcca..b5c6cafcca 100644
--- a/branches/sca-java-1.x/itest/contribution-multiple/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution-multiple/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution-multiple/src/test/java/hello/Hello.java b/sca-java-1.x/trunk/itest/contribution-multiple/src/test/java/hello/Hello.java
index 7e574a7db3..7e574a7db3 100644
--- a/branches/sca-java-1.x/itest/contribution-multiple/src/test/java/hello/Hello.java
+++ b/sca-java-1.x/trunk/itest/contribution-multiple/src/test/java/hello/Hello.java
diff --git a/branches/sca-java-1.x/itest/contribution-multiple/src/test/java/hello/HelloImpl.java b/sca-java-1.x/trunk/itest/contribution-multiple/src/test/java/hello/HelloImpl.java
index ff9f6e75f3..ff9f6e75f3 100644
--- a/branches/sca-java-1.x/itest/contribution-multiple/src/test/java/hello/HelloImpl.java
+++ b/sca-java-1.x/trunk/itest/contribution-multiple/src/test/java/hello/HelloImpl.java
diff --git a/branches/sca-java-1.x/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/trunk/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java
index c062afaed0..c062afaed0 100644
--- a/branches/sca-java-1.x/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/trunk/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.x/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java b/sca-java-1.x/trunk/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java
index 5251fc0a45..5251fc0a45 100644
--- a/branches/sca-java-1.x/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/trunk/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.x/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java b/sca-java-1.x/trunk/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java
index ec5123eb2d..ec5123eb2d 100644
--- a/branches/sca-java-1.x/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java
+++ b/sca-java-1.x/trunk/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java
diff --git a/branches/sca-java-1.x/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java b/sca-java-1.x/trunk/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java
index 133c98f357..133c98f357 100644
--- a/branches/sca-java-1.x/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java
+++ b/sca-java-1.x/trunk/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java
diff --git a/branches/sca-java-1.x/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java b/sca-java-1.x/trunk/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
index 790b6fed98..790b6fed98 100644
--- a/branches/sca-java-1.x/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
+++ b/sca-java-1.x/trunk/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
diff --git a/branches/sca-java-1.x/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml
index 8b76783c3d..8b76783c3d 100644
--- a/branches/sca-java-1.x/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite b/sca-java-1.x/trunk/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite
index aeeab337fa..aeeab337fa 100644
--- a/branches/sca-java-1.x/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite
+++ b/sca-java-1.x/trunk/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite
diff --git a/branches/sca-java-1.x/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml
index bfbf74373a..bfbf74373a 100644
--- a/branches/sca-java-1.x/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite b/sca-java-1.x/trunk/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite
index 7a8003577e..7a8003577e 100644
--- a/branches/sca-java-1.x/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite
+++ b/sca-java-1.x/trunk/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite
diff --git a/branches/sca-java-1.x/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml
index bea6f39932..bea6f39932 100644
--- a/branches/sca-java-1.x/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite b/sca-java-1.x/trunk/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite
index aeeab337fa..aeeab337fa 100644
--- a/branches/sca-java-1.x/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite
+++ b/sca-java-1.x/trunk/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite
diff --git a/branches/sca-java-1.x/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml
index bfbf74373a..bfbf74373a 100644
--- a/branches/sca-java-1.x/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite b/sca-java-1.x/trunk/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite
index 45cb504ea4..45cb504ea4 100644
--- a/branches/sca-java-1.x/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite
+++ b/sca-java-1.x/trunk/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite
diff --git a/branches/sca-java-1.x/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml
index cbabdcd4fc..cbabdcd4fc 100644
--- a/branches/sca-java-1.x/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite b/sca-java-1.x/trunk/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite
index 4c9225de34..4c9225de34 100644
--- a/branches/sca-java-1.x/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite
+++ b/sca-java-1.x/trunk/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite
diff --git a/branches/sca-java-1.x/itest/contribution/pom.xml b/sca-java-1.x/trunk/itest/contribution/pom.xml
index 40a24c3e83..40a24c3e83 100644
--- a/branches/sca-java-1.x/itest/contribution/pom.xml
+++ b/sca-java-1.x/trunk/itest/contribution/pom.xml
diff --git a/branches/sca-java-1.x/itest/contribution/src/main/java/calculator/AddService.java b/sca-java-1.x/trunk/itest/contribution/src/main/java/calculator/AddService.java
index 4e72f92fda..4e72f92fda 100644
--- a/branches/sca-java-1.x/itest/contribution/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/trunk/itest/contribution/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.x/itest/contribution/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/trunk/itest/contribution/src/main/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/branches/sca-java-1.x/itest/contribution/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/contribution/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/contribution/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/trunk/itest/contribution/src/main/java/calculator/CalculatorClient.java
index 719ad69eef..719ad69eef 100644
--- a/branches/sca-java-1.x/itest/contribution/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/trunk/itest/contribution/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.x/itest/contribution/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/trunk/itest/contribution/src/main/java/calculator/CalculatorService.java
index f288af0174..f288af0174 100644
--- a/branches/sca-java-1.x/itest/contribution/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/trunk/itest/contribution/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.x/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/trunk/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
index ae4ed12b7b..ae4ed12b7b 100644
--- a/branches/sca-java-1.x/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/contribution/src/main/java/calculator/DivideService.java b/sca-java-1.x/trunk/itest/contribution/src/main/java/calculator/DivideService.java
index ad99418f5b..ad99418f5b 100644
--- a/branches/sca-java-1.x/itest/contribution/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/trunk/itest/contribution/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.x/itest/contribution/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/trunk/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-java-1.x/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/contribution/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/trunk/itest/contribution/src/main/java/calculator/MultiplyService.java
index 3987b0a54f..3987b0a54f 100644
--- a/branches/sca-java-1.x/itest/contribution/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/trunk/itest/contribution/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.x/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/trunk/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-java-1.x/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/contribution/src/main/java/calculator/SubtractService.java b/sca-java-1.x/trunk/itest/contribution/src/main/java/calculator/SubtractService.java
index 25e0ed6ca7..25e0ed6ca7 100644
--- a/branches/sca-java-1.x/itest/contribution/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/trunk/itest/contribution/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.x/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/trunk/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/branches/sca-java-1.x/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/contribution/src/main/resources/ContributionTest.composite b/sca-java-1.x/trunk/itest/contribution/src/main/resources/ContributionTest.composite
index d814e439e2..d814e439e2 100644
--- a/branches/sca-java-1.x/itest/contribution/src/main/resources/ContributionTest.composite
+++ b/sca-java-1.x/trunk/itest/contribution/src/main/resources/ContributionTest.composite
diff --git a/branches/sca-java-1.x/itest/contribution/src/main/resources/calculator/Calculator.composite b/sca-java-1.x/trunk/itest/contribution/src/main/resources/calculator/Calculator.composite
index 657a2f95d8..657a2f95d8 100644
--- a/branches/sca-java-1.x/itest/contribution/src/main/resources/calculator/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/contribution/src/main/resources/calculator/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/contribution/src/main/resources/calculator/sca-contribution.xml b/sca-java-1.x/trunk/itest/contribution/src/main/resources/calculator/sca-contribution.xml
index e95796d83a..e95796d83a 100644
--- a/branches/sca-java-1.x/itest/contribution/src/main/resources/calculator/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/contribution/src/main/resources/calculator/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java b/sca-java-1.x/trunk/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
index 97b2e5d6ed..97b2e5d6ed 100644
--- a/branches/sca-java-1.x/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
+++ b/sca-java-1.x/trunk/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
diff --git a/branches/sca-java-1.x/itest/contribution/src/test/resources/deployables/sample-calculator.jar b/sca-java-1.x/trunk/itest/contribution/src/test/resources/deployables/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/branches/sca-java-1.x/itest/contribution/src/test/resources/deployables/sample-calculator.jar
+++ b/sca-java-1.x/trunk/itest/contribution/src/test/resources/deployables/sample-calculator.jar
diff --git a/branches/sca-java-1.x/itest/contribution/src/test/resources/repository/sample-calculator.jar b/sca-java-1.x/trunk/itest/contribution/src/test/resources/repository/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/branches/sca-java-1.x/itest/contribution/src/test/resources/repository/sample-calculator.jar
+++ b/sca-java-1.x/trunk/itest/contribution/src/test/resources/repository/sample-calculator.jar
diff --git a/branches/sca-java-1.x/itest/conversations-ws/pom.xml b/sca-java-1.x/trunk/itest/conversations-ws/pom.xml
index 91c26b447b..91c26b447b 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/pom.xml
+++ b/sca-java-1.x/trunk/itest/conversations-ws/pom.xml
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java
index 9cd88620e3..9cd88620e3 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
index 53dadc3dc7..53dadc3dc7 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
index cb7a032e85..cb7a032e85 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
index 2532346349..2532346349 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
index 8f008fa711..8f008fa711 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
index 1e36ce6917..1e36ce6917 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
index b4d3fe3d71..b4d3fe3d71 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
index ed3a01c10b..ed3a01c10b 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
index 1603916cca..1603916cca 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
index accc1eee27..accc1eee27 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
index 90f6de86ac..90f6de86ac 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
index 3f7a90b3dc..3f7a90b3dc 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
index ab91498132..ab91498132 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
index e4f83656de..e4f83656de 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
index 8fe7c5b6ba..8fe7c5b6ba 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
index 9f4857f703..9f4857f703 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
index 4b06251414..4b06251414 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
index be039748fc..be039748fc 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
index 42f2f1a603..42f2f1a603 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
index a852aeda56..a852aeda56 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml
index d5a1ff7410..d5a1ff7410 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/resources/Conversational/conversational.composite b/sca-java-1.x/trunk/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
index c4da99145d..c4da99145d 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl b/sca-java-1.x/trunk/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
index 20a92c9dc7..20a92c9dc7 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml
index 73d078674c..73d078674c 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite b/sca-java-1.x/trunk/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
index 9c6b0a2b34..9c6b0a2b34 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java b/sca-java-1.x/trunk/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
index 9df966ebc2..9df966ebc2 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java b/sca-java-1.x/trunk/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
index ebd1e55dac..ebd1e55dac 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java b/sca-java-1.x/trunk/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
index 2c16145f54..2c16145f54 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java b/sca-java-1.x/trunk/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
index 4166e6acdf..4166e6acdf 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java b/sca-java-1.x/trunk/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
index 6023b7cd53..6023b7cd53 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java b/sca-java-1.x/trunk/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
index fb3a3cec6f..fb3a3cec6f 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
diff --git a/branches/sca-java-1.x/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java b/sca-java-1.x/trunk/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
index 5fbe2c3f69..5fbe2c3f69 100644
--- a/branches/sca-java-1.x/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
+++ b/sca-java-1.x/trunk/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
diff --git a/branches/sca-java-1.x/itest/conversations/pom.xml b/sca-java-1.x/trunk/itest/conversations/pom.xml
index 7240bfe6df..7240bfe6df 100644
--- a/branches/sca-java-1.x/itest/conversations/pom.xml
+++ b/sca-java-1.x/trunk/itest/conversations/pom.xml
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java
index a3b83dfc14..a3b83dfc14 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
index 8e98b9cbd4..8e98b9cbd4 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
index e7583c339a..e7583c339a 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
index bc4a5fc571..bc4a5fc571 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
index 77d7f4c007..77d7f4c007 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java
index e422938b27..e422938b27 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
index a6dbf56797..a6dbf56797 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java
index 3f04e9f09e..3f04e9f09e 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
index 53dadc3dc7..53dadc3dc7 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
index 8cad88d2f4..8cad88d2f4 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
index 2532346349..2532346349 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
index 8f008fa711..8f008fa711 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
index 546382cfd1..546382cfd1 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
index f1a21cc18f..f1a21cc18f 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
index 74afbfb763..74afbfb763 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
index 5f97b16088..5f97b16088 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
index 3ce3e3ada7..3ce3e3ada7 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
index 95c9c7ae6e..95c9c7ae6e 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
index a5f37f7a52..a5f37f7a52 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
index c1e27641ef..c1e27641ef 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
index 900b8f743f..900b8f743f 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
index b21f956bd9..b21f956bd9 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
index 9deef312ac..9deef312ac 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
index cffa76186a..cffa76186a 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
index 1272c7ab7f..1272c7ab7f 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
index 847b038881..847b038881 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
index b77e4c0194..b77e4c0194 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
index 5b3906fc2c..5b3906fc2c 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
index 8fe7c5b6ba..8fe7c5b6ba 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
index 9a25f0f59a..9a25f0f59a 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
index efcbdff06f..efcbdff06f 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
index 8454b3846b..8454b3846b 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
index 07186c91e1..07186c91e1 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
index 344aa99dff..344aa99dff 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
index 8d79bb75e8..8d79bb75e8 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
index d1b769216b..d1b769216b 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/resources/ConversationAge.composite b/sca-java-1.x/trunk/itest/conversations/src/main/resources/ConversationAge.composite
index abd1c35ced..abd1c35ced 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/resources/ConversationAge.composite
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/resources/ConversationAge.composite
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/resources/ConversationUniqueId.composite b/sca-java-1.x/trunk/itest/conversations/src/main/resources/ConversationUniqueId.composite
index 831449a079..831449a079 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/resources/ConversationUniqueId.composite
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/resources/ConversationUniqueId.composite
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/resources/conversationId.composite b/sca-java-1.x/trunk/itest/conversations/src/main/resources/conversationId.composite
index e61eb08194..e61eb08194 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/resources/conversationId.composite
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/resources/conversationId.composite
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/resources/conversationLifetime.composite b/sca-java-1.x/trunk/itest/conversations/src/main/resources/conversationLifetime.composite
index 3b79dc43d9..3b79dc43d9 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/resources/conversationLifetime.composite
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/resources/conversationLifetime.composite
diff --git a/branches/sca-java-1.x/itest/conversations/src/main/resources/conversational.composite b/sca-java-1.x/trunk/itest/conversations/src/main/resources/conversational.composite
index 4da3ce74d5..4da3ce74d5 100644
--- a/branches/sca-java-1.x/itest/conversations/src/main/resources/conversational.composite
+++ b/sca-java-1.x/trunk/itest/conversations/src/main/resources/conversational.composite
diff --git a/branches/sca-java-1.x/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java b/sca-java-1.x/trunk/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
index 3e750bdd1e..3e750bdd1e 100644
--- a/branches/sca-java-1.x/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java b/sca-java-1.x/trunk/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
index 326a833a42..326a833a42 100644
--- a/branches/sca-java-1.x/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java b/sca-java-1.x/trunk/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java
index 431962221a..431962221a 100644
--- a/branches/sca-java-1.x/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java b/sca-java-1.x/trunk/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
index cc31c77873..cc31c77873 100644
--- a/branches/sca-java-1.x/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java b/sca-java-1.x/trunk/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
index 8480e04028..8480e04028 100644
--- a/branches/sca-java-1.x/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
diff --git a/branches/sca-java-1.x/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java b/sca-java-1.x/trunk/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
index da359bc296..da359bc296 100644
--- a/branches/sca-java-1.x/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
+++ b/sca-java-1.x/trunk/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
diff --git a/branches/sca-java-1.x/itest/corba/pom.xml b/sca-java-1.x/trunk/itest/corba/pom.xml
index 6079e77a2d..6079e77a2d 100644
--- a/branches/sca-java-1.x/itest/corba/pom.xml
+++ b/sca-java-1.x/trunk/itest/corba/pom.xml
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java
index 46e214eac3..46e214eac3 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java
index cba8c823e8..cba8c823e8 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java
index 0135c04495..0135c04495 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java
index b7309d68a0..b7309d68a0 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java
index a738c6f211..a738c6f211 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java
index 008212bdbe..008212bdbe 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java
index bd1ce8cb49..bd1ce8cb49 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java
index c25372c837..c25372c837 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java
index 82b327f11c..82b327f11c 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java
index 010dea1e1a..010dea1e1a 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java
index 67acde6682..67acde6682 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java
index 1a2c30ee62..1a2c30ee62 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java
index 7f358936fa..7f358936fa 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java
index b07e193995..b07e193995 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java
index 1c1cd31dc1..1c1cd31dc1 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java
index 565557db2d..565557db2d 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java
index 6e581e5215..6e581e5215 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java
index 9c088b8bb9..9c088b8bb9 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java
index 50069d7ac8..50069d7ac8 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java
index e63120a083..e63120a083 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java
index b8e3e16a31..b8e3e16a31 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java
index 292c3af11b..292c3af11b 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java
index 8a6047c92e..8a6047c92e 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java
index d9fcc63371..d9fcc63371 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java
index a3f2c8314e..a3f2c8314e 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java
index 2c49fac39f..2c49fac39f 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java
index 5b1b710919..5b1b710919 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java
index 3bf646a485..3bf646a485 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java
index 08ca7c699a..08ca7c699a 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java
index 6d189ddc2a..6d189ddc2a 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java
index 6bb5fe9044..6bb5fe9044 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java
index 43aca562ad..43aca562ad 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java
index 73c96c260d..73c96c260d 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java
index 6fd029ec6f..6fd029ec6f 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java
index 103db27cd2..103db27cd2 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java
index c47565e63e..c47565e63e 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java
index b57e098a56..b57e098a56 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java
index 8ddfa10575..8ddfa10575 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java
index 9717629711..9717629711 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java
index 1247b4618d..1247b4618d 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java
index 9f1cb6bc6b..9f1cb6bc6b 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java
index b2906bb13c..b2906bb13c 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java
index adf72c5c35..adf72c5c35 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java
index ddaec3549e..ddaec3549e 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java
index 993dc155d6..993dc155d6 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java
index 6e3deb2251..6e3deb2251 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java
index 86787ee968..86787ee968 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java
index 6a5646c73d..6a5646c73d 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java
index 0f62442652..0f62442652 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java
index 1167c7de21..1167c7de21 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java
index fc32fd1db6..fc32fd1db6 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java
index 9648e29d6d..9648e29d6d 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java
index 93d9fe164d..93d9fe164d 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java
index 622adaf46b..622adaf46b 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java
index 117d1d6382..117d1d6382 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java
index eba1b61fa3..eba1b61fa3 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java
index 750006cec6..750006cec6 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java
index ef9f561d1b..ef9f561d1b 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java
index 4f6eacc9ff..4f6eacc9ff 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java
index a3be6daa23..a3be6daa23 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java
index dc752a2aea..dc752a2aea 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java
index aec0f7b1bf..aec0f7b1bf 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java
index 04aef326af..04aef326af 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java
index bc76373633..bc76373633 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java
index 2f10177bd0..2f10177bd0 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java
index de8624455f..de8624455f 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java
index 30e4e2994a..30e4e2994a 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java
index 9b49adbfbb..9b49adbfbb 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java
index 7889a80bf1..7889a80bf1 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java
index cdd49904d3..cdd49904d3 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java
index adb48aa159..adb48aa159 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java
index 71003d008f..71003d008f 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java
index 271f1e669b..271f1e669b 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java
index d7734c48a3..d7734c48a3 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java
index 1b44da9752..1b44da9752 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java
index eb76c94643..eb76c94643 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java
index 922759cd8d..922759cd8d 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java
index a4f15488cd..a4f15488cd 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java
index 47f0775c16..47f0775c16 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java
index 3b4943a43d..3b4943a43d 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java
index 7d43badb23..7d43badb23 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java
index 8e76958e31..8e76958e31 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java
index 1e4264256b..1e4264256b 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java
index 917cceedf5..917cceedf5 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java
index b679214c6c..b679214c6c 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java
index 415634c80f..415634c80f 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java
index d7c72b40da..d7c72b40da 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java
index cb868d18a0..cb868d18a0 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java
+++ b/sca-java-1.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java
diff --git a/branches/sca-java-1.x/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/trunk/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 3e77527d73..3e77527d73 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/trunk/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.x/itest/corba/src/test/resources/ScenarioFive.composite b/sca-java-1.x/trunk/itest/corba/src/test/resources/ScenarioFive.composite
index 3c73e238a5..3c73e238a5 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/resources/ScenarioFive.composite
+++ b/sca-java-1.x/trunk/itest/corba/src/test/resources/ScenarioFive.composite
diff --git a/branches/sca-java-1.x/itest/corba/src/test/resources/ScenarioFour.composite b/sca-java-1.x/trunk/itest/corba/src/test/resources/ScenarioFour.composite
index 01d7e2314a..01d7e2314a 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/resources/ScenarioFour.composite
+++ b/sca-java-1.x/trunk/itest/corba/src/test/resources/ScenarioFour.composite
diff --git a/branches/sca-java-1.x/itest/corba/src/test/resources/ScenarioOne.composite b/sca-java-1.x/trunk/itest/corba/src/test/resources/ScenarioOne.composite
index c10b383661..c10b383661 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/resources/ScenarioOne.composite
+++ b/sca-java-1.x/trunk/itest/corba/src/test/resources/ScenarioOne.composite
diff --git a/branches/sca-java-1.x/itest/corba/src/test/resources/ScenarioSix.composite b/sca-java-1.x/trunk/itest/corba/src/test/resources/ScenarioSix.composite
index 88238478c1..88238478c1 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/resources/ScenarioSix.composite
+++ b/sca-java-1.x/trunk/itest/corba/src/test/resources/ScenarioSix.composite
diff --git a/branches/sca-java-1.x/itest/corba/src/test/resources/ScenarioThree.composite b/sca-java-1.x/trunk/itest/corba/src/test/resources/ScenarioThree.composite
index f43e4a3f7a..f43e4a3f7a 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/resources/ScenarioThree.composite
+++ b/sca-java-1.x/trunk/itest/corba/src/test/resources/ScenarioThree.composite
diff --git a/branches/sca-java-1.x/itest/corba/src/test/resources/ScenarioTwo.composite b/sca-java-1.x/trunk/itest/corba/src/test/resources/ScenarioTwo.composite
index dc5ddc50d3..dc5ddc50d3 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/resources/ScenarioTwo.composite
+++ b/sca-java-1.x/trunk/itest/corba/src/test/resources/ScenarioTwo.composite
diff --git a/branches/sca-java-1.x/itest/corba/src/test/resources/itest_scenario.idl b/sca-java-1.x/trunk/itest/corba/src/test/resources/itest_scenario.idl
index 41489a4565..41489a4565 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/resources/itest_scenario.idl
+++ b/sca-java-1.x/trunk/itest/corba/src/test/resources/itest_scenario.idl
diff --git a/branches/sca-java-1.x/itest/corba/src/test/resources/scenariofour.xsd b/sca-java-1.x/trunk/itest/corba/src/test/resources/scenariofour.xsd
index 2669b54be3..2669b54be3 100644
--- a/branches/sca-java-1.x/itest/corba/src/test/resources/scenariofour.xsd
+++ b/sca-java-1.x/trunk/itest/corba/src/test/resources/scenariofour.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/pom.xml b/sca-java-1.x/trunk/itest/databindings/common/pom.xml
index d45eaeddb5..d45eaeddb5 100644
--- a/branches/sca-java-1.x/itest/databindings/common/pom.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/pom.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java b/sca-java-1.x/trunk/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
index adb546a1ea..adb546a1ea 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
index b2346aa973..b2346aa973 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
index 88616cc997..88616cc997 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
index 77a12e92ec..77a12e92ec 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
index ee73db6152..ee73db6152 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
index aab564dc1e..aab564dc1e 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
index 5507a0b747..5507a0b747 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/generate/generate.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/generate/generate.xsd
index 1fabedf55f..1fabedf55f 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/generate/generate.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/generate/generate.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/wsdl/Dummy.txt b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
index 8927d725b6..8927d725b6 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/Annotation.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/Annotation.xml
index f1f4346e58..f1f4346e58 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/Annotation.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/Annotation.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/Annotation.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
index 1fae43eb09..1fae43eb09 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/Attribute.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/Attribute.xml
index c20c80b658..c20c80b658 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/Attribute.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/Attribute.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/Attribute.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
index bd3db2e030..bd3db2e030 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
index 30e4979dca..30e4979dca 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
index e7738dcff7..e7738dcff7 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
index 9552421e2d..9552421e2d 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
index c7b9655749..c7b9655749 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
index 5e5e7fbd55..5e5e7fbd55 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
index 5c455c2ab5..5c455c2ab5 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
index 635e851632..635e851632 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
index 004dab4fbb..004dab4fbb 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
index 136092951b..136092951b 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
index 796f08e1cf..796f08e1cf 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
index 927b94885c..927b94885c 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
index 93f83cd0a1..93f83cd0a1 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
index ea7db70595..ea7db70595 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
index c64323e7e1..c64323e7e1 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
index 85c7d85fd4..85c7d85fd4 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
index 543f276c50..543f276c50 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
index fcd281539b..fcd281539b 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
index 1610c2b861..1610c2b861 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
index 36a0760a61..36a0760a61 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
index 999b72bb35..999b72bb35 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
index 5849165fe0..5849165fe0 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
index 71dad561ca..71dad561ca 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
index 8acf9376d7..8acf9376d7 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
index a49987c352..a49987c352 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
index a35b6e174a..a35b6e174a 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
index e1995890f9..e1995890f9 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
index 91cfce51b8..91cfce51b8 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
index a2f86ba8c5..a2f86ba8c5 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
index 907474cd1b..907474cd1b 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
index a2f6bcfa77..a2f6bcfa77 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
index c5820e1a2e..c5820e1a2e 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
index f4d596bfe3..f4d596bfe3 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
index 0debe2fec5..0debe2fec5 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
index b5bcfdcfd4..b5bcfdcfd4 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
index 7f001254cc..7f001254cc 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
index 8d4d106f59..8d4d106f59 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
index f875b9f94d..f875b9f94d 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
index 4c8a39b06c..4c8a39b06c 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
index 7d343d6dda..7d343d6dda 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
index bb12bc04a9..bb12bc04a9 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
index 7a81f3b0dd..7a81f3b0dd 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
index f0e1c21233..f0e1c21233 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
index d35568b3c9..d35568b3c9 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
index 92bd9a4b66..92bd9a4b66 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
index 52cdfa8c4e..52cdfa8c4e 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
index 78d001a585..78d001a585 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
index 2609a858f7..2609a858f7 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
index 38f6c55059..38f6c55059 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
index 7868a47ca3..7868a47ca3 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
index 0d65b124ff..0d65b124ff 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
index 3f5080d49f..3f5080d49f 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
index 340555dc5f..340555dc5f 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
index 0deb7af980..0deb7af980 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
index 8059fe6da0..8059fe6da0 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
index 06c92ce19b..06c92ce19b 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
index 7b1f02d1d4..7b1f02d1d4 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
index 9bc0cefd0f..9bc0cefd0f 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
index 0c207983bc..0c207983bc 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
index f91b602f99..f91b602f99 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
index b99bf01b73..b99bf01b73 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
index c99698e175..c99698e175 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
index b5b9b0d1eb..b5b9b0d1eb 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
index 80d22ce057..80d22ce057 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
index 4902935db5..4902935db5 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
index 664bf824b4..664bf824b4 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
index 5d3658d224..5d3658d224 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
index c5861fa92a..c5861fa92a 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
index 0aa4710057..0aa4710057 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
index 1f95950394..1f95950394 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
index 6ee9c435db..6ee9c435db 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
index 0297f1aeb4..0297f1aeb4 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
index 56d027bdbb..56d027bdbb 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
index 81ba1069bd..81ba1069bd 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
index 866ab73024..866ab73024 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
index 8bb3a08b94..8bb3a08b94 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
index c7c62f812b..c7c62f812b 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
index 8235718c5e..8235718c5e 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
index 36caba2f16..36caba2f16 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
index 599c428a44..599c428a44 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
index 389d5a99f0..389d5a99f0 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
index 919c4a20ee..919c4a20ee 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
index 59887078b5..59887078b5 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
index 79011f26ab..79011f26ab 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
index 5de7d64d7b..5de7d64d7b 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
index c40be9e18b..c40be9e18b 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
index d4a78787b8..d4a78787b8 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
index c30434de66..c30434de66 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
index 5381590cd1..5381590cd1 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
index 4cd6ea7e72..4cd6ea7e72 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
index e8faf6225b..e8faf6225b 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
index b4375467c4..b4375467c4 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
index a4f564d9b7..a4f564d9b7 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
index d30ab85530..d30ab85530 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
index 8abb34b5a5..8abb34b5a5 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
index 7fd9a061ae..7fd9a061ae 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
index 1615976813..1615976813 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
index cd567ba528..cd567ba528 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
index 0beaac571f..0beaac571f 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
index 025362defb..025362defb 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
index d6d951fe5d..d6d951fe5d 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
index 5736a8c121..5736a8c121 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
index 242be1d53b..242be1d53b 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
index d728115a77..d728115a77 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
index 108e3a8619..108e3a8619 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
index d4ffae5e17..d4ffae5e17 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
index 5ee5e0229e..5ee5e0229e 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
index 3d5aed5aa8..3d5aed5aa8 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
index e7b80ab11c..e7b80ab11c 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
index 2b4fe5594e..2b4fe5594e 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
index fc4deb63c2..fc4deb63c2 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
index 03570f41d9..03570f41d9 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
index c754502645..c754502645 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
index 4603793bfc..4603793bfc 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
index 4bcd2f8c46..4bcd2f8c46 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
index a6861f803a..a6861f803a 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
index 8bb251cab2..8bb251cab2 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
index 467ec007ed..467ec007ed 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
index 8d00646678..8d00646678 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
index 7deafd798a..7deafd798a 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
index 72ac75fee0..72ac75fee0 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
index f6208f81b3..f6208f81b3 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
index 1f26e13673..1f26e13673 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
index 97de7b98eb..97de7b98eb 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
index 67716553d8..67716553d8 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
index 5941348921..5941348921 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
index 24d5d09054..24d5d09054 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
index f684d06a4d..f684d06a4d 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
index de4a8a666d..de4a8a666d 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
index 242908bd27..242908bd27 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
index 4c00fbe295..4c00fbe295 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
index 925e8625d5..925e8625d5 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
index b12bec040b..b12bec040b 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
index c73708ce46..c73708ce46 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
index 795c3ea7d9..795c3ea7d9 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
index 3ebdc89ae0..3ebdc89ae0 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
index 21546d0f67..21546d0f67 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
index 89657e42ca..89657e42ca 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
index d01b4172e4..d01b4172e4 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
index 82fd1eedaf..82fd1eedaf 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
index e1dcf06194..e1dcf06194 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
index ebf03c9d5d..ebf03c9d5d 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
index 8b9ba5b4b8..8b9ba5b4b8 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
index 26466b1b39..26466b1b39 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
index ff418c56ab..ff418c56ab 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
index 27bb1ce9cc..27bb1ce9cc 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
index 2bf1df8c99..2bf1df8c99 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
index 9b5561ed43..9b5561ed43 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
index 0b4e7bdf45..0b4e7bdf45 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
index f1b7cd264c..f1b7cd264c 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
index a2c8456257..a2c8456257 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
index 1f60b0423f..1f60b0423f 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
index 21e55ab8c1..21e55ab8c1 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
index 30762f4912..30762f4912 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
index 5bf35d0d70..5bf35d0d70 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
index 2dd01e4090..2dd01e4090 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
index 6920cd8dd0..6920cd8dd0 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
index 6a526bdc47..6a526bdc47 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
index 1117a95eb8..1117a95eb8 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
index ab91458bff..ab91458bff 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
index 3e015843b5..3e015843b5 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
index b6d68fd08a..b6d68fd08a 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
index d4453a4477..d4453a4477 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
index 6de3adc937..6de3adc937 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
index 786ab226da..786ab226da 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
index 64093aa803..64093aa803 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
index 01f4c2b1ef..01f4c2b1ef 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
index 774646f682..774646f682 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
index 34da37564c..34da37564c 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
index a1fb3aa803..a1fb3aa803 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
index 8eb7a4fce4..8eb7a4fce4 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
index f68eb1939d..f68eb1939d 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
index b9f77e6658..b9f77e6658 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/Import.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/Import.xml
index fd28850050..fd28850050 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/Import.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/Import.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/Import.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/Import.xsd
index eae93fd44a..eae93fd44a 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/Import.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/Import.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
index a7e568decf..a7e568decf 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/Include.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/Include.xml
index d4b9e24fa6..d4b9e24fa6 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/Include.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/Include.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/Include.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/Include.xsd
index 34ff314a19..34ff314a19 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/Include.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/Include.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/Interop.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/Interop.xsd
index ae22ab2c44..ae22ab2c44 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/Interop.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/Interop.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/Notation.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/Notation.xml
index b75ac6500a..b75ac6500a 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/Notation.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/Notation.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/Notation.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/Notation.xsd
index 6ad019cb81..6ad019cb81 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/Notation.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/Notation.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/Person.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/Person.xsd
index 5f5021b15e..5f5021b15e 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/Person.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/Person.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
index 6c5ad88ff4..6c5ad88ff4 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
index 6b7e39b334..6b7e39b334 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
index f9d4a24a49..f9d4a24a49 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
index f649e2ba83..f649e2ba83 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
index 410df4b7e4..410df4b7e4 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
index 5d27ef5ce1..5d27ef5ce1 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
index 7b74867c03..7b74867c03 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
index ec16a678a3..ec16a678a3 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
index 708d526f44..708d526f44 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
index ed681009f9..ed681009f9 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
index e404ac86b7..e404ac86b7 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
index af0431f048..af0431f048 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
index c86a0f6bcb..c86a0f6bcb 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
index 89b00a36cc..89b00a36cc 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
index 399b0d8175..399b0d8175 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
index ea35bec61a..ea35bec61a 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
index bc8cf35368..bc8cf35368 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
index 57981e3666..57981e3666 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
index da2929776e..da2929776e 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
index ace5427786..ace5427786 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/datagraph.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
index e6b9697a8d..e6b9697a8d 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
index 7387568942..7387568942 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
index c5aabc9cc8..c5aabc9cc8 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
diff --git a/branches/sca-java-1.x/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java b/sca-java-1.x/trunk/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
index fa3f310d4d..fa3f310d4d 100644
--- a/branches/sca-java-1.x/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
+++ b/sca-java-1.x/trunk/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
diff --git a/branches/sca-java-1.x/itest/databindings/config.png b/sca-java-1.x/trunk/itest/databindings/config.png
index 7912019e9d..7912019e9d 100644
--- a/branches/sca-java-1.x/itest/databindings/config.png
+++ b/sca-java-1.x/trunk/itest/databindings/config.png
diff --git a/branches/sca-java-1.x/itest/databindings/config.svg b/sca-java-1.x/trunk/itest/databindings/config.svg
index aaf027e2df..aaf027e2df 100644
--- a/branches/sca-java-1.x/itest/databindings/config.svg
+++ b/sca-java-1.x/trunk/itest/databindings/config.svg
diff --git a/branches/sca-java-1.x/itest/databindings/databinding.png b/sca-java-1.x/trunk/itest/databindings/databinding.png
index 76a9c71b7d..76a9c71b7d 100644
--- a/branches/sca-java-1.x/itest/databindings/databinding.png
+++ b/sca-java-1.x/trunk/itest/databindings/databinding.png
diff --git a/branches/sca-java-1.x/itest/databindings/databinding.svg b/sca-java-1.x/trunk/itest/databindings/databinding.svg
index d6850ccf7d..d6850ccf7d 100644
--- a/branches/sca-java-1.x/itest/databindings/databinding.svg
+++ b/sca-java-1.x/trunk/itest/databindings/databinding.svg
diff --git a/branches/sca-java-1.x/itest/databindings/interop.png b/sca-java-1.x/trunk/itest/databindings/interop.png
index 005e0f24ea..005e0f24ea 100644
--- a/branches/sca-java-1.x/itest/databindings/interop.png
+++ b/sca-java-1.x/trunk/itest/databindings/interop.png
diff --git a/branches/sca-java-1.x/itest/databindings/interop.svg b/sca-java-1.x/trunk/itest/databindings/interop.svg
index 03897c6d09..03897c6d09 100644
--- a/branches/sca-java-1.x/itest/databindings/interop.svg
+++ b/sca-java-1.x/trunk/itest/databindings/interop.svg
diff --git a/branches/sca-java-1.x/itest/databindings/interop/pom.xml b/sca-java-1.x/trunk/itest/databindings/interop/pom.xml
index 86e889a59f..86e889a59f 100644
--- a/branches/sca-java-1.x/itest/databindings/interop/pom.xml
+++ b/sca-java-1.x/trunk/itest/databindings/interop/pom.xml
diff --git a/branches/sca-java-1.x/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm b/sca-java-1.x/trunk/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
index 7bdfc57924..7bdfc57924 100644
--- a/branches/sca-java-1.x/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
+++ b/sca-java-1.x/trunk/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
diff --git a/branches/sca-java-1.x/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm b/sca-java-1.x/trunk/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
index 38bfccce0c..38bfccce0c 100644
--- a/branches/sca-java-1.x/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
+++ b/sca-java-1.x/trunk/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
diff --git a/branches/sca-java-1.x/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm b/sca-java-1.x/trunk/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
index 6f02af4c9d..6f02af4c9d 100644
--- a/branches/sca-java-1.x/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
+++ b/sca-java-1.x/trunk/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
diff --git a/branches/sca-java-1.x/itest/databindings/interop/src/main/resources/generate/generate.xml b/sca-java-1.x/trunk/itest/databindings/interop/src/main/resources/generate/generate.xml
index 8453dd56b4..8453dd56b4 100644
--- a/branches/sca-java-1.x/itest/databindings/interop/src/main/resources/generate/generate.xml
+++ b/sca-java-1.x/trunk/itest/databindings/interop/src/main/resources/generate/generate.xml
diff --git a/branches/sca-java-1.x/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm b/sca-java-1.x/trunk/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
index 36797fde57..36797fde57 100644
--- a/branches/sca-java-1.x/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
+++ b/sca-java-1.x/trunk/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/pom.xml b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/pom.xml
index 9129858675..9129858675 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/pom.xml
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/pom.xml
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java
index 7f9b62f9b4..7f9b62f9b4 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java
index 1762812c1f..1762812c1f 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java
index f1c948dc1c..f1c948dc1c 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java
index 4a4419a42b..4a4419a42b 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java
index 65f019ec48..65f019ec48 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java
index 45c01dc054..45c01dc054 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java
index 4e0bd38b2b..4e0bd38b2b 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java
index 40aff31297..40aff31297 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java
index ca012b967d..ca012b967d 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java
index 12ed7d0ec7..12ed7d0ec7 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java
index 3bae554dc7..3bae554dc7 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
index a31cc3d45a..a31cc3d45a 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java
index 34ac9024f6..34ac9024f6 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java
index 23ed57dec9..23ed57dec9 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java
index 6239c0f5f1..6239c0f5f1 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
index c5553688e2..c5553688e2 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
index 3bdf886dfa..3bdf886dfa 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java
index 0fdf69459f..0fdf69459f 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
index 2842205085..2842205085 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
index 351d9df0cb..351d9df0cb 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java
index 8b484e93f0..8b484e93f0 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java
index 4a35d41c04..4a35d41c04 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java
index 9e042ffe6a..9e042ffe6a 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java
index ec929ddece..ec929ddece 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java
index 58808eec4f..58808eec4f 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java
index 858b8da59a..858b8da59a 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
index 51e48edbc9..51e48edbc9 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java
index de52cdfac3..de52cdfac3 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
index 199335c38c..199335c38c 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java
index fe9121be9d..fe9121be9d 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
index 28ace6aab7..28ace6aab7 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
index ab1a3b4ab8..ab1a3b4ab8 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java
index 0a8f6772b5..0a8f6772b5 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
index 626b0e9844..626b0e9844 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
index 19a6cae01b..19a6cae01b 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
index 68510b4b03..68510b4b03 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl
index 10a242be4d..10a242be4d 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite
index b0d3fe7aeb..b0d3fe7aeb 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite
index 910091cf53..910091cf53 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite
index 2dfcb1327b..2dfcb1327b 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite
index 20529e7273..20529e7273 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite
index 61c8a70a9a..61c8a70a9a 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
index 4967b896a5..4967b896a5 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java
index 744bf20494..744bf20494 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java
index c22d00140e..c22d00140e 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java
index f8aaad3dac..f8aaad3dac 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
index 079e1cdfff..079e1cdfff 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/pom.xml b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/pom.xml
index ab92c9c382..ab92c9c382 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/pom.xml
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/pom.xml
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java
index 352f805c7d..352f805c7d 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java
index 7bd95cec95..7bd95cec95 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
index 8c0fb24da9..8c0fb24da9 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
index 3a5a81bae4..3a5a81bae4 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
index 4be057fe68..4be057fe68 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
index 0c073cd054..0c073cd054 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java
index c4026fdb9a..c4026fdb9a 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java
index fc2dc64b7d..fc2dc64b7d 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
index ef1a907b29..ef1a907b29 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
index e60ae41767..e60ae41767 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
index 8803eb262a..8803eb262a 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
index 46569311ff..46569311ff 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
index 9d851455da..9d851455da 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl
index 926e4154aa..926e4154aa 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite
index afde4b7de9..afde4b7de9 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl
index f366783e5e..f366783e5e 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite
index f218419f45..f218419f45 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite
index 59e30dc801..59e30dc801 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl
index 5bfd1ea277..5bfd1ea277 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
index 7bb63fff1e..7bb63fff1e 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
index eaf54b0f1b..eaf54b0f1b 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
index 4713179267..4713179267 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
diff --git a/branches/sca-java-1.x/itest/databindings/jaxbgen/pom.xml b/sca-java-1.x/trunk/itest/databindings/jaxbgen/pom.xml
index 6568032197..6568032197 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxbgen/pom.xml
+++ b/sca-java-1.x/trunk/itest/databindings/jaxbgen/pom.xml
diff --git a/branches/sca-java-1.x/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml b/sca-java-1.x/trunk/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
index 8381a164ea..8381a164ea 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
+++ b/sca-java-1.x/trunk/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
diff --git a/branches/sca-java-1.x/itest/databindings/jaxbgen/src/main/resources/greeter.composite b/sca-java-1.x/trunk/itest/databindings/jaxbgen/src/main/resources/greeter.composite
index ae0740e6fe..ae0740e6fe 100644
--- a/branches/sca-java-1.x/itest/databindings/jaxbgen/src/main/resources/greeter.composite
+++ b/sca-java-1.x/trunk/itest/databindings/jaxbgen/src/main/resources/greeter.composite
diff --git a/branches/sca-java-1.x/itest/databindings/pom.xml b/sca-java-1.x/trunk/itest/databindings/pom.xml
index c76ca19be2..c76ca19be2 100644
--- a/branches/sca-java-1.x/itest/databindings/pom.xml
+++ b/sca-java-1.x/trunk/itest/databindings/pom.xml
diff --git a/branches/sca-java-1.x/itest/databindings/readme.html b/sca-java-1.x/trunk/itest/databindings/readme.html
index 24a44e4ed7..24a44e4ed7 100644
--- a/branches/sca-java-1.x/itest/databindings/readme.html
+++ b/sca-java-1.x/trunk/itest/databindings/readme.html
diff --git a/branches/sca-java-1.x/itest/databindings/sdogen/pom.xml b/sca-java-1.x/trunk/itest/databindings/sdogen/pom.xml
index 7f3136066e..7f3136066e 100644
--- a/branches/sca-java-1.x/itest/databindings/sdogen/pom.xml
+++ b/sca-java-1.x/trunk/itest/databindings/sdogen/pom.xml
diff --git a/branches/sca-java-1.x/itest/databindings/sdogen/src/main/resources/generate/generate.xml b/sca-java-1.x/trunk/itest/databindings/sdogen/src/main/resources/generate/generate.xml
index 3f9926604d..3f9926604d 100644
--- a/branches/sca-java-1.x/itest/databindings/sdogen/src/main/resources/generate/generate.xml
+++ b/sca-java-1.x/trunk/itest/databindings/sdogen/src/main/resources/generate/generate.xml
diff --git a/branches/sca-java-1.x/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm b/sca-java-1.x/trunk/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
index 9494d70f96..9494d70f96 100644
--- a/branches/sca-java-1.x/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
+++ b/sca-java-1.x/trunk/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
diff --git a/branches/sca-java-1.x/itest/distro-license-check/pom.xml b/sca-java-1.x/trunk/itest/distro-license-check/pom.xml
index 8d451eed5b..8d451eed5b 100644
--- a/branches/sca-java-1.x/itest/distro-license-check/pom.xml
+++ b/sca-java-1.x/trunk/itest/distro-license-check/pom.xml
diff --git a/branches/sca-java-1.x/itest/distro-license-check/src/test/java/itest/LicenseTestCase.java b/sca-java-1.x/trunk/itest/distro-license-check/src/test/java/itest/LicenseTestCase.java
index 5b74c5584e..5b74c5584e 100644
--- a/branches/sca-java-1.x/itest/distro-license-check/src/test/java/itest/LicenseTestCase.java
+++ b/sca-java-1.x/trunk/itest/distro-license-check/src/test/java/itest/LicenseTestCase.java
diff --git a/branches/sca-java-1.x/itest/domain/pom.xml b/sca-java-1.x/trunk/itest/domain/pom.xml
index f03c291a70..f03c291a70 100644
--- a/branches/sca-java-1.x/itest/domain/pom.xml
+++ b/sca-java-1.x/trunk/itest/domain/pom.xml
diff --git a/branches/sca-java-1.x/itest/domain/src/main/java/calculator/AddService.java b/sca-java-1.x/trunk/itest/domain/src/main/java/calculator/AddService.java
index 797ebb4024..797ebb4024 100644
--- a/branches/sca-java-1.x/itest/domain/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/trunk/itest/domain/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.x/itest/domain/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/trunk/itest/domain/src/main/java/calculator/AddServiceImpl.java
index 1a63d4ff77..1a63d4ff77 100644
--- a/branches/sca-java-1.x/itest/domain/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/domain/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java b/sca-java-1.x/trunk/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java
index 93486d915e..93486d915e 100644
--- a/branches/sca-java-1.x/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java
+++ b/sca-java-1.x/trunk/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java
diff --git a/branches/sca-java-1.x/itest/domain/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/trunk/itest/domain/src/main/java/calculator/CalculatorService.java
index 2718ab8772..2718ab8772 100644
--- a/branches/sca-java-1.x/itest/domain/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/trunk/itest/domain/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.x/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/trunk/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java
index 3cb255843f..3cb255843f 100644
--- a/branches/sca-java-1.x/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/domain/src/main/java/calculator/DivideService.java b/sca-java-1.x/trunk/itest/domain/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/branches/sca-java-1.x/itest/domain/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/trunk/itest/domain/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.x/itest/domain/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/trunk/itest/domain/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-java-1.x/itest/domain/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/domain/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/domain/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/trunk/itest/domain/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-1.x/itest/domain/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/trunk/itest/domain/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.x/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/trunk/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-java-1.x/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/domain/src/main/java/calculator/SubtractService.java b/sca-java-1.x/trunk/itest/domain/src/main/java/calculator/SubtractService.java
index 615320e670..615320e670 100644
--- a/branches/sca-java-1.x/itest/domain/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/trunk/itest/domain/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.x/itest/domain/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/trunk/itest/domain/src/main/java/calculator/SubtractServiceImpl.java
index abf2777c7d..abf2777c7d 100644
--- a/branches/sca-java-1.x/itest/domain/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/domain/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/domain/src/main/resources/contributionA/Calculator.composite b/sca-java-1.x/trunk/itest/domain/src/main/resources/contributionA/Calculator.composite
index 534e1a29af..534e1a29af 100644
--- a/branches/sca-java-1.x/itest/domain/src/main/resources/contributionA/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/domain/src/main/resources/contributionA/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml
index 1b1c0291e2..1b1c0291e2 100644
--- a/branches/sca-java-1.x/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite b/sca-java-1.x/trunk/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite
index bdb89803d1..bdb89803d1 100644
--- a/branches/sca-java-1.x/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite b/sca-java-1.x/trunk/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite
index c5af8dd3cc..c5af8dd3cc 100644
--- a/branches/sca-java-1.x/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/domain/src/main/resources/contributionDependent/Calculator.composite b/sca-java-1.x/trunk/itest/domain/src/main/resources/contributionDependent/Calculator.composite
index df00387b23..df00387b23 100644
--- a/branches/sca-java-1.x/itest/domain/src/main/resources/contributionDependent/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/domain/src/main/resources/contributionDependent/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml
index 8264a8243f..8264a8243f 100644
--- a/branches/sca-java-1.x/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/domain/src/main/resources/contributionPrimary/Calculator.composite b/sca-java-1.x/trunk/itest/domain/src/main/resources/contributionPrimary/Calculator.composite
index 92d069c6c9..92d069c6c9 100644
--- a/branches/sca-java-1.x/itest/domain/src/main/resources/contributionPrimary/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/domain/src/main/resources/contributionPrimary/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml
index e53c14a651..e53c14a651 100644
--- a/branches/sca-java-1.x/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java b/sca-java-1.x/trunk/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java
index 98f13df774..98f13df774 100644
--- a/branches/sca-java-1.x/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java
+++ b/sca-java-1.x/trunk/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/basic/client/pom.xml b/sca-java-1.x/trunk/itest/domainmgr/basic/client/pom.xml
index 9ab69d4f2e..9ab69d4f2e 100644
--- a/branches/sca-java-1.x/itest/domainmgr/basic/client/pom.xml
+++ b/sca-java-1.x/trunk/itest/domainmgr/basic/client/pom.xml
diff --git a/branches/sca-java-1.x/itest/domainmgr/basic/client/src/main/java/scatours/client/TestClient.java b/sca-java-1.x/trunk/itest/domainmgr/basic/client/src/main/java/scatours/client/TestClient.java
index 64a1487f72..64a1487f72 100644
--- a/branches/sca-java-1.x/itest/domainmgr/basic/client/src/main/java/scatours/client/TestClient.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/basic/client/src/main/java/scatours/client/TestClient.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/basic/client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/domainmgr/basic/client/src/main/resources/META-INF/sca-contribution.xml
index 0e2af2345d..0e2af2345d 100644
--- a/branches/sca-java-1.x/itest/domainmgr/basic/client/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/domainmgr/basic/client/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/domainmgr/basic/client/src/main/resources/client.composite b/sca-java-1.x/trunk/itest/domainmgr/basic/client/src/main/resources/client.composite
index 05c2755114..05c2755114 100644
--- a/branches/sca-java-1.x/itest/domainmgr/basic/client/src/main/resources/client.composite
+++ b/sca-java-1.x/trunk/itest/domainmgr/basic/client/src/main/resources/client.composite
diff --git a/branches/sca-java-1.x/itest/domainmgr/basic/pom.xml b/sca-java-1.x/trunk/itest/domainmgr/basic/pom.xml
index 2fb6833539..2fb6833539 100644
--- a/branches/sca-java-1.x/itest/domainmgr/basic/pom.xml
+++ b/sca-java-1.x/trunk/itest/domainmgr/basic/pom.xml
diff --git a/branches/sca-java-1.x/itest/domainmgr/basic/runtest/pom.xml b/sca-java-1.x/trunk/itest/domainmgr/basic/runtest/pom.xml
index ac74736e30..ac74736e30 100644
--- a/branches/sca-java-1.x/itest/domainmgr/basic/runtest/pom.xml
+++ b/sca-java-1.x/trunk/itest/domainmgr/basic/runtest/pom.xml
diff --git a/branches/sca-java-1.x/itest/domainmgr/basic/runtest/src/test/java/domainmgr/DomainManagerBasicTestCase.java b/sca-java-1.x/trunk/itest/domainmgr/basic/runtest/src/test/java/domainmgr/DomainManagerBasicTestCase.java
index 46e5ab03af..46e5ab03af 100644
--- a/branches/sca-java-1.x/itest/domainmgr/basic/runtest/src/test/java/domainmgr/DomainManagerBasicTestCase.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/basic/runtest/src/test/java/domainmgr/DomainManagerBasicTestCase.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud.composite b/sca-java-1.x/trunk/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud.composite
index 42109ef963..42109ef963 100644
--- a/branches/sca-java-1.x/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud.composite
+++ b/sca-java-1.x/trunk/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud.composite
diff --git a/branches/sca-java-1.x/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ClientNode.composite b/sca-java-1.x/trunk/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ClientNode.composite
index 5f5fe2fc96..5f5fe2fc96 100644
--- a/branches/sca-java-1.x/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ClientNode.composite
+++ b/sca-java-1.x/trunk/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ClientNode.composite
diff --git a/branches/sca-java-1.x/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ToursNode.composite b/sca-java-1.x/trunk/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ToursNode.composite
index 4f75d7cba2..4f75d7cba2 100644
--- a/branches/sca-java-1.x/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ToursNode.composite
+++ b/sca-java-1.x/trunk/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ToursNode.composite
diff --git a/branches/sca-java-1.x/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/TripsNode.composite b/sca-java-1.x/trunk/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/TripsNode.composite
index 4254b0d6fb..4254b0d6fb 100644
--- a/branches/sca-java-1.x/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/TripsNode.composite
+++ b/sca-java-1.x/trunk/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/TripsNode.composite
diff --git a/branches/sca-java-1.x/itest/domainmgr/basic/runtest/src/test/resources/domain/domain.composite b/sca-java-1.x/trunk/itest/domainmgr/basic/runtest/src/test/resources/domain/domain.composite
index 4141457795..4141457795 100644
--- a/branches/sca-java-1.x/itest/domainmgr/basic/runtest/src/test/resources/domain/domain.composite
+++ b/sca-java-1.x/trunk/itest/domainmgr/basic/runtest/src/test/resources/domain/domain.composite
diff --git a/branches/sca-java-1.x/itest/domainmgr/basic/runtest/src/test/resources/domain/workspace.xml b/sca-java-1.x/trunk/itest/domainmgr/basic/runtest/src/test/resources/domain/workspace.xml
index 075c3b8693..075c3b8693 100644
--- a/branches/sca-java-1.x/itest/domainmgr/basic/runtest/src/test/resources/domain/workspace.xml
+++ b/sca-java-1.x/trunk/itest/domainmgr/basic/runtest/src/test/resources/domain/workspace.xml
diff --git a/branches/sca-java-1.x/itest/domainmgr/basic/tours/pom.xml b/sca-java-1.x/trunk/itest/domainmgr/basic/tours/pom.xml
index 32017331a4..32017331a4 100644
--- a/branches/sca-java-1.x/itest/domainmgr/basic/tours/pom.xml
+++ b/sca-java-1.x/trunk/itest/domainmgr/basic/tours/pom.xml
diff --git a/branches/sca-java-1.x/itest/domainmgr/basic/tours/src/main/java/com/goodvaluetrips/Trips.java b/sca-java-1.x/trunk/itest/domainmgr/basic/tours/src/main/java/com/goodvaluetrips/Trips.java
index 365a210368..365a210368 100644
--- a/branches/sca-java-1.x/itest/domainmgr/basic/tours/src/main/java/com/goodvaluetrips/Trips.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/basic/tours/src/main/java/com/goodvaluetrips/Trips.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Bookings.java b/sca-java-1.x/trunk/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Bookings.java
index 9d54d46bb6..9d54d46bb6 100644
--- a/branches/sca-java-1.x/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Bookings.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Bookings.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Checkout.java b/sca-java-1.x/trunk/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Checkout.java
index 29c84d2bc0..29c84d2bc0 100644
--- a/branches/sca-java-1.x/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Checkout.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Checkout.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/ShoppingCart.java b/sca-java-1.x/trunk/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/ShoppingCart.java
index db551501e1..db551501e1 100644
--- a/branches/sca-java-1.x/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/ShoppingCart.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/ShoppingCart.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/TripBooking.java b/sca-java-1.x/trunk/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/TripBooking.java
index e64d60545e..e64d60545e 100644
--- a/branches/sca-java-1.x/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/TripBooking.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/TripBooking.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Updates.java b/sca-java-1.x/trunk/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Updates.java
index e33b0399cb..e33b0399cb 100644
--- a/branches/sca-java-1.x/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Updates.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Updates.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/basic/tours/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/domainmgr/basic/tours/src/main/resources/META-INF/sca-contribution.xml
index b6ef1acafa..b6ef1acafa 100644
--- a/branches/sca-java-1.x/itest/domainmgr/basic/tours/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/domainmgr/basic/tours/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/domainmgr/basic/tours/src/main/resources/tours.composite b/sca-java-1.x/trunk/itest/domainmgr/basic/tours/src/main/resources/tours.composite
index f166a1635d..f166a1635d 100644
--- a/branches/sca-java-1.x/itest/domainmgr/basic/tours/src/main/resources/tours.composite
+++ b/sca-java-1.x/trunk/itest/domainmgr/basic/tours/src/main/resources/tours.composite
diff --git a/branches/sca-java-1.x/itest/domainmgr/basic/trips/pom.xml b/sca-java-1.x/trunk/itest/domainmgr/basic/trips/pom.xml
index a623473e49..a623473e49 100644
--- a/branches/sca-java-1.x/itest/domainmgr/basic/trips/pom.xml
+++ b/sca-java-1.x/trunk/itest/domainmgr/basic/trips/pom.xml
diff --git a/branches/sca-java-1.x/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/TripProvider.java b/sca-java-1.x/trunk/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/TripProvider.java
index d30046aaef..d30046aaef 100644
--- a/branches/sca-java-1.x/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/TripProvider.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/TripProvider.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/Trips.java b/sca-java-1.x/trunk/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/Trips.java
index 365a210368..365a210368 100644
--- a/branches/sca-java-1.x/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/Trips.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/Trips.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/basic/trips/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/domainmgr/basic/trips/src/main/resources/META-INF/sca-contribution.xml
index c42834be8a..c42834be8a 100644
--- a/branches/sca-java-1.x/itest/domainmgr/basic/trips/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/domainmgr/basic/trips/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/domainmgr/basic/trips/src/main/resources/trips.composite b/sca-java-1.x/trunk/itest/domainmgr/basic/trips/src/main/resources/trips.composite
index ab173e5ef7..ab173e5ef7 100644
--- a/branches/sca-java-1.x/itest/domainmgr/basic/trips/src/main/resources/trips.composite
+++ b/sca-java-1.x/trunk/itest/domainmgr/basic/trips/src/main/resources/trips.composite
diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/client/pom.xml b/sca-java-1.x/trunk/itest/domainmgr/callback/client/pom.xml
index fcb7ff0392..fcb7ff0392 100644
--- a/branches/sca-java-1.x/itest/domainmgr/callback/client/pom.xml
+++ b/sca-java-1.x/trunk/itest/domainmgr/callback/client/pom.xml
diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/client/src/main/java/callbackclient/MyClientImpl.java b/sca-java-1.x/trunk/itest/domainmgr/callback/client/src/main/java/callbackclient/MyClientImpl.java
index 9937ea0b1e..9937ea0b1e 100644
--- a/branches/sca-java-1.x/itest/domainmgr/callback/client/src/main/java/callbackclient/MyClientImpl.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/callback/client/src/main/java/callbackclient/MyClientImpl.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/client/src/main/java/callbackclient/MyService.java b/sca-java-1.x/trunk/itest/domainmgr/callback/client/src/main/java/callbackclient/MyService.java
index f22534e531..f22534e531 100644
--- a/branches/sca-java-1.x/itest/domainmgr/callback/client/src/main/java/callbackclient/MyService.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/callback/client/src/main/java/callbackclient/MyService.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/client/src/main/java/callbackclient/MyServiceCallback.java b/sca-java-1.x/trunk/itest/domainmgr/callback/client/src/main/java/callbackclient/MyServiceCallback.java
index 412b3c7584..412b3c7584 100644
--- a/branches/sca-java-1.x/itest/domainmgr/callback/client/src/main/java/callbackclient/MyServiceCallback.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/callback/client/src/main/java/callbackclient/MyServiceCallback.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/client/src/main/java/callbackclient/TestService.java b/sca-java-1.x/trunk/itest/domainmgr/callback/client/src/main/java/callbackclient/TestService.java
index 0ec6acf2d1..0ec6acf2d1 100644
--- a/branches/sca-java-1.x/itest/domainmgr/callback/client/src/main/java/callbackclient/TestService.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/callback/client/src/main/java/callbackclient/TestService.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/domainmgr/callback/client/src/main/resources/META-INF/sca-contribution.xml
index 1c37dd00b0..1c37dd00b0 100644
--- a/branches/sca-java-1.x/itest/domainmgr/callback/client/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/domainmgr/callback/client/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/client/src/main/resources/client.composite b/sca-java-1.x/trunk/itest/domainmgr/callback/client/src/main/resources/client.composite
index 33842c3853..33842c3853 100644
--- a/branches/sca-java-1.x/itest/domainmgr/callback/client/src/main/resources/client.composite
+++ b/sca-java-1.x/trunk/itest/domainmgr/callback/client/src/main/resources/client.composite
diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/pom.xml b/sca-java-1.x/trunk/itest/domainmgr/callback/pom.xml
index 9443ef1d81..9443ef1d81 100644
--- a/branches/sca-java-1.x/itest/domainmgr/callback/pom.xml
+++ b/sca-java-1.x/trunk/itest/domainmgr/callback/pom.xml
diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/runtest/pom.xml b/sca-java-1.x/trunk/itest/domainmgr/callback/runtest/pom.xml
index 6a5416097b..6a5416097b 100644
--- a/branches/sca-java-1.x/itest/domainmgr/callback/runtest/pom.xml
+++ b/sca-java-1.x/trunk/itest/domainmgr/callback/runtest/pom.xml
diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/java/callbacktest/TestService.java b/sca-java-1.x/trunk/itest/domainmgr/callback/runtest/src/test/java/callbacktest/TestService.java
index 6cd580676c..6cd580676c 100644
--- a/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/java/callbacktest/TestService.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/callback/runtest/src/test/java/callbacktest/TestService.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/java/domainmgr/DomainManagerCallbackTestCase.java b/sca-java-1.x/trunk/itest/domainmgr/callback/runtest/src/test/java/domainmgr/DomainManagerCallbackTestCase.java
index 71d165449d..71d165449d 100644
--- a/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/java/domainmgr/DomainManagerCallbackTestCase.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/callback/runtest/src/test/java/domainmgr/DomainManagerCallbackTestCase.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud.composite b/sca-java-1.x/trunk/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud.composite
index 4b2c664ed2..4b2c664ed2 100644
--- a/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud.composite
+++ b/sca-java-1.x/trunk/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud.composite
diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ClientNode.composite b/sca-java-1.x/trunk/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ClientNode.composite
index 509bfafac1..509bfafac1 100644
--- a/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ClientNode.composite
+++ b/sca-java-1.x/trunk/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ClientNode.composite
diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ServiceNode.composite b/sca-java-1.x/trunk/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ServiceNode.composite
index 1f1f0c47c2..1f1f0c47c2 100644
--- a/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ServiceNode.composite
+++ b/sca-java-1.x/trunk/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ServiceNode.composite
diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/resources/domain/domain.composite b/sca-java-1.x/trunk/itest/domainmgr/callback/runtest/src/test/resources/domain/domain.composite
index ba4d6bbf25..ba4d6bbf25 100644
--- a/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/resources/domain/domain.composite
+++ b/sca-java-1.x/trunk/itest/domainmgr/callback/runtest/src/test/resources/domain/domain.composite
diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/resources/domain/workspace.xml b/sca-java-1.x/trunk/itest/domainmgr/callback/runtest/src/test/resources/domain/workspace.xml
index 6a6288e39c..6a6288e39c 100644
--- a/branches/sca-java-1.x/itest/domainmgr/callback/runtest/src/test/resources/domain/workspace.xml
+++ b/sca-java-1.x/trunk/itest/domainmgr/callback/runtest/src/test/resources/domain/workspace.xml
diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/service/pom.xml b/sca-java-1.x/trunk/itest/domainmgr/callback/service/pom.xml
index b53efde061..b53efde061 100644
--- a/branches/sca-java-1.x/itest/domainmgr/callback/service/pom.xml
+++ b/sca-java-1.x/trunk/itest/domainmgr/callback/service/pom.xml
diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/service/src/main/java/callbackservice/MyService.java b/sca-java-1.x/trunk/itest/domainmgr/callback/service/src/main/java/callbackservice/MyService.java
index e5fbeb48ba..e5fbeb48ba 100644
--- a/branches/sca-java-1.x/itest/domainmgr/callback/service/src/main/java/callbackservice/MyService.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/callback/service/src/main/java/callbackservice/MyService.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceCallback.java b/sca-java-1.x/trunk/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceCallback.java
index 896f6ca873..896f6ca873 100644
--- a/branches/sca-java-1.x/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceCallback.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceCallback.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceImpl.java b/sca-java-1.x/trunk/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceImpl.java
index 1afbbfe934..1afbbfe934 100644
--- a/branches/sca-java-1.x/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/service/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/domainmgr/callback/service/src/main/resources/META-INF/sca-contribution.xml
index 517d022013..517d022013 100644
--- a/branches/sca-java-1.x/itest/domainmgr/callback/service/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/domainmgr/callback/service/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/domainmgr/callback/service/src/main/resources/service.composite b/sca-java-1.x/trunk/itest/domainmgr/callback/service/src/main/resources/service.composite
index b84830795b..b84830795b 100644
--- a/branches/sca-java-1.x/itest/domainmgr/callback/service/src/main/resources/service.composite
+++ b/sca-java-1.x/trunk/itest/domainmgr/callback/service/src/main/resources/service.composite
diff --git a/branches/sca-java-1.x/itest/domainmgr/error/payment/pom.xml b/sca-java-1.x/trunk/itest/domainmgr/error/payment/pom.xml
index 091e280dd6..091e280dd6 100644
--- a/branches/sca-java-1.x/itest/domainmgr/error/payment/pom.xml
+++ b/sca-java-1.x/trunk/itest/domainmgr/error/payment/pom.xml
diff --git a/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/java/payment/PaymentImpl.java b/sca-java-1.x/trunk/itest/domainmgr/error/payment/src/main/java/payment/PaymentImpl.java
index 071bcf22c2..071bcf22c2 100644
--- a/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/java/payment/PaymentImpl.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/error/payment/src/main/java/payment/PaymentImpl.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/java/scatours/customer/Customer.java b/sca-java-1.x/trunk/itest/domainmgr/error/payment/src/main/java/scatours/customer/Customer.java
index daf56353a3..daf56353a3 100644
--- a/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/java/scatours/customer/Customer.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/error/payment/src/main/java/scatours/customer/Customer.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerNotFoundException.java b/sca-java-1.x/trunk/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerNotFoundException.java
index 89f56ce6ec..89f56ce6ec 100644
--- a/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerNotFoundException.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerNotFoundException.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerRegistry.java b/sca-java-1.x/trunk/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerRegistry.java
index cfd79a7f95..cfd79a7f95 100644
--- a/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerRegistry.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerRegistry.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerRegistryImpl.java b/sca-java-1.x/trunk/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerRegistryImpl.java
index e6328f062c..e6328f062c 100644
--- a/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerRegistryImpl.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerRegistryImpl.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/java/scatours/emailgateway/EmailGateway.java b/sca-java-1.x/trunk/itest/domainmgr/error/payment/src/main/java/scatours/emailgateway/EmailGateway.java
index d360381327..d360381327 100644
--- a/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/java/scatours/emailgateway/EmailGateway.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/error/payment/src/main/java/scatours/emailgateway/EmailGateway.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/java/scatours/emailgateway/EmailGatewayImpl.java b/sca-java-1.x/trunk/itest/domainmgr/error/payment/src/main/java/scatours/emailgateway/EmailGatewayImpl.java
index 060c3dabda..060c3dabda 100644
--- a/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/java/scatours/emailgateway/EmailGatewayImpl.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/error/payment/src/main/java/scatours/emailgateway/EmailGatewayImpl.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/resources/CreditCardPayment.wsdl b/sca-java-1.x/trunk/itest/domainmgr/error/payment/src/main/resources/CreditCardPayment.wsdl
index d17497d1f6..d17497d1f6 100644
--- a/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/resources/CreditCardPayment.wsdl
+++ b/sca-java-1.x/trunk/itest/domainmgr/error/payment/src/main/resources/CreditCardPayment.wsdl
diff --git a/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/domainmgr/error/payment/src/main/resources/META-INF/sca-contribution.xml
index 12b9852bf0..12b9852bf0 100644
--- a/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/domainmgr/error/payment/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/resources/Payment.wsdl b/sca-java-1.x/trunk/itest/domainmgr/error/payment/src/main/resources/Payment.wsdl
index 3885764899..3885764899 100644
--- a/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/resources/Payment.wsdl
+++ b/sca-java-1.x/trunk/itest/domainmgr/error/payment/src/main/resources/Payment.wsdl
diff --git a/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/resources/payment.composite b/sca-java-1.x/trunk/itest/domainmgr/error/payment/src/main/resources/payment.composite
index 53fcefc241..53fcefc241 100644
--- a/branches/sca-java-1.x/itest/domainmgr/error/payment/src/main/resources/payment.composite
+++ b/sca-java-1.x/trunk/itest/domainmgr/error/payment/src/main/resources/payment.composite
diff --git a/branches/sca-java-1.x/itest/domainmgr/error/pom.xml b/sca-java-1.x/trunk/itest/domainmgr/error/pom.xml
index 5ff39c4289..5ff39c4289 100644
--- a/branches/sca-java-1.x/itest/domainmgr/error/pom.xml
+++ b/sca-java-1.x/trunk/itest/domainmgr/error/pom.xml
diff --git a/branches/sca-java-1.x/itest/domainmgr/error/runtest/pom.xml b/sca-java-1.x/trunk/itest/domainmgr/error/runtest/pom.xml
index 2097f2206c..2097f2206c 100644
--- a/branches/sca-java-1.x/itest/domainmgr/error/runtest/pom.xml
+++ b/sca-java-1.x/trunk/itest/domainmgr/error/runtest/pom.xml
diff --git a/branches/sca-java-1.x/itest/domainmgr/error/runtest/src/test/java/domainmgr/DomainManagerErrorTestCase.java b/sca-java-1.x/trunk/itest/domainmgr/error/runtest/src/test/java/domainmgr/DomainManagerErrorTestCase.java
index 23ffc440ab..23ffc440ab 100644
--- a/branches/sca-java-1.x/itest/domainmgr/error/runtest/src/test/java/domainmgr/DomainManagerErrorTestCase.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/error/runtest/src/test/java/domainmgr/DomainManagerErrorTestCase.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/error/runtest/src/test/resources/domain/cloud.composite b/sca-java-1.x/trunk/itest/domainmgr/error/runtest/src/test/resources/domain/cloud.composite
index ca43648169..ca43648169 100644
--- a/branches/sca-java-1.x/itest/domainmgr/error/runtest/src/test/resources/domain/cloud.composite
+++ b/sca-java-1.x/trunk/itest/domainmgr/error/runtest/src/test/resources/domain/cloud.composite
diff --git a/branches/sca-java-1.x/itest/domainmgr/error/runtest/src/test/resources/domain/cloud/PaymentNode.composite b/sca-java-1.x/trunk/itest/domainmgr/error/runtest/src/test/resources/domain/cloud/PaymentNode.composite
index e61fd4c1a3..e61fd4c1a3 100644
--- a/branches/sca-java-1.x/itest/domainmgr/error/runtest/src/test/resources/domain/cloud/PaymentNode.composite
+++ b/sca-java-1.x/trunk/itest/domainmgr/error/runtest/src/test/resources/domain/cloud/PaymentNode.composite
diff --git a/branches/sca-java-1.x/itest/domainmgr/error/runtest/src/test/resources/domain/domain.composite b/sca-java-1.x/trunk/itest/domainmgr/error/runtest/src/test/resources/domain/domain.composite
index f03181ecc5..f03181ecc5 100644
--- a/branches/sca-java-1.x/itest/domainmgr/error/runtest/src/test/resources/domain/domain.composite
+++ b/sca-java-1.x/trunk/itest/domainmgr/error/runtest/src/test/resources/domain/domain.composite
diff --git a/branches/sca-java-1.x/itest/domainmgr/error/runtest/src/test/resources/domain/workspace.xml b/sca-java-1.x/trunk/itest/domainmgr/error/runtest/src/test/resources/domain/workspace.xml
index 9ee266671d..9ee266671d 100644
--- a/branches/sca-java-1.x/itest/domainmgr/error/runtest/src/test/resources/domain/workspace.xml
+++ b/sca-java-1.x/trunk/itest/domainmgr/error/runtest/src/test/resources/domain/workspace.xml
diff --git a/branches/sca-java-1.x/itest/domainmgr/pom.xml b/sca-java-1.x/trunk/itest/domainmgr/pom.xml
index 4f8be528bb..4f8be528bb 100644
--- a/branches/sca-java-1.x/itest/domainmgr/pom.xml
+++ b/sca-java-1.x/trunk/itest/domainmgr/pom.xml
diff --git a/branches/sca-java-1.x/itest/domainmgr/transaction/payment/pom.xml b/sca-java-1.x/trunk/itest/domainmgr/transaction/payment/pom.xml
index 18feb2375f..18feb2375f 100644
--- a/branches/sca-java-1.x/itest/domainmgr/transaction/payment/pom.xml
+++ b/sca-java-1.x/trunk/itest/domainmgr/transaction/payment/pom.xml
diff --git a/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/java/payment/PaymentImpl.java b/sca-java-1.x/trunk/itest/domainmgr/transaction/payment/src/main/java/payment/PaymentImpl.java
index 071bcf22c2..071bcf22c2 100644
--- a/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/java/payment/PaymentImpl.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/transaction/payment/src/main/java/payment/PaymentImpl.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/Customer.java b/sca-java-1.x/trunk/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/Customer.java
index daf56353a3..daf56353a3 100644
--- a/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/Customer.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/Customer.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerNotFoundException.java b/sca-java-1.x/trunk/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerNotFoundException.java
index 89f56ce6ec..89f56ce6ec 100644
--- a/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerNotFoundException.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerNotFoundException.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerRegistry.java b/sca-java-1.x/trunk/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerRegistry.java
index cfd79a7f95..cfd79a7f95 100644
--- a/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerRegistry.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerRegistry.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerRegistryImpl.java b/sca-java-1.x/trunk/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerRegistryImpl.java
index e6328f062c..e6328f062c 100644
--- a/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerRegistryImpl.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerRegistryImpl.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/java/scatours/emailgateway/EmailGateway.java b/sca-java-1.x/trunk/itest/domainmgr/transaction/payment/src/main/java/scatours/emailgateway/EmailGateway.java
index d360381327..d360381327 100644
--- a/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/java/scatours/emailgateway/EmailGateway.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/transaction/payment/src/main/java/scatours/emailgateway/EmailGateway.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/java/scatours/emailgateway/EmailGatewayImpl.java b/sca-java-1.x/trunk/itest/domainmgr/transaction/payment/src/main/java/scatours/emailgateway/EmailGatewayImpl.java
index 060c3dabda..060c3dabda 100644
--- a/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/java/scatours/emailgateway/EmailGatewayImpl.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/transaction/payment/src/main/java/scatours/emailgateway/EmailGatewayImpl.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/resources/CreditCardPayment.wsdl b/sca-java-1.x/trunk/itest/domainmgr/transaction/payment/src/main/resources/CreditCardPayment.wsdl
index d17497d1f6..d17497d1f6 100644
--- a/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/resources/CreditCardPayment.wsdl
+++ b/sca-java-1.x/trunk/itest/domainmgr/transaction/payment/src/main/resources/CreditCardPayment.wsdl
diff --git a/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/domainmgr/transaction/payment/src/main/resources/META-INF/sca-contribution.xml
index 12b9852bf0..12b9852bf0 100644
--- a/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/domainmgr/transaction/payment/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/resources/Payment.wsdl b/sca-java-1.x/trunk/itest/domainmgr/transaction/payment/src/main/resources/Payment.wsdl
index 3885764899..3885764899 100644
--- a/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/resources/Payment.wsdl
+++ b/sca-java-1.x/trunk/itest/domainmgr/transaction/payment/src/main/resources/Payment.wsdl
diff --git a/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/resources/definitions.xml b/sca-java-1.x/trunk/itest/domainmgr/transaction/payment/src/main/resources/definitions.xml
index 9060e75ed2..9060e75ed2 100644
--- a/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/resources/definitions.xml
+++ b/sca-java-1.x/trunk/itest/domainmgr/transaction/payment/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/resources/payment.composite b/sca-java-1.x/trunk/itest/domainmgr/transaction/payment/src/main/resources/payment.composite
index 53fcefc241..53fcefc241 100644
--- a/branches/sca-java-1.x/itest/domainmgr/transaction/payment/src/main/resources/payment.composite
+++ b/sca-java-1.x/trunk/itest/domainmgr/transaction/payment/src/main/resources/payment.composite
diff --git a/branches/sca-java-1.x/itest/domainmgr/transaction/pom.xml b/sca-java-1.x/trunk/itest/domainmgr/transaction/pom.xml
index 067ec7e3d8..067ec7e3d8 100644
--- a/branches/sca-java-1.x/itest/domainmgr/transaction/pom.xml
+++ b/sca-java-1.x/trunk/itest/domainmgr/transaction/pom.xml
diff --git a/branches/sca-java-1.x/itest/domainmgr/transaction/runtest/pom.xml b/sca-java-1.x/trunk/itest/domainmgr/transaction/runtest/pom.xml
index 4a8ec3ac26..4a8ec3ac26 100644
--- a/branches/sca-java-1.x/itest/domainmgr/transaction/runtest/pom.xml
+++ b/sca-java-1.x/trunk/itest/domainmgr/transaction/runtest/pom.xml
diff --git a/branches/sca-java-1.x/itest/domainmgr/transaction/runtest/src/test/java/domainmgr/DomainManagerTransactionTestCase.java b/sca-java-1.x/trunk/itest/domainmgr/transaction/runtest/src/test/java/domainmgr/DomainManagerTransactionTestCase.java
index ef99628686..ef99628686 100644
--- a/branches/sca-java-1.x/itest/domainmgr/transaction/runtest/src/test/java/domainmgr/DomainManagerTransactionTestCase.java
+++ b/sca-java-1.x/trunk/itest/domainmgr/transaction/runtest/src/test/java/domainmgr/DomainManagerTransactionTestCase.java
diff --git a/branches/sca-java-1.x/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud.composite b/sca-java-1.x/trunk/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud.composite
index ca43648169..ca43648169 100644
--- a/branches/sca-java-1.x/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud.composite
+++ b/sca-java-1.x/trunk/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud.composite
diff --git a/branches/sca-java-1.x/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud/PaymentNode.composite b/sca-java-1.x/trunk/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud/PaymentNode.composite
index e61fd4c1a3..e61fd4c1a3 100644
--- a/branches/sca-java-1.x/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud/PaymentNode.composite
+++ b/sca-java-1.x/trunk/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud/PaymentNode.composite
diff --git a/branches/sca-java-1.x/itest/domainmgr/transaction/runtest/src/test/resources/domain/domain.composite b/sca-java-1.x/trunk/itest/domainmgr/transaction/runtest/src/test/resources/domain/domain.composite
index f03181ecc5..f03181ecc5 100644
--- a/branches/sca-java-1.x/itest/domainmgr/transaction/runtest/src/test/resources/domain/domain.composite
+++ b/sca-java-1.x/trunk/itest/domainmgr/transaction/runtest/src/test/resources/domain/domain.composite
diff --git a/branches/sca-java-1.x/itest/domainmgr/transaction/runtest/src/test/resources/domain/workspace.xml b/sca-java-1.x/trunk/itest/domainmgr/transaction/runtest/src/test/resources/domain/workspace.xml
index 1379b37dce..1379b37dce 100644
--- a/branches/sca-java-1.x/itest/domainmgr/transaction/runtest/src/test/resources/domain/workspace.xml
+++ b/sca-java-1.x/trunk/itest/domainmgr/transaction/runtest/src/test/resources/domain/workspace.xml
diff --git a/branches/sca-java-1.x/itest/exceptions-cross-binding-ws/pom.xml b/sca-java-1.x/trunk/itest/exceptions-cross-binding-ws/pom.xml
index af0539d2f6..af0539d2f6 100644
--- a/branches/sca-java-1.x/itest/exceptions-cross-binding-ws/pom.xml
+++ b/sca-java-1.x/trunk/itest/exceptions-cross-binding-ws/pom.xml
diff --git a/branches/sca-java-1.x/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java b/sca-java-1.x/trunk/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
index 4f4fe50041..4f4fe50041 100644
--- a/branches/sca-java-1.x/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
+++ b/sca-java-1.x/trunk/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
diff --git a/branches/sca-java-1.x/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java b/sca-java-1.x/trunk/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
index 95496e1737..95496e1737 100644
--- a/branches/sca-java-1.x/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
+++ b/sca-java-1.x/trunk/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
diff --git a/branches/sca-java-1.x/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java b/sca-java-1.x/trunk/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
index 842dd4e602..842dd4e602 100644
--- a/branches/sca-java-1.x/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
+++ b/sca-java-1.x/trunk/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
diff --git a/branches/sca-java-1.x/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java b/sca-java-1.x/trunk/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
index 74815dc6c1..74815dc6c1 100644
--- a/branches/sca-java-1.x/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
+++ b/sca-java-1.x/trunk/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
diff --git a/branches/sca-java-1.x/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java b/sca-java-1.x/trunk/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
index aba83723bb..aba83723bb 100644
--- a/branches/sca-java-1.x/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
+++ b/sca-java-1.x/trunk/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
diff --git a/branches/sca-java-1.x/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java b/sca-java-1.x/trunk/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
index ab65efbb58..ab65efbb58 100644
--- a/branches/sca-java-1.x/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
+++ b/sca-java-1.x/trunk/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
diff --git a/branches/sca-java-1.x/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite b/sca-java-1.x/trunk/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
index acecdff613..acecdff613 100644
--- a/branches/sca-java-1.x/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
+++ b/sca-java-1.x/trunk/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
diff --git a/branches/sca-java-1.x/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite b/sca-java-1.x/trunk/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
index 460edab182..460edab182 100644
--- a/branches/sca-java-1.x/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
+++ b/sca-java-1.x/trunk/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
diff --git a/branches/sca-java-1.x/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl b/sca-java-1.x/trunk/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl
index 40e87953b6..40e87953b6 100644
--- a/branches/sca-java-1.x/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl
+++ b/sca-java-1.x/trunk/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl
diff --git a/branches/sca-java-1.x/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd b/sca-java-1.x/trunk/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd
index 9759647cfe..9759647cfe 100644
--- a/branches/sca-java-1.x/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd
+++ b/sca-java-1.x/trunk/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd
diff --git a/branches/sca-java-1.x/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/sca-java-1.x/trunk/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
index fc49fa1d7d..fc49fa1d7d 100644
--- a/branches/sca-java-1.x/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
+++ b/sca-java-1.x/trunk/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
diff --git a/branches/sca-java-1.x/itest/exceptions-cross-binding/pom.xml b/sca-java-1.x/trunk/itest/exceptions-cross-binding/pom.xml
index ecab184de0..ecab184de0 100644
--- a/branches/sca-java-1.x/itest/exceptions-cross-binding/pom.xml
+++ b/sca-java-1.x/trunk/itest/exceptions-cross-binding/pom.xml
diff --git a/branches/sca-java-1.x/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java b/sca-java-1.x/trunk/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
index f5e36db7cd..f5e36db7cd 100644
--- a/branches/sca-java-1.x/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
+++ b/sca-java-1.x/trunk/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
diff --git a/branches/sca-java-1.x/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java b/sca-java-1.x/trunk/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
index 65751175fb..65751175fb 100644
--- a/branches/sca-java-1.x/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
+++ b/sca-java-1.x/trunk/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
diff --git a/branches/sca-java-1.x/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java b/sca-java-1.x/trunk/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
index 5f65d293ea..5f65d293ea 100644
--- a/branches/sca-java-1.x/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
+++ b/sca-java-1.x/trunk/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
diff --git a/branches/sca-java-1.x/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java b/sca-java-1.x/trunk/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
index e84ae633e7..e84ae633e7 100644
--- a/branches/sca-java-1.x/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
+++ b/sca-java-1.x/trunk/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
diff --git a/branches/sca-java-1.x/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java b/sca-java-1.x/trunk/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
index 74815dc6c1..74815dc6c1 100644
--- a/branches/sca-java-1.x/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
+++ b/sca-java-1.x/trunk/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
diff --git a/branches/sca-java-1.x/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java b/sca-java-1.x/trunk/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
index 5fe40935ec..5fe40935ec 100644
--- a/branches/sca-java-1.x/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
+++ b/sca-java-1.x/trunk/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
diff --git a/branches/sca-java-1.x/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java b/sca-java-1.x/trunk/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
index ab65efbb58..ab65efbb58 100644
--- a/branches/sca-java-1.x/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
+++ b/sca-java-1.x/trunk/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
diff --git a/branches/sca-java-1.x/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite b/sca-java-1.x/trunk/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
index 872fd721d1..872fd721d1 100644
--- a/branches/sca-java-1.x/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
+++ b/sca-java-1.x/trunk/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
diff --git a/branches/sca-java-1.x/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite b/sca-java-1.x/trunk/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
index 83526cb6a1..83526cb6a1 100644
--- a/branches/sca-java-1.x/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
+++ b/sca-java-1.x/trunk/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
diff --git a/branches/sca-java-1.x/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl b/sca-java-1.x/trunk/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
index d70cdad313..d70cdad313 100644
--- a/branches/sca-java-1.x/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
+++ b/sca-java-1.x/trunk/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
diff --git a/branches/sca-java-1.x/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl b/sca-java-1.x/trunk/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
index 33b830c856..33b830c856 100644
--- a/branches/sca-java-1.x/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
+++ b/sca-java-1.x/trunk/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
diff --git a/branches/sca-java-1.x/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd b/sca-java-1.x/trunk/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
index 9759647cfe..9759647cfe 100644
--- a/branches/sca-java-1.x/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
+++ b/sca-java-1.x/trunk/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
diff --git a/branches/sca-java-1.x/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/sca-java-1.x/trunk/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
index 7a07221b59..7a07221b59 100644
--- a/branches/sca-java-1.x/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
+++ b/sca-java-1.x/trunk/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
diff --git a/branches/sca-java-1.x/itest/exceptions-simple-ws/pom.xml b/sca-java-1.x/trunk/itest/exceptions-simple-ws/pom.xml
index 23e6dfcd74..23e6dfcd74 100644
--- a/branches/sca-java-1.x/itest/exceptions-simple-ws/pom.xml
+++ b/sca-java-1.x/trunk/itest/exceptions-simple-ws/pom.xml
diff --git a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java b/sca-java-1.x/trunk/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java
index 764f31b7cd..764f31b7cd 100644
--- a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java
+++ b/sca-java-1.x/trunk/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java
diff --git a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/BusinessExceptionMinimal.java b/sca-java-1.x/trunk/itest/exceptions-simple-ws/src/main/java/com/example/BusinessExceptionMinimal.java
index 1b597984e5..1b597984e5 100644
--- a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/BusinessExceptionMinimal.java
+++ b/sca-java-1.x/trunk/itest/exceptions-simple-ws/src/main/java/com/example/BusinessExceptionMinimal.java
diff --git a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java b/sca-java-1.x/trunk/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java
index 0c72b52ed9..0c72b52ed9 100644
--- a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java
+++ b/sca-java-1.x/trunk/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java
diff --git a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java b/sca-java-1.x/trunk/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java
index c86059f4f5..c86059f4f5 100644
--- a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java
+++ b/sca-java-1.x/trunk/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java
diff --git a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java b/sca-java-1.x/trunk/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java
index 987d2107b5..987d2107b5 100644
--- a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java
+++ b/sca-java-1.x/trunk/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java
diff --git a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java b/sca-java-1.x/trunk/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java
index 4f82e10241..4f82e10241 100644
--- a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java
+++ b/sca-java-1.x/trunk/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java
diff --git a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java b/sca-java-1.x/trunk/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java
index 5d054c1c9b..5d054c1c9b 100644
--- a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java b/sca-java-1.x/trunk/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java
index aa8591872e..aa8591872e 100644
--- a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java
+++ b/sca-java-1.x/trunk/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java
diff --git a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimalImpl.java b/sca-java-1.x/trunk/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimalImpl.java
index 728be51428..728be51428 100644
--- a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimalImpl.java
+++ b/sca-java-1.x/trunk/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimalImpl.java
diff --git a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/resources/example.composite b/sca-java-1.x/trunk/itest/exceptions-simple-ws/src/main/resources/example.composite
index 505132277c..505132277c 100644
--- a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/resources/example.composite
+++ b/sca-java-1.x/trunk/itest/exceptions-simple-ws/src/main/resources/example.composite
diff --git a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl b/sca-java-1.x/trunk/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl
index 59adbb49ef..59adbb49ef 100644
--- a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl
+++ b/sca-java-1.x/trunk/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl
diff --git a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/test/java/com/example/ExampleMinimalTestCase.java b/sca-java-1.x/trunk/itest/exceptions-simple-ws/src/test/java/com/example/ExampleMinimalTestCase.java
index 7310a0f1e7..7310a0f1e7 100644
--- a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/test/java/com/example/ExampleMinimalTestCase.java
+++ b/sca-java-1.x/trunk/itest/exceptions-simple-ws/src/test/java/com/example/ExampleMinimalTestCase.java
diff --git a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java b/sca-java-1.x/trunk/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java
index 740af4f43d..740af4f43d 100644
--- a/branches/sca-java-1.x/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java
+++ b/sca-java-1.x/trunk/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java
diff --git a/branches/sca-java-1.x/itest/exceptions/pom.xml b/sca-java-1.x/trunk/itest/exceptions/pom.xml
index 27c89834dd..27c89834dd 100644
--- a/branches/sca-java-1.x/itest/exceptions/pom.xml
+++ b/sca-java-1.x/trunk/itest/exceptions/pom.xml
diff --git a/branches/sca-java-1.x/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java b/sca-java-1.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
index b95b0ccb31..b95b0ccb31 100644
--- a/branches/sca-java-1.x/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
+++ b/sca-java-1.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
diff --git a/branches/sca-java-1.x/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java b/sca-java-1.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
index 5740e053a9..5740e053a9 100644
--- a/branches/sca-java-1.x/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
+++ b/sca-java-1.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
diff --git a/branches/sca-java-1.x/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java b/sca-java-1.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
index f923133ee9..f923133ee9 100644
--- a/branches/sca-java-1.x/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
+++ b/sca-java-1.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
diff --git a/branches/sca-java-1.x/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java b/sca-java-1.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
index 55d81102d2..55d81102d2 100644
--- a/branches/sca-java-1.x/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
+++ b/sca-java-1.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
diff --git a/branches/sca-java-1.x/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java b/sca-java-1.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
index 453528444d..453528444d 100644
--- a/branches/sca-java-1.x/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
+++ b/sca-java-1.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
diff --git a/branches/sca-java-1.x/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java b/sca-java-1.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
index 1987490a0a..1987490a0a 100644
--- a/branches/sca-java-1.x/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
+++ b/sca-java-1.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
diff --git a/branches/sca-java-1.x/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java b/sca-java-1.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
index c4cb52f94c..c4cb52f94c 100644
--- a/branches/sca-java-1.x/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
+++ b/sca-java-1.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
diff --git a/branches/sca-java-1.x/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java b/sca-java-1.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
index cf8740ba56..cf8740ba56 100644
--- a/branches/sca-java-1.x/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
+++ b/sca-java-1.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
diff --git a/branches/sca-java-1.x/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java b/sca-java-1.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
index f82a30d529..f82a30d529 100644
--- a/branches/sca-java-1.x/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
+++ b/sca-java-1.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
diff --git a/branches/sca-java-1.x/itest/exceptions/src/main/resources/ExceptionTest.composite b/sca-java-1.x/trunk/itest/exceptions/src/main/resources/ExceptionTest.composite
index d27797c2fe..d27797c2fe 100644
--- a/branches/sca-java-1.x/itest/exceptions/src/main/resources/ExceptionTest.composite
+++ b/sca-java-1.x/trunk/itest/exceptions/src/main/resources/ExceptionTest.composite
diff --git a/branches/sca-java-1.x/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java b/sca-java-1.x/trunk/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
index f84205c096..f84205c096 100644
--- a/branches/sca-java-1.x/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
+++ b/sca-java-1.x/trunk/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
diff --git a/branches/sca-java-1.x/itest/extended-api/pom.xml b/sca-java-1.x/trunk/itest/extended-api/pom.xml
index d27a50f427..d27a50f427 100644
--- a/branches/sca-java-1.x/itest/extended-api/pom.xml
+++ b/sca-java-1.x/trunk/itest/extended-api/pom.xml
diff --git a/branches/sca-java-1.x/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java b/sca-java-1.x/trunk/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java
index 869565af17..869565af17 100644
--- a/branches/sca-java-1.x/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java
+++ b/sca-java-1.x/trunk/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java
diff --git a/branches/sca-java-1.x/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java b/sca-java-1.x/trunk/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java
index c54af93c05..c54af93c05 100644
--- a/branches/sca-java-1.x/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java
+++ b/sca-java-1.x/trunk/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java
diff --git a/branches/sca-java-1.x/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java b/sca-java-1.x/trunk/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java
index 523d238f2e..523d238f2e 100644
--- a/branches/sca-java-1.x/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java b/sca-java-1.x/trunk/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java
index ab4300a7dd..ab4300a7dd 100644
--- a/branches/sca-java-1.x/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/extended-api/src/main/resources/BasicService.composite b/sca-java-1.x/trunk/itest/extended-api/src/main/resources/BasicService.composite
index 128b33b16f..128b33b16f 100644
--- a/branches/sca-java-1.x/itest/extended-api/src/main/resources/BasicService.composite
+++ b/sca-java-1.x/trunk/itest/extended-api/src/main/resources/BasicService.composite
diff --git a/branches/sca-java-1.x/itest/extended-api/src/main/resources/MathService.composite b/sca-java-1.x/trunk/itest/extended-api/src/main/resources/MathService.composite
index 8e99d3da60..8e99d3da60 100644
--- a/branches/sca-java-1.x/itest/extended-api/src/main/resources/MathService.composite
+++ b/sca-java-1.x/trunk/itest/extended-api/src/main/resources/MathService.composite
diff --git a/branches/sca-java-1.x/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java b/sca-java-1.x/trunk/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java
index c480235d88..c480235d88 100644
--- a/branches/sca-java-1.x/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java
+++ b/sca-java-1.x/trunk/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java
diff --git a/branches/sca-java-1.x/itest/http-jsonrpc/pom.xml b/sca-java-1.x/trunk/itest/http-jsonrpc/pom.xml
index 6fbf01d8a8..6fbf01d8a8 100644
--- a/branches/sca-java-1.x/itest/http-jsonrpc/pom.xml
+++ b/sca-java-1.x/trunk/itest/http-jsonrpc/pom.xml
diff --git a/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/bean/TestBean.java b/sca-java-1.x/trunk/itest/http-jsonrpc/src/test/java/bean/TestBean.java
index 5117bcf7c9..5117bcf7c9 100644
--- a/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/bean/TestBean.java
+++ b/sca-java-1.x/trunk/itest/http-jsonrpc/src/test/java/bean/TestBean.java
diff --git a/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/echo/Echo.java b/sca-java-1.x/trunk/itest/http-jsonrpc/src/test/java/echo/Echo.java
index 0775a59135..0775a59135 100644
--- a/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/echo/Echo.java
+++ b/sca-java-1.x/trunk/itest/http-jsonrpc/src/test/java/echo/Echo.java
diff --git a/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/echo/EchoBusinessException.java b/sca-java-1.x/trunk/itest/http-jsonrpc/src/test/java/echo/EchoBusinessException.java
index bf8c7d2c8a..bf8c7d2c8a 100644
--- a/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/echo/EchoBusinessException.java
+++ b/sca-java-1.x/trunk/itest/http-jsonrpc/src/test/java/echo/EchoBusinessException.java
diff --git a/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/echo/EchoComponentImpl.java b/sca-java-1.x/trunk/itest/http-jsonrpc/src/test/java/echo/EchoComponentImpl.java
index 87ab8b4b48..87ab8b4b48 100644
--- a/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/echo/EchoComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/http-jsonrpc/src/test/java/echo/EchoComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCDataTypeTestCase.java b/sca-java-1.x/trunk/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCDataTypeTestCase.java
index b842f9b1e5..b842f9b1e5 100644
--- a/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCDataTypeTestCase.java
+++ b/sca-java-1.x/trunk/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCDataTypeTestCase.java
diff --git a/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCExceptionTestCase.java b/sca-java-1.x/trunk/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCExceptionTestCase.java
index 159ae0e65e..159ae0e65e 100644
--- a/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCExceptionTestCase.java
+++ b/sca-java-1.x/trunk/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCExceptionTestCase.java
diff --git a/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java b/sca-java-1.x/trunk/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java
index e04e210596..e04e210596 100644
--- a/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java
+++ b/sca-java-1.x/trunk/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java
diff --git a/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCSmdTestCase.java b/sca-java-1.x/trunk/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCSmdTestCase.java
index f142f53223..f142f53223 100644
--- a/branches/sca-java-1.x/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCSmdTestCase.java
+++ b/sca-java-1.x/trunk/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCSmdTestCase.java
diff --git a/branches/sca-java-1.x/itest/http-jsonrpc/src/test/resources/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCBinding.composite b/sca-java-1.x/trunk/itest/http-jsonrpc/src/test/resources/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCBinding.composite
index 07eb4907f6..07eb4907f6 100644
--- a/branches/sca-java-1.x/itest/http-jsonrpc/src/test/resources/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCBinding.composite
+++ b/sca-java-1.x/trunk/itest/http-jsonrpc/src/test/resources/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCBinding.composite
diff --git a/branches/sca-java-1.x/itest/implementation-jee-external-ear/pom.xml b/sca-java-1.x/trunk/itest/implementation-jee-external-ear/pom.xml
index 0123d14906..0123d14906 100644
--- a/branches/sca-java-1.x/itest/implementation-jee-external-ear/pom.xml
+++ b/sca-java-1.x/trunk/itest/implementation-jee-external-ear/pom.xml
diff --git a/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/trunk/itest/implementation-jee-external-ear/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index 76fa697c6a..76fa697c6a 100644
--- a/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-1.x/trunk/itest/implementation-jee-external-ear/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/trunk/itest/implementation-jee-external-ear/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index eb0811dcc6..eb0811dcc6 100644
--- a/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/trunk/itest/implementation-jee-external-ear/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/main/resources/test.composite b/sca-java-1.x/trunk/itest/implementation-jee-external-ear/src/main/resources/test.composite
index 38902f1f1d..38902f1f1d 100644
--- a/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/main/resources/test.composite
+++ b/sca-java-1.x/trunk/itest/implementation-jee-external-ear/src/main/resources/test.composite
diff --git a/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/test/java/itest/Helloworld.java b/sca-java-1.x/trunk/itest/implementation-jee-external-ear/src/test/java/itest/Helloworld.java
index c1eae6a64d..c1eae6a64d 100644
--- a/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/test/java/itest/Helloworld.java
+++ b/sca-java-1.x/trunk/itest/implementation-jee-external-ear/src/test/java/itest/Helloworld.java
diff --git a/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/test/java/itest/JeeTestCase.java b/sca-java-1.x/trunk/itest/implementation-jee-external-ear/src/test/java/itest/JeeTestCase.java
index 765e6a3f18..765e6a3f18 100644
--- a/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/test/java/itest/JeeTestCase.java
+++ b/sca-java-1.x/trunk/itest/implementation-jee-external-ear/src/test/java/itest/JeeTestCase.java
diff --git a/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/test/java/itest/MockImplementationProviderFactory.java b/sca-java-1.x/trunk/itest/implementation-jee-external-ear/src/test/java/itest/MockImplementationProviderFactory.java
index 7f7cff8810..7f7cff8810 100644
--- a/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/test/java/itest/MockImplementationProviderFactory.java
+++ b/sca-java-1.x/trunk/itest/implementation-jee-external-ear/src/test/java/itest/MockImplementationProviderFactory.java
diff --git a/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/test/java/itest/SomeCustomModelResolver.java b/sca-java-1.x/trunk/itest/implementation-jee-external-ear/src/test/java/itest/SomeCustomModelResolver.java
index b534297148..b534297148 100644
--- a/branches/sca-java-1.x/itest/implementation-jee-external-ear/src/test/java/itest/SomeCustomModelResolver.java
+++ b/sca-java-1.x/trunk/itest/implementation-jee-external-ear/src/test/java/itest/SomeCustomModelResolver.java
diff --git a/branches/sca-java-1.x/itest/interfaces/pom.xml b/sca-java-1.x/trunk/itest/interfaces/pom.xml
index 290526f8df..290526f8df 100644
--- a/branches/sca-java-1.x/itest/interfaces/pom.xml
+++ b/sca-java-1.x/trunk/itest/interfaces/pom.xml
diff --git a/branches/sca-java-1.x/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java b/sca-java-1.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
index 5bc872ef83..5bc872ef83 100644
--- a/branches/sca-java-1.x/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
+++ b/sca-java-1.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
diff --git a/branches/sca-java-1.x/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java b/sca-java-1.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
index 7bfcf5de11..7bfcf5de11 100644
--- a/branches/sca-java-1.x/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
+++ b/sca-java-1.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
diff --git a/branches/sca-java-1.x/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java b/sca-java-1.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
index d4f7694e8f..d4f7694e8f 100644
--- a/branches/sca-java-1.x/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java b/sca-java-1.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
index 4772303fab..4772303fab 100644
--- a/branches/sca-java-1.x/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
+++ b/sca-java-1.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
diff --git a/branches/sca-java-1.x/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java b/sca-java-1.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
index e100636b23..e100636b23 100644
--- a/branches/sca-java-1.x/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java b/sca-java-1.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
index 0bc8d10904..0bc8d10904 100644
--- a/branches/sca-java-1.x/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
+++ b/sca-java-1.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
diff --git a/branches/sca-java-1.x/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java b/sca-java-1.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
index e2b70313ed..e2b70313ed 100644
--- a/branches/sca-java-1.x/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
+++ b/sca-java-1.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
diff --git a/branches/sca-java-1.x/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java b/sca-java-1.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
index dd591eabeb..dd591eabeb 100644
--- a/branches/sca-java-1.x/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
+++ b/sca-java-1.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
diff --git a/branches/sca-java-1.x/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java b/sca-java-1.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
index d4731f35d3..d4731f35d3 100644
--- a/branches/sca-java-1.x/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java b/sca-java-1.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
index 6c40db0e70..6c40db0e70 100644
--- a/branches/sca-java-1.x/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
+++ b/sca-java-1.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
diff --git a/branches/sca-java-1.x/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java b/sca-java-1.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
index 3804d31902..3804d31902 100644
--- a/branches/sca-java-1.x/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/interfaces/src/main/resources/InterfacesTest.composite b/sca-java-1.x/trunk/itest/interfaces/src/main/resources/InterfacesTest.composite
index 0361d8c83c..0361d8c83c 100644
--- a/branches/sca-java-1.x/itest/interfaces/src/main/resources/InterfacesTest.composite
+++ b/sca-java-1.x/trunk/itest/interfaces/src/main/resources/InterfacesTest.composite
diff --git a/branches/sca-java-1.x/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java b/sca-java-1.x/trunk/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
index 013cdd4f15..013cdd4f15 100644
--- a/branches/sca-java-1.x/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
+++ b/sca-java-1.x/trunk/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
diff --git a/branches/sca-java-1.x/itest/interop-soap-client/pom.xml b/sca-java-1.x/trunk/itest/interop-soap-client/pom.xml
index a5db757e3c..a5db757e3c 100644
--- a/branches/sca-java-1.x/itest/interop-soap-client/pom.xml
+++ b/sca-java-1.x/trunk/itest/interop-soap-client/pom.xml
diff --git a/branches/sca-java-1.x/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java b/sca-java-1.x/trunk/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java
index ffffb96686..ffffb96686 100644
--- a/branches/sca-java-1.x/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/interop-soap-client/src/main/resources/default.composite b/sca-java-1.x/trunk/itest/interop-soap-client/src/main/resources/default.composite
index 7fd5cc0d65..7fd5cc0d65 100644
--- a/branches/sca-java-1.x/itest/interop-soap-client/src/main/resources/default.composite
+++ b/sca-java-1.x/trunk/itest/interop-soap-client/src/main/resources/default.composite
diff --git a/branches/sca-java-1.x/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl b/sca-java-1.x/trunk/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl
index 90d8a754b4..90d8a754b4 100644
--- a/branches/sca-java-1.x/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl
+++ b/sca-java-1.x/trunk/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl
diff --git a/branches/sca-java-1.x/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java b/sca-java-1.x/trunk/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java
index dc1ba48580..dc1ba48580 100644
--- a/branches/sca-java-1.x/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java
+++ b/sca-java-1.x/trunk/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java
diff --git a/branches/sca-java-1.x/itest/interop-soap-round2-client/pom.xml b/sca-java-1.x/trunk/itest/interop-soap-round2-client/pom.xml
index c4873f848b..c4873f848b 100644
--- a/branches/sca-java-1.x/itest/interop-soap-round2-client/pom.xml
+++ b/sca-java-1.x/trunk/itest/interop-soap-round2-client/pom.xml
diff --git a/branches/sca-java-1.x/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java b/sca-java-1.x/trunk/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java
index ca3031c646..ca3031c646 100644
--- a/branches/sca-java-1.x/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java
+++ b/sca-java-1.x/trunk/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java
diff --git a/branches/sca-java-1.x/itest/interop-soap-round2-client/src/main/resources/default.composite b/sca-java-1.x/trunk/itest/interop-soap-round2-client/src/main/resources/default.composite
index 9bde77ef37..9bde77ef37 100644
--- a/branches/sca-java-1.x/itest/interop-soap-round2-client/src/main/resources/default.composite
+++ b/sca-java-1.x/trunk/itest/interop-soap-round2-client/src/main/resources/default.composite
diff --git a/branches/sca-java-1.x/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl b/sca-java-1.x/trunk/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl
index e08039cedb..e08039cedb 100644
--- a/branches/sca-java-1.x/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl
+++ b/sca-java-1.x/trunk/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl
diff --git a/branches/sca-java-1.x/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java b/sca-java-1.x/trunk/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java
index bb379c89cd..bb379c89cd 100644
--- a/branches/sca-java-1.x/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java
+++ b/sca-java-1.x/trunk/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java
diff --git a/branches/sca-java-1.x/itest/interop-soap-service/pom.xml b/sca-java-1.x/trunk/itest/interop-soap-service/pom.xml
index eb07efcc0f..eb07efcc0f 100644
--- a/branches/sca-java-1.x/itest/interop-soap-service/pom.xml
+++ b/sca-java-1.x/trunk/itest/interop-soap-service/pom.xml
diff --git a/branches/sca-java-1.x/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java b/sca-java-1.x/trunk/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java
index c34941f43e..c34941f43e 100644
--- a/branches/sca-java-1.x/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl b/sca-java-1.x/trunk/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl
index 820c26ca34..820c26ca34 100644
--- a/branches/sca-java-1.x/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl
+++ b/sca-java-1.x/trunk/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl
diff --git a/branches/sca-java-1.x/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl b/sca-java-1.x/trunk/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl
index 3fbc73616e..3fbc73616e 100644
--- a/branches/sca-java-1.x/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl
+++ b/sca-java-1.x/trunk/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl
diff --git a/branches/sca-java-1.x/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/trunk/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml
index 8cf95fb789..8cf95fb789 100644
--- a/branches/sca-java-1.x/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/trunk/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.x/itest/interop-soap-service/t.bat b/sca-java-1.x/trunk/itest/interop-soap-service/t.bat
index 0f83dedc37..0f83dedc37 100755
--- a/branches/sca-java-1.x/itest/interop-soap-service/t.bat
+++ b/sca-java-1.x/trunk/itest/interop-soap-service/t.bat
diff --git a/branches/sca-java-1.x/itest/java-init-exceptions/pom.xml b/sca-java-1.x/trunk/itest/java-init-exceptions/pom.xml
index 2e18163110..2e18163110 100644
--- a/branches/sca-java-1.x/itest/java-init-exceptions/pom.xml
+++ b/sca-java-1.x/trunk/itest/java-init-exceptions/pom.xml
diff --git a/branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/ConstructorException.java b/sca-java-1.x/trunk/itest/java-init-exceptions/src/main/java/itest/ConstructorException.java
index a91904e9a8..a91904e9a8 100644
--- a/branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/ConstructorException.java
+++ b/sca-java-1.x/trunk/itest/java-init-exceptions/src/main/java/itest/ConstructorException.java
diff --git a/branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/InitCompositeScopeException.java b/sca-java-1.x/trunk/itest/java-init-exceptions/src/main/java/itest/InitCompositeScopeException.java
index 73017ec72b..73017ec72b 100644
--- a/branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/InitCompositeScopeException.java
+++ b/sca-java-1.x/trunk/itest/java-init-exceptions/src/main/java/itest/InitCompositeScopeException.java
diff --git a/branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/InitRequestScopeException.java b/sca-java-1.x/trunk/itest/java-init-exceptions/src/main/java/itest/InitRequestScopeException.java
index b29f52645e..b29f52645e 100644
--- a/branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/InitRequestScopeException.java
+++ b/sca-java-1.x/trunk/itest/java-init-exceptions/src/main/java/itest/InitRequestScopeException.java
diff --git a/branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/InitStatelessScopeException.java b/sca-java-1.x/trunk/itest/java-init-exceptions/src/main/java/itest/InitStatelessScopeException.java
index 5a898a501d..5a898a501d 100644
--- a/branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/InitStatelessScopeException.java
+++ b/sca-java-1.x/trunk/itest/java-init-exceptions/src/main/java/itest/InitStatelessScopeException.java
diff --git a/branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/OkImpl.java b/sca-java-1.x/trunk/itest/java-init-exceptions/src/main/java/itest/OkImpl.java
index 134bbba0d3..134bbba0d3 100644
--- a/branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/OkImpl.java
+++ b/sca-java-1.x/trunk/itest/java-init-exceptions/src/main/java/itest/OkImpl.java
diff --git a/branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/Service.java b/sca-java-1.x/trunk/itest/java-init-exceptions/src/main/java/itest/Service.java
index f6f292c4c8..f6f292c4c8 100644
--- a/branches/sca-java-1.x/itest/java-init-exceptions/src/main/java/itest/Service.java
+++ b/sca-java-1.x/trunk/itest/java-init-exceptions/src/main/java/itest/Service.java
diff --git a/branches/sca-java-1.x/itest/java-init-exceptions/src/main/resources/test.composite b/sca-java-1.x/trunk/itest/java-init-exceptions/src/main/resources/test.composite
index 3a1a897def..3a1a897def 100644
--- a/branches/sca-java-1.x/itest/java-init-exceptions/src/main/resources/test.composite
+++ b/sca-java-1.x/trunk/itest/java-init-exceptions/src/main/resources/test.composite
diff --git a/branches/sca-java-1.x/itest/java-init-exceptions/src/test/java/itest/InitTestCase.java b/sca-java-1.x/trunk/itest/java-init-exceptions/src/test/java/itest/InitTestCase.java
index f6a1da5b79..f6a1da5b79 100644
--- a/branches/sca-java-1.x/itest/java-init-exceptions/src/test/java/itest/InitTestCase.java
+++ b/sca-java-1.x/trunk/itest/java-init-exceptions/src/test/java/itest/InitTestCase.java
diff --git a/branches/sca-java-1.x/itest/jaxws/pom.xml b/sca-java-1.x/trunk/itest/jaxws/pom.xml
index ba3e3f7cfe..ba3e3f7cfe 100644
--- a/branches/sca-java-1.x/itest/jaxws/pom.xml
+++ b/sca-java-1.x/trunk/itest/jaxws/pom.xml
diff --git a/branches/sca-java-1.x/itest/jaxws/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java b/sca-java-1.x/trunk/itest/jaxws/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
index 3b557d693a..3b557d693a 100644
--- a/branches/sca-java-1.x/itest/jaxws/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
+++ b/sca-java-1.x/trunk/itest/jaxws/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
diff --git a/branches/sca-java-1.x/itest/jaxws/src/main/resources/Payment.wsdl b/sca-java-1.x/trunk/itest/jaxws/src/main/resources/Payment.wsdl
index 3885764899..3885764899 100644
--- a/branches/sca-java-1.x/itest/jaxws/src/main/resources/Payment.wsdl
+++ b/sca-java-1.x/trunk/itest/jaxws/src/main/resources/Payment.wsdl
diff --git a/branches/sca-java-1.x/itest/jaxws/src/main/resources/payment.composite b/sca-java-1.x/trunk/itest/jaxws/src/main/resources/payment.composite
index 77a956a3c6..77a956a3c6 100644
--- a/branches/sca-java-1.x/itest/jaxws/src/main/resources/payment.composite
+++ b/sca-java-1.x/trunk/itest/jaxws/src/main/resources/payment.composite
diff --git a/branches/sca-java-1.x/itest/jaxws/src/test/java/scatours/payment/PaymentTestCase.java b/sca-java-1.x/trunk/itest/jaxws/src/test/java/scatours/payment/PaymentTestCase.java
index 610e20b456..610e20b456 100644
--- a/branches/sca-java-1.x/itest/jaxws/src/test/java/scatours/payment/PaymentTestCase.java
+++ b/sca-java-1.x/trunk/itest/jaxws/src/test/java/scatours/payment/PaymentTestCase.java
diff --git a/branches/sca-java-1.x/itest/jms-args/pom.xml b/sca-java-1.x/trunk/itest/jms-args/pom.xml
index ed3bafe32f..ed3bafe32f 100644
--- a/branches/sca-java-1.x/itest/jms-args/pom.xml
+++ b/sca-java-1.x/trunk/itest/jms-args/pom.xml
diff --git a/branches/sca-java-1.x/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-1.x/trunk/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
index 51ce5f4f24..51ce5f4f24 100644
--- a/branches/sca-java-1.x/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java b/sca-java-1.x/trunk/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
index 487e5f2cbb..487e5f2cbb 100644
--- a/branches/sca-java-1.x/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
+++ b/sca-java-1.x/trunk/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
diff --git a/branches/sca-java-1.x/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java b/sca-java-1.x/trunk/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
index 18324d5d1d..18324d5d1d 100644
--- a/branches/sca-java-1.x/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-args/src/main/resources/jndi.properties b/sca-java-1.x/trunk/itest/jms-args/src/main/resources/jndi.properties
index bb431a592b..bb431a592b 100644
--- a/branches/sca-java-1.x/itest/jms-args/src/main/resources/jndi.properties
+++ b/sca-java-1.x/trunk/itest/jms-args/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.x/itest/jms-args/src/main/resources/selectors/selectors.composite b/sca-java-1.x/trunk/itest/jms-args/src/main/resources/selectors/selectors.composite
index 74c352934f..74c352934f 100644
--- a/branches/sca-java-1.x/itest/jms-args/src/main/resources/selectors/selectors.composite
+++ b/sca-java-1.x/trunk/itest/jms-args/src/main/resources/selectors/selectors.composite
diff --git a/branches/sca-java-1.x/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java b/sca-java-1.x/trunk/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
index 228366d596..228366d596 100644
--- a/branches/sca-java-1.x/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
+++ b/sca-java-1.x/trunk/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
diff --git a/branches/sca-java-1.x/itest/jms-callbacks/pom.xml b/sca-java-1.x/trunk/itest/jms-callbacks/pom.xml
index bf5e35e747..bf5e35e747 100644
--- a/branches/sca-java-1.x/itest/jms-callbacks/pom.xml
+++ b/sca-java-1.x/trunk/itest/jms-callbacks/pom.xml
diff --git a/branches/sca-java-1.x/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/sca-java-1.x/trunk/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
index d4cd5df431..d4cd5df431 100644
--- a/branches/sca-java-1.x/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
+++ b/sca-java-1.x/trunk/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
diff --git a/branches/sca-java-1.x/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java b/sca-java-1.x/trunk/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
index 9d75685a8a..9d75685a8a 100644
--- a/branches/sca-java-1.x/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java b/sca-java-1.x/trunk/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
index 9c2c657b55..9c2c657b55 100644
--- a/branches/sca-java-1.x/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
+++ b/sca-java-1.x/trunk/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
diff --git a/branches/sca-java-1.x/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java b/sca-java-1.x/trunk/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
index 5697d819c7..5697d819c7 100644
--- a/branches/sca-java-1.x/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
+++ b/sca-java-1.x/trunk/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
diff --git a/branches/sca-java-1.x/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java b/sca-java-1.x/trunk/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
index b15b40c8a6..b15b40c8a6 100644
--- a/branches/sca-java-1.x/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-callbacks/src/main/resources/jndi.properties b/sca-java-1.x/trunk/itest/jms-callbacks/src/main/resources/jndi.properties
index 608fe747f5..608fe747f5 100644
--- a/branches/sca-java-1.x/itest/jms-callbacks/src/main/resources/jndi.properties
+++ b/sca-java-1.x/trunk/itest/jms-callbacks/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.x/itest/jms-callbacks/src/main/resources/simple/client.composite b/sca-java-1.x/trunk/itest/jms-callbacks/src/main/resources/simple/client.composite
index 93d8acb65b..93d8acb65b 100644
--- a/branches/sca-java-1.x/itest/jms-callbacks/src/main/resources/simple/client.composite
+++ b/sca-java-1.x/trunk/itest/jms-callbacks/src/main/resources/simple/client.composite
diff --git a/branches/sca-java-1.x/itest/jms-callbacks/src/main/resources/simple/tempq.composite b/sca-java-1.x/trunk/itest/jms-callbacks/src/main/resources/simple/tempq.composite
index 636e951d03..636e951d03 100644
--- a/branches/sca-java-1.x/itest/jms-callbacks/src/main/resources/simple/tempq.composite
+++ b/sca-java-1.x/trunk/itest/jms-callbacks/src/main/resources/simple/tempq.composite
diff --git a/branches/sca-java-1.x/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java b/sca-java-1.x/trunk/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
index cb9acb1bc1..cb9acb1bc1 100644
--- a/branches/sca-java-1.x/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
+++ b/sca-java-1.x/trunk/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
diff --git a/branches/sca-java-1.x/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java b/sca-java-1.x/trunk/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
index 9f450574df..9f450574df 100644
--- a/branches/sca-java-1.x/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
+++ b/sca-java-1.x/trunk/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
diff --git a/branches/sca-java-1.x/itest/jms-definitions/pom.xml b/sca-java-1.x/trunk/itest/jms-definitions/pom.xml
index 6077aa000f..6077aa000f 100644
--- a/branches/sca-java-1.x/itest/jms-definitions/pom.xml
+++ b/sca-java-1.x/trunk/itest/jms-definitions/pom.xml
diff --git a/branches/sca-java-1.x/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-1.x/trunk/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
index 4d00d2df0d..4d00d2df0d 100644
--- a/branches/sca-java-1.x/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-1.x/trunk/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index 377f227ceb..377f227ceb 100644
--- a/branches/sca-java-1.x/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-1.x/trunk/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/branches/sca-java-1.x/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-1.x/trunk/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index 6b763874df..6b763874df 100644
--- a/branches/sca-java-1.x/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-definitions/src/main/resources/definitions.xml b/sca-java-1.x/trunk/itest/jms-definitions/src/main/resources/definitions.xml
index 07b9f4aaa8..07b9f4aaa8 100644
--- a/branches/sca-java-1.x/itest/jms-definitions/src/main/resources/definitions.xml
+++ b/sca-java-1.x/trunk/itest/jms-definitions/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.x/itest/jms-definitions/src/main/resources/definitions/definitions.composite b/sca-java-1.x/trunk/itest/jms-definitions/src/main/resources/definitions/definitions.composite
index 99e4e5016e..99e4e5016e 100644
--- a/branches/sca-java-1.x/itest/jms-definitions/src/main/resources/definitions/definitions.composite
+++ b/sca-java-1.x/trunk/itest/jms-definitions/src/main/resources/definitions/definitions.composite
diff --git a/branches/sca-java-1.x/itest/jms-definitions/src/main/resources/jndi.properties b/sca-java-1.x/trunk/itest/jms-definitions/src/main/resources/jndi.properties
index f7555e0beb..f7555e0beb 100644
--- a/branches/sca-java-1.x/itest/jms-definitions/src/main/resources/jndi.properties
+++ b/sca-java-1.x/trunk/itest/jms-definitions/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.x/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java b/sca-java-1.x/trunk/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
index 9de3bff7c3..9de3bff7c3 100644
--- a/branches/sca-java-1.x/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
+++ b/sca-java-1.x/trunk/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
diff --git a/branches/sca-java-1.x/itest/jms-format/pom.xml b/sca-java-1.x/trunk/itest/jms-format/pom.xml
index f625960eb8..f625960eb8 100644
--- a/branches/sca-java-1.x/itest/jms-format/pom.xml
+++ b/sca-java-1.x/trunk/itest/jms-format/pom.xml
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
index e8a7102afd..e8a7102afd 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index b1f62c1422..b1f62c1422 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index efed4842ea..efed4842ea 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index 5ae7032993..5ae7032993 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index 803be4cbe6..803be4cbe6 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
index 5fad413ebe..5fad413ebe 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java
index 251fa58cfe..251fa58cfe 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
index dd58c9554e..dd58c9554e 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
index 02a3d944f7..02a3d944f7 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
index 9c2198e6ca..9c2198e6ca 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java
index 75e07564ce..75e07564ce 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java
index ee02ac5f39..ee02ac5f39 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java
index 8744a57daf..8744a57daf 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
index f465767056..f465767056 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
index 545fcc894d..545fcc894d 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
index aca727a9db..aca727a9db 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java
index c28347bf8e..c28347bf8e 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
index 948732adb4..948732adb4 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
index ed697f8a38..ed697f8a38 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
index 574188d466..574188d466 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
index 2956df755b..2956df755b 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
index 39af400f6a..39af400f6a 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
index 81ea3edffb..81ea3edffb 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java
index da82b2fd5c..da82b2fd5c 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
index e89598cb96..e89598cb96 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
index bb853673e8..bb853673e8 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
index 8976887daa..8976887daa 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
index 0c76c01362..0c76c01362 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
index 35c383ace9..35c383ace9 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java
index e2732a295c..e2732a295c 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java
index 304e145161..304e145161 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java
index 2587a51704..2587a51704 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java
index f46f3e2d04..f46f3e2d04 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java
index 988222c296..988222c296 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java
index 6015ab8930..6015ab8930 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java
index c45e3899e0..c45e3899e0 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java
index e5cd9db281..e5cd9db281 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
index c54e195178..c54e195178 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
index a98f589b9a..a98f589b9a 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
index 7965388013..7965388013 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
index 8f9c3564f8..8f9c3564f8 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java
index 732b49ea6c..732b49ea6c 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java
index 65323a3d63..65323a3d63 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java
index 2f2c53b41d..2f2c53b41d 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/Person.java b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/Person.java
index ad6fe0b043..ad6fe0b043 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/Person.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/Person.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/jms-format/src/main/resources/META-INF/sca-contribution.xml
index f2564234fd..f2564234fd 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmsbytes/helloworld.composite b/sca-java-1.x/trunk/itest/jms-format/src/main/resources/jmsbytes/helloworld.composite
index ea6ed6c464..ea6ed6c464 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmsbytes/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/resources/jmsbytes/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmsbytesxml/helloworld.composite b/sca-java-1.x/trunk/itest/jms-format/src/main/resources/jmsbytesxml/helloworld.composite
index fff5656c98..fff5656c98 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmsbytesxml/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/resources/jmsbytesxml/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmsdefault/helloworld.composite b/sca-java-1.x/trunk/itest/jms-format/src/main/resources/jmsdefault/helloworld.composite
index 2c54bf8bc5..2c54bf8bc5 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmsdefault/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/resources/jmsdefault/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmsdefault/helloworld.wsdl b/sca-java-1.x/trunk/itest/jms-format/src/main/resources/jmsdefault/helloworld.wsdl
index 30372cc02f..30372cc02f 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmsdefault/helloworld.wsdl
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/resources/jmsdefault/helloworld.wsdl
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmsmessage/helloworld.composite b/sca-java-1.x/trunk/itest/jms-format/src/main/resources/jmsmessage/helloworld.composite
index 6202e947f5..6202e947f5 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmsmessage/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/resources/jmsmessage/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmsmessage/helloworld.wsdl b/sca-java-1.x/trunk/itest/jms-format/src/main/resources/jmsmessage/helloworld.wsdl
index 092c56b31d..092c56b31d 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmsmessage/helloworld.wsdl
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/resources/jmsmessage/helloworld.wsdl
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmsobject/helloworld.composite b/sca-java-1.x/trunk/itest/jms-format/src/main/resources/jmsobject/helloworld.composite
index 3ca541c9fb..3ca541c9fb 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmsobject/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/resources/jmsobject/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmsobject/helloworld.wsdl b/sca-java-1.x/trunk/itest/jms-format/src/main/resources/jmsobject/helloworld.wsdl
index a2af528e9e..a2af528e9e 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmsobject/helloworld.wsdl
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/resources/jmsobject/helloworld.wsdl
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmstext/helloworld.composite b/sca-java-1.x/trunk/itest/jms-format/src/main/resources/jmstext/helloworld.composite
index 5b3e710a51..5b3e710a51 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmstext/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/resources/jmstext/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite b/sca-java-1.x/trunk/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite
index 2d25f2c3f4..2d25f2c3f4 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmstextxml/helloworld.wsdl b/sca-java-1.x/trunk/itest/jms-format/src/main/resources/jmstextxml/helloworld.wsdl
index 30372cc02f..30372cc02f 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmstextxml/helloworld.wsdl
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/resources/jmstextxml/helloworld.wsdl
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite b/sca-java-1.x/trunk/itest/jms-format/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite
index 3f05ac2683..3f05ac2683 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl b/sca-java-1.x/trunk/itest/jms-format/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl
index 30372cc02f..30372cc02f 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/resources/jndi.properties b/sca-java-1.x/trunk/itest/jms-format/src/main/resources/jndi.properties
index 9abdff215d..9abdff215d 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/main/resources/jndi.properties
+++ b/sca-java-1.x/trunk/itest/jms-format/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.x/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java b/sca-java-1.x/trunk/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
index a0429aa59f..a0429aa59f 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java b/sca-java-1.x/trunk/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java
index ec9a1adeb4..ec9a1adeb4 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java b/sca-java-1.x/trunk/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java
index dc2cc13679..dc2cc13679 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java b/sca-java-1.x/trunk/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
index c617a984ef..c617a984ef 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java b/sca-java-1.x/trunk/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java
index 462ebb557e..462ebb557e 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java b/sca-java-1.x/trunk/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java
index d45e6492ce..d45e6492ce 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java b/sca-java-1.x/trunk/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java
index 5d3b0ac9e3..5d3b0ac9e3 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java
diff --git a/branches/sca-java-1.x/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java b/sca-java-1.x/trunk/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
index 5650d06a36..5650d06a36 100644
--- a/branches/sca-java-1.x/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
+++ b/sca-java-1.x/trunk/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
diff --git a/branches/sca-java-1.x/itest/jms-nonscaclient-exceptions/pom.xml b/sca-java-1.x/trunk/itest/jms-nonscaclient-exceptions/pom.xml
index 0caaf0d6e9..0caaf0d6e9 100644
--- a/branches/sca-java-1.x/itest/jms-nonscaclient-exceptions/pom.xml
+++ b/sca-java-1.x/trunk/itest/jms-nonscaclient-exceptions/pom.xml
diff --git a/branches/sca-java-1.x/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java b/sca-java-1.x/trunk/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
index 469882f3b3..469882f3b3 100644
--- a/branches/sca-java-1.x/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
+++ b/sca-java-1.x/trunk/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
diff --git a/branches/sca-java-1.x/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java b/sca-java-1.x/trunk/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
index 19b584950a..19b584950a 100644
--- a/branches/sca-java-1.x/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
+++ b/sca-java-1.x/trunk/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
diff --git a/branches/sca-java-1.x/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java b/sca-java-1.x/trunk/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
index b12e3a562e..b12e3a562e 100644
--- a/branches/sca-java-1.x/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
+++ b/sca-java-1.x/trunk/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
diff --git a/branches/sca-java-1.x/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java b/sca-java-1.x/trunk/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
index b23db73c01..b23db73c01 100644
--- a/branches/sca-java-1.x/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
+++ b/sca-java-1.x/trunk/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
diff --git a/branches/sca-java-1.x/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java b/sca-java-1.x/trunk/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
index cc21afaa60..cc21afaa60 100644
--- a/branches/sca-java-1.x/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
+++ b/sca-java-1.x/trunk/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
diff --git a/branches/sca-java-1.x/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java b/sca-java-1.x/trunk/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
index 866acf1ce1..866acf1ce1 100644
--- a/branches/sca-java-1.x/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-nonscaclient-exceptions/src/main/resources/exceptions/service.composite b/sca-java-1.x/trunk/itest/jms-nonscaclient-exceptions/src/main/resources/exceptions/service.composite
index 0dcbb0687a..0dcbb0687a 100644
--- a/branches/sca-java-1.x/itest/jms-nonscaclient-exceptions/src/main/resources/exceptions/service.composite
+++ b/sca-java-1.x/trunk/itest/jms-nonscaclient-exceptions/src/main/resources/exceptions/service.composite
diff --git a/branches/sca-java-1.x/itest/jms-nonscaclient-exceptions/src/main/resources/jndi.properties b/sca-java-1.x/trunk/itest/jms-nonscaclient-exceptions/src/main/resources/jndi.properties
index 72d5457faf..72d5457faf 100644
--- a/branches/sca-java-1.x/itest/jms-nonscaclient-exceptions/src/main/resources/jndi.properties
+++ b/sca-java-1.x/trunk/itest/jms-nonscaclient-exceptions/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.x/itest/jms-nonscaclient-exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/sca-java-1.x/trunk/itest/jms-nonscaclient-exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
index 1dec4a6f92..1dec4a6f92 100644
--- a/branches/sca-java-1.x/itest/jms-nonscaclient-exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
+++ b/sca-java-1.x/trunk/itest/jms-nonscaclient-exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
diff --git a/branches/sca-java-1.x/itest/jms-noreplyto/pom.xml b/sca-java-1.x/trunk/itest/jms-noreplyto/pom.xml
index fb980d4f0b..fb980d4f0b 100644
--- a/branches/sca-java-1.x/itest/jms-noreplyto/pom.xml
+++ b/sca-java-1.x/trunk/itest/jms-noreplyto/pom.xml
diff --git a/branches/sca-java-1.x/itest/jms-noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-1.x/trunk/itest/jms-noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index 28b281a0c4..28b281a0c4 100644
--- a/branches/sca-java-1.x/itest/jms-noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-1.x/trunk/itest/jms-noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/branches/sca-java-1.x/itest/jms-noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-1.x/trunk/itest/jms-noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 2c6d9d0d17..2c6d9d0d17 100644
--- a/branches/sca-java-1.x/itest/jms-noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-noreplyto/src/main/resources/jndi.properties b/sca-java-1.x/trunk/itest/jms-noreplyto/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/branches/sca-java-1.x/itest/jms-noreplyto/src/main/resources/jndi.properties
+++ b/sca-java-1.x/trunk/itest/jms-noreplyto/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.x/itest/jms-noreplyto/src/main/resources/service.composite b/sca-java-1.x/trunk/itest/jms-noreplyto/src/main/resources/service.composite
index f6cc48fa0f..f6cc48fa0f 100644
--- a/branches/sca-java-1.x/itest/jms-noreplyto/src/main/resources/service.composite
+++ b/sca-java-1.x/trunk/itest/jms-noreplyto/src/main/resources/service.composite
diff --git a/branches/sca-java-1.x/itest/jms-noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java b/sca-java-1.x/trunk/itest/jms-noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java
index 3db0e634be..3db0e634be 100644
--- a/branches/sca-java-1.x/itest/jms-noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java
+++ b/sca-java-1.x/trunk/itest/jms-noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java
diff --git a/branches/sca-java-1.x/itest/jms-nulls/pom.xml b/sca-java-1.x/trunk/itest/jms-nulls/pom.xml
index 96c60fd63f..96c60fd63f 100644
--- a/branches/sca-java-1.x/itest/jms-nulls/pom.xml
+++ b/sca-java-1.x/trunk/itest/jms-nulls/pom.xml
diff --git a/branches/sca-java-1.x/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-1.x/trunk/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
index f7f930f443..f7f930f443 100644
--- a/branches/sca-java-1.x/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java b/sca-java-1.x/trunk/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
index 5c43f02ca4..5c43f02ca4 100644
--- a/branches/sca-java-1.x/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
+++ b/sca-java-1.x/trunk/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
diff --git a/branches/sca-java-1.x/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java b/sca-java-1.x/trunk/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
index 89758becff..89758becff 100644
--- a/branches/sca-java-1.x/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-nulls/src/main/resources/jndi.properties b/sca-java-1.x/trunk/itest/jms-nulls/src/main/resources/jndi.properties
index bb431a592b..bb431a592b 100644
--- a/branches/sca-java-1.x/itest/jms-nulls/src/main/resources/jndi.properties
+++ b/sca-java-1.x/trunk/itest/jms-nulls/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.x/itest/jms-nulls/src/main/resources/nulls.composite b/sca-java-1.x/trunk/itest/jms-nulls/src/main/resources/nulls.composite
index 99717d4c0f..99717d4c0f 100644
--- a/branches/sca-java-1.x/itest/jms-nulls/src/main/resources/nulls.composite
+++ b/sca-java-1.x/trunk/itest/jms-nulls/src/main/resources/nulls.composite
diff --git a/branches/sca-java-1.x/itest/jms-nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java b/sca-java-1.x/trunk/itest/jms-nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java
index e8aa803369..e8aa803369 100644
--- a/branches/sca-java-1.x/itest/jms-nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java
+++ b/sca-java-1.x/trunk/itest/jms-nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java
diff --git a/branches/sca-java-1.x/itest/jms-oneway-nocf/pom.xml b/sca-java-1.x/trunk/itest/jms-oneway-nocf/pom.xml
index add122c3ca..add122c3ca 100644
--- a/branches/sca-java-1.x/itest/jms-oneway-nocf/pom.xml
+++ b/sca-java-1.x/trunk/itest/jms-oneway-nocf/pom.xml
diff --git a/branches/sca-java-1.x/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-1.x/trunk/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
index 4d00d2df0d..4d00d2df0d 100644
--- a/branches/sca-java-1.x/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-1.x/trunk/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index 377f227ceb..377f227ceb 100644
--- a/branches/sca-java-1.x/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-1.x/trunk/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/branches/sca-java-1.x/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-1.x/trunk/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index 0036391696..0036391696 100644
--- a/branches/sca-java-1.x/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-oneway-nocf/src/main/resources/jndi.properties b/sca-java-1.x/trunk/itest/jms-oneway-nocf/src/main/resources/jndi.properties
index 8934614a8a..8934614a8a 100644
--- a/branches/sca-java-1.x/itest/jms-oneway-nocf/src/main/resources/jndi.properties
+++ b/sca-java-1.x/trunk/itest/jms-oneway-nocf/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.x/itest/jms-oneway-nocf/src/main/resources/oneway/OneWayClient.composite b/sca-java-1.x/trunk/itest/jms-oneway-nocf/src/main/resources/oneway/OneWayClient.composite
index ec7b19ff98..ec7b19ff98 100644
--- a/branches/sca-java-1.x/itest/jms-oneway-nocf/src/main/resources/oneway/OneWayClient.composite
+++ b/sca-java-1.x/trunk/itest/jms-oneway-nocf/src/main/resources/oneway/OneWayClient.composite
diff --git a/branches/sca-java-1.x/itest/jms-oneway-nocf/src/main/resources/oneway/OneWayService.composite b/sca-java-1.x/trunk/itest/jms-oneway-nocf/src/main/resources/oneway/OneWayService.composite
index dff7d0c77f..dff7d0c77f 100644
--- a/branches/sca-java-1.x/itest/jms-oneway-nocf/src/main/resources/oneway/OneWayService.composite
+++ b/sca-java-1.x/trunk/itest/jms-oneway-nocf/src/main/resources/oneway/OneWayService.composite
diff --git a/branches/sca-java-1.x/itest/jms-oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java b/sca-java-1.x/trunk/itest/jms-oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
index adc7813bee..adc7813bee 100644
--- a/branches/sca-java-1.x/itest/jms-oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
+++ b/sca-java-1.x/trunk/itest/jms-oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
diff --git a/branches/sca-java-1.x/itest/jms-responsecf/pom.xml b/sca-java-1.x/trunk/itest/jms-responsecf/pom.xml
index a25c83066e..a25c83066e 100644
--- a/branches/sca-java-1.x/itest/jms-responsecf/pom.xml
+++ b/sca-java-1.x/trunk/itest/jms-responsecf/pom.xml
diff --git a/branches/sca-java-1.x/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-1.x/trunk/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 1f310e0685..1f310e0685 100644
--- a/branches/sca-java-1.x/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-1.x/trunk/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index 28b281a0c4..28b281a0c4 100644
--- a/branches/sca-java-1.x/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-1.x/trunk/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/branches/sca-java-1.x/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-1.x/trunk/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 2c6d9d0d17..2c6d9d0d17 100644
--- a/branches/sca-java-1.x/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-responsecf/src/main/resources/cf/client.composite b/sca-java-1.x/trunk/itest/jms-responsecf/src/main/resources/cf/client.composite
index 3e16e794cb..3e16e794cb 100644
--- a/branches/sca-java-1.x/itest/jms-responsecf/src/main/resources/cf/client.composite
+++ b/sca-java-1.x/trunk/itest/jms-responsecf/src/main/resources/cf/client.composite
diff --git a/branches/sca-java-1.x/itest/jms-responsecf/src/main/resources/cf/service.composite b/sca-java-1.x/trunk/itest/jms-responsecf/src/main/resources/cf/service.composite
index 9a13b0cb0e..9a13b0cb0e 100644
--- a/branches/sca-java-1.x/itest/jms-responsecf/src/main/resources/cf/service.composite
+++ b/sca-java-1.x/trunk/itest/jms-responsecf/src/main/resources/cf/service.composite
diff --git a/branches/sca-java-1.x/itest/jms-responsecf/src/main/resources/jndi.properties b/sca-java-1.x/trunk/itest/jms-responsecf/src/main/resources/jndi.properties
index a41e42950e..a41e42950e 100644
--- a/branches/sca-java-1.x/itest/jms-responsecf/src/main/resources/jndi.properties
+++ b/sca-java-1.x/trunk/itest/jms-responsecf/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.x/itest/jms-responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java b/sca-java-1.x/trunk/itest/jms-responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java
index fd7b167963..fd7b167963 100644
--- a/branches/sca-java-1.x/itest/jms-responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java
+++ b/sca-java-1.x/trunk/itest/jms-responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java
diff --git a/branches/sca-java-1.x/itest/jms-selectors/pom.xml b/sca-java-1.x/trunk/itest/jms-selectors/pom.xml
index 95d9681da7..95d9681da7 100644
--- a/branches/sca-java-1.x/itest/jms-selectors/pom.xml
+++ b/sca-java-1.x/trunk/itest/jms-selectors/pom.xml
diff --git a/branches/sca-java-1.x/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-1.x/trunk/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
index 0ad6440593..0ad6440593 100644
--- a/branches/sca-java-1.x/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java b/sca-java-1.x/trunk/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
index f26a3ce68b..f26a3ce68b 100644
--- a/branches/sca-java-1.x/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
+++ b/sca-java-1.x/trunk/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
diff --git a/branches/sca-java-1.x/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java b/sca-java-1.x/trunk/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
index fb53c877e6..fb53c877e6 100644
--- a/branches/sca-java-1.x/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
+++ b/sca-java-1.x/trunk/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
diff --git a/branches/sca-java-1.x/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java b/sca-java-1.x/trunk/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
index 1bbaf5d6f4..1bbaf5d6f4 100644
--- a/branches/sca-java-1.x/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
+++ b/sca-java-1.x/trunk/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
diff --git a/branches/sca-java-1.x/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java b/sca-java-1.x/trunk/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
index 4bdc4edcb5..4bdc4edcb5 100644
--- a/branches/sca-java-1.x/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
+++ b/sca-java-1.x/trunk/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
diff --git a/branches/sca-java-1.x/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java b/sca-java-1.x/trunk/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java
index 2b2c5d571a..2b2c5d571a 100644
--- a/branches/sca-java-1.x/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java
+++ b/sca-java-1.x/trunk/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java
diff --git a/branches/sca-java-1.x/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java b/sca-java-1.x/trunk/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java
index 9ab8221417..9ab8221417 100644
--- a/branches/sca-java-1.x/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java b/sca-java-1.x/trunk/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java
index c7bdba492f..c7bdba492f 100644
--- a/branches/sca-java-1.x/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java
+++ b/sca-java-1.x/trunk/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java
diff --git a/branches/sca-java-1.x/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldServiceImpl.java b/sca-java-1.x/trunk/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldServiceImpl.java
index b2df9137c8..b2df9137c8 100644
--- a/branches/sca-java-1.x/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java b/sca-java-1.x/trunk/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java
index 573ae8d068..573ae8d068 100644
--- a/branches/sca-java-1.x/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java
+++ b/sca-java-1.x/trunk/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java
diff --git a/branches/sca-java-1.x/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java b/sca-java-1.x/trunk/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java
index 744612bc14..744612bc14 100644
--- a/branches/sca-java-1.x/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java b/sca-java-1.x/trunk/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java
index 7dca243bdf..7dca243bdf 100644
--- a/branches/sca-java-1.x/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java
+++ b/sca-java-1.x/trunk/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java
diff --git a/branches/sca-java-1.x/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldServiceImpl.java b/sca-java-1.x/trunk/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldServiceImpl.java
index 724de6ff7c..724de6ff7c 100644
--- a/branches/sca-java-1.x/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-selectors/src/main/resources/jmsdefault/helloworld.composite b/sca-java-1.x/trunk/itest/jms-selectors/src/main/resources/jmsdefault/helloworld.composite
index 8f6994b843..8f6994b843 100644
--- a/branches/sca-java-1.x/itest/jms-selectors/src/main/resources/jmsdefault/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/jms-selectors/src/main/resources/jmsdefault/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/jms-selectors/src/main/resources/jmsuserprop/helloworld.composite b/sca-java-1.x/trunk/itest/jms-selectors/src/main/resources/jmsuserprop/helloworld.composite
index 1aa5444e17..1aa5444e17 100644
--- a/branches/sca-java-1.x/itest/jms-selectors/src/main/resources/jmsuserprop/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/jms-selectors/src/main/resources/jmsuserprop/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/jms-selectors/src/main/resources/jndi.properties b/sca-java-1.x/trunk/itest/jms-selectors/src/main/resources/jndi.properties
index bb431a592b..bb431a592b 100644
--- a/branches/sca-java-1.x/itest/jms-selectors/src/main/resources/jndi.properties
+++ b/sca-java-1.x/trunk/itest/jms-selectors/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.x/itest/jms-selectors/src/main/resources/selectors/selectors.composite b/sca-java-1.x/trunk/itest/jms-selectors/src/main/resources/selectors/selectors.composite
index 83fb50531b..83fb50531b 100644
--- a/branches/sca-java-1.x/itest/jms-selectors/src/main/resources/selectors/selectors.composite
+++ b/sca-java-1.x/trunk/itest/jms-selectors/src/main/resources/selectors/selectors.composite
diff --git a/branches/sca-java-1.x/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java b/sca-java-1.x/trunk/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java
index 46ca6b9844..46ca6b9844 100644
--- a/branches/sca-java-1.x/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java
+++ b/sca-java-1.x/trunk/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java
diff --git a/branches/sca-java-1.x/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java b/sca-java-1.x/trunk/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java
index c9cf1a80c8..c9cf1a80c8 100644
--- a/branches/sca-java-1.x/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java
+++ b/sca-java-1.x/trunk/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java
diff --git a/branches/sca-java-1.x/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java b/sca-java-1.x/trunk/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
index ea548c22e6..ea548c22e6 100644
--- a/branches/sca-java-1.x/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
+++ b/sca-java-1.x/trunk/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
diff --git a/branches/sca-java-1.x/itest/jms-topics/pom.xml b/sca-java-1.x/trunk/itest/jms-topics/pom.xml
index febdc1eec7..febdc1eec7 100644
--- a/branches/sca-java-1.x/itest/jms-topics/pom.xml
+++ b/sca-java-1.x/trunk/itest/jms-topics/pom.xml
diff --git a/branches/sca-java-1.x/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-1.x/trunk/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
index 4d00d2df0d..4d00d2df0d 100644
--- a/branches/sca-java-1.x/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-1.x/trunk/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index 377f227ceb..377f227ceb 100644
--- a/branches/sca-java-1.x/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-1.x/trunk/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/branches/sca-java-1.x/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-1.x/trunk/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index 0036391696..0036391696 100644
--- a/branches/sca-java-1.x/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-topics/src/main/resources/jndi.properties b/sca-java-1.x/trunk/itest/jms-topics/src/main/resources/jndi.properties
index 9888d5843b..9888d5843b 100644
--- a/branches/sca-java-1.x/itest/jms-topics/src/main/resources/jndi.properties
+++ b/sca-java-1.x/trunk/itest/jms-topics/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.x/itest/jms-topics/src/main/resources/topics/TopicsClient.composite b/sca-java-1.x/trunk/itest/jms-topics/src/main/resources/topics/TopicsClient.composite
index cf876932d9..cf876932d9 100644
--- a/branches/sca-java-1.x/itest/jms-topics/src/main/resources/topics/TopicsClient.composite
+++ b/sca-java-1.x/trunk/itest/jms-topics/src/main/resources/topics/TopicsClient.composite
diff --git a/branches/sca-java-1.x/itest/jms-topics/src/main/resources/topics/TopicsService.composite b/sca-java-1.x/trunk/itest/jms-topics/src/main/resources/topics/TopicsService.composite
index 2f2678ab0b..2f2678ab0b 100644
--- a/branches/sca-java-1.x/itest/jms-topics/src/main/resources/topics/TopicsService.composite
+++ b/sca-java-1.x/trunk/itest/jms-topics/src/main/resources/topics/TopicsService.composite
diff --git a/branches/sca-java-1.x/itest/jms-topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java b/sca-java-1.x/trunk/itest/jms-topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java
index f0b7537bcc..f0b7537bcc 100644
--- a/branches/sca-java-1.x/itest/jms-topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java
+++ b/sca-java-1.x/trunk/itest/jms-topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java
diff --git a/branches/sca-java-1.x/itest/jms-ttl/pom.xml b/sca-java-1.x/trunk/itest/jms-ttl/pom.xml
index b87e6b55ec..b87e6b55ec 100644
--- a/branches/sca-java-1.x/itest/jms-ttl/pom.xml
+++ b/sca-java-1.x/trunk/itest/jms-ttl/pom.xml
diff --git a/branches/sca-java-1.x/itest/jms-ttl/src/main/java/itest/MockInitialContextFactory.java b/sca-java-1.x/trunk/itest/jms-ttl/src/main/java/itest/MockInitialContextFactory.java
index 336fecf67b..336fecf67b 100644
--- a/branches/sca-java-1.x/itest/jms-ttl/src/main/java/itest/MockInitialContextFactory.java
+++ b/sca-java-1.x/trunk/itest/jms-ttl/src/main/java/itest/MockInitialContextFactory.java
diff --git a/branches/sca-java-1.x/itest/jms-ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientIface.java b/sca-java-1.x/trunk/itest/jms-ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientIface.java
index 0819e8474f..0819e8474f 100644
--- a/branches/sca-java-1.x/itest/jms-ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientIface.java
+++ b/sca-java-1.x/trunk/itest/jms-ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientIface.java
diff --git a/branches/sca-java-1.x/itest/jms-ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-1.x/trunk/itest/jms-ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
index 4467d91f0d..4467d91f0d 100644
--- a/branches/sca-java-1.x/itest/jms-ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/sca-java-1.x/trunk/itest/jms-ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/branches/sca-java-1.x/itest/jms-ttl/src/main/resources/jndi.properties b/sca-java-1.x/trunk/itest/jms-ttl/src/main/resources/jndi.properties
index 040ec282d7..040ec282d7 100644
--- a/branches/sca-java-1.x/itest/jms-ttl/src/main/resources/jndi.properties
+++ b/sca-java-1.x/trunk/itest/jms-ttl/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.x/itest/jms-ttl/src/main/resources/ttl.composite b/sca-java-1.x/trunk/itest/jms-ttl/src/main/resources/ttl.composite
index 9065148c0f..9065148c0f 100644
--- a/branches/sca-java-1.x/itest/jms-ttl/src/main/resources/ttl.composite
+++ b/sca-java-1.x/trunk/itest/jms-ttl/src/main/resources/ttl.composite
diff --git a/branches/sca-java-1.x/itest/jms-ttl/src/test/java/org/apache/tuscany/sca/binding/jms/TTLTestCase.java b/sca-java-1.x/trunk/itest/jms-ttl/src/test/java/org/apache/tuscany/sca/binding/jms/TTLTestCase.java
index 70b945798b..70b945798b 100644
--- a/branches/sca-java-1.x/itest/jms-ttl/src/test/java/org/apache/tuscany/sca/binding/jms/TTLTestCase.java
+++ b/sca-java-1.x/trunk/itest/jms-ttl/src/test/java/org/apache/tuscany/sca/binding/jms/TTLTestCase.java
diff --git a/branches/sca-java-1.x/itest/jms/pom.xml b/sca-java-1.x/trunk/itest/jms/pom.xml
index 7f30339383..7f30339383 100644
--- a/branches/sca-java-1.x/itest/jms/pom.xml
+++ b/sca-java-1.x/trunk/itest/jms/pom.xml
diff --git a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
index 7b1c63d437..7b1c63d437 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
+++ b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
diff --git a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
index 19b584950a..19b584950a 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
+++ b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
diff --git a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
index b12e3a562e..b12e3a562e 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
+++ b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
diff --git a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
index b23db73c01..b23db73c01 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
+++ b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
diff --git a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
index 4351b17cd6..4351b17cd6 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
+++ b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
diff --git a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
index cb244a5160..cb244a5160 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
+++ b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
diff --git a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
index 40780709f4..40780709f4 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 86d4719646..86d4719646 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index abb29aec4c..abb29aec4c 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 21d2de2cf0..21d2de2cf0 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
index d4cd5df431..d4cd5df431 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
+++ b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
diff --git a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
index 464072b42d..464072b42d 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
+++ b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
diff --git a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
index b4d1cbccda..b4d1cbccda 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
+++ b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
diff --git a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
index e8242467cc..e8242467cc 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
+++ b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
diff --git a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
index d376d74295..d376d74295 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
+++ b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
diff --git a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
index 142343e349..142343e349 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
index 218cccf64c..218cccf64c 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
index 9795089952..9795089952 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
+++ b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
diff --git a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
index 25a89fc5b4..25a89fc5b4 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index f16f853ba7..f16f853ba7 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index bff4536fa0..bff4536fa0 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
index cdf9bef93f..cdf9bef93f 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
+++ b/sca-java-1.x/trunk/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/defaults/client.composite b/sca-java-1.x/trunk/itest/jms/src/main/resources/defaults/client.composite
index 991b0cf11b..991b0cf11b 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/defaults/client.composite
+++ b/sca-java-1.x/trunk/itest/jms/src/main/resources/defaults/client.composite
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/defaults/service.composite b/sca-java-1.x/trunk/itest/jms/src/main/resources/defaults/service.composite
index 3f299bc787..3f299bc787 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/defaults/service.composite
+++ b/sca-java-1.x/trunk/itest/jms/src/main/resources/defaults/service.composite
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/dynamic/client.composite b/sca-java-1.x/trunk/itest/jms/src/main/resources/dynamic/client.composite
index afa4135f1d..afa4135f1d 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/dynamic/client.composite
+++ b/sca-java-1.x/trunk/itest/jms/src/main/resources/dynamic/client.composite
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/exceptions/client.composite b/sca-java-1.x/trunk/itest/jms/src/main/resources/exceptions/client.composite
index 8bb7f86252..8bb7f86252 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/exceptions/client.composite
+++ b/sca-java-1.x/trunk/itest/jms/src/main/resources/exceptions/client.composite
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/exceptions/service.composite b/sca-java-1.x/trunk/itest/jms/src/main/resources/exceptions/service.composite
index 052ff9d985..052ff9d985 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/exceptions/service.composite
+++ b/sca-java-1.x/trunk/itest/jms/src/main/resources/exceptions/service.composite
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/external/client.composite b/sca-java-1.x/trunk/itest/jms/src/main/resources/external/client.composite
index 7a0013be4d..7a0013be4d 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/external/client.composite
+++ b/sca-java-1.x/trunk/itest/jms/src/main/resources/external/client.composite
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/external/service.composite b/sca-java-1.x/trunk/itest/jms/src/main/resources/external/service.composite
index b9f33e5afc..b9f33e5afc 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/external/service.composite
+++ b/sca-java-1.x/trunk/itest/jms/src/main/resources/external/service.composite
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/jndi.properties b/sca-java-1.x/trunk/itest/jms/src/main/resources/jndi.properties
index 9abdff215d..9abdff215d 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/jndi.properties
+++ b/sca-java-1.x/trunk/itest/jms/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/nonSCAclient/service.composite b/sca-java-1.x/trunk/itest/jms/src/main/resources/nonSCAclient/service.composite
index ea821c347b..ea821c347b 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/nonSCAclient/service.composite
+++ b/sca-java-1.x/trunk/itest/jms/src/main/resources/nonSCAclient/service.composite
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/oneway/OneWayClient.composite b/sca-java-1.x/trunk/itest/jms/src/main/resources/oneway/OneWayClient.composite
index bed0663f58..bed0663f58 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/oneway/OneWayClient.composite
+++ b/sca-java-1.x/trunk/itest/jms/src/main/resources/oneway/OneWayClient.composite
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/oneway/OneWayService.composite b/sca-java-1.x/trunk/itest/jms/src/main/resources/oneway/OneWayService.composite
index 3d08de7d51..3d08de7d51 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/oneway/OneWayService.composite
+++ b/sca-java-1.x/trunk/itest/jms/src/main/resources/oneway/OneWayService.composite
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/policyHeaders/definitions.xml b/sca-java-1.x/trunk/itest/jms/src/main/resources/policyHeaders/definitions.xml
index dd4350c6fe..dd4350c6fe 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/policyHeaders/definitions.xml
+++ b/sca-java-1.x/trunk/itest/jms/src/main/resources/policyHeaders/definitions.xml
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite b/sca-java-1.x/trunk/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite
index 8902f1d32a..8902f1d32a 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite
+++ b/sca-java-1.x/trunk/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/properties/properties.composite b/sca-java-1.x/trunk/itest/jms/src/main/resources/properties/properties.composite
index 3678356d3b..3678356d3b 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/properties/properties.composite
+++ b/sca-java-1.x/trunk/itest/jms/src/main/resources/properties/properties.composite
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/simple/client.composite b/sca-java-1.x/trunk/itest/jms/src/main/resources/simple/client.composite
index 6454370419..6454370419 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/simple/client.composite
+++ b/sca-java-1.x/trunk/itest/jms/src/main/resources/simple/client.composite
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/simple/mpclient.composite b/sca-java-1.x/trunk/itest/jms/src/main/resources/simple/mpclient.composite
index 5389c427dc..5389c427dc 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/simple/mpclient.composite
+++ b/sca-java-1.x/trunk/itest/jms/src/main/resources/simple/mpclient.composite
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/simple/mpservice.composite b/sca-java-1.x/trunk/itest/jms/src/main/resources/simple/mpservice.composite
index 6d0d11f4b6..6d0d11f4b6 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/simple/mpservice.composite
+++ b/sca-java-1.x/trunk/itest/jms/src/main/resources/simple/mpservice.composite
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/simple/service.composite b/sca-java-1.x/trunk/itest/jms/src/main/resources/simple/service.composite
index 4dfdb5f27d..4dfdb5f27d 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/simple/service.composite
+++ b/sca-java-1.x/trunk/itest/jms/src/main/resources/simple/service.composite
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/simple/uriclient.composite b/sca-java-1.x/trunk/itest/jms/src/main/resources/simple/uriclient.composite
index 83ef9c3c95..83ef9c3c95 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/simple/uriclient.composite
+++ b/sca-java-1.x/trunk/itest/jms/src/main/resources/simple/uriclient.composite
diff --git a/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java b/sca-java-1.x/trunk/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
index dca9386637..dca9386637 100644
--- a/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
+++ b/sca-java-1.x/trunk/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
diff --git a/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java b/sca-java-1.x/trunk/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
index f4750e5453..f4750e5453 100644
--- a/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
+++ b/sca-java-1.x/trunk/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
diff --git a/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/sca-java-1.x/trunk/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
index bd326b36d2..bd326b36d2 100644
--- a/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
+++ b/sca-java-1.x/trunk/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
diff --git a/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java b/sca-java-1.x/trunk/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
index c34ad07901..c34ad07901 100644
--- a/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
+++ b/sca-java-1.x/trunk/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
diff --git a/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java b/sca-java-1.x/trunk/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
index 44f9754e29..44f9754e29 100644
--- a/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
+++ b/sca-java-1.x/trunk/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
diff --git a/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java b/sca-java-1.x/trunk/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
index d982e651cd..d982e651cd 100644
--- a/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
+++ b/sca-java-1.x/trunk/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
diff --git a/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java b/sca-java-1.x/trunk/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
index 26dda13cf9..26dda13cf9 100644
--- a/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
+++ b/sca-java-1.x/trunk/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
diff --git a/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java b/sca-java-1.x/trunk/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
index 5e208a3081..5e208a3081 100644
--- a/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
+++ b/sca-java-1.x/trunk/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
diff --git a/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java b/sca-java-1.x/trunk/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
index e38f9104c0..e38f9104c0 100644
--- a/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
+++ b/sca-java-1.x/trunk/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
diff --git a/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java b/sca-java-1.x/trunk/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
index c1882a1e26..c1882a1e26 100644
--- a/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
+++ b/sca-java-1.x/trunk/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
diff --git a/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java b/sca-java-1.x/trunk/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
index bed5515d7f..bed5515d7f 100644
--- a/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
+++ b/sca-java-1.x/trunk/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
diff --git a/branches/sca-java-1.x/itest/large-sdo-ws/pom.xml b/sca-java-1.x/trunk/itest/large-sdo-ws/pom.xml
index c866827482..c866827482 100644
--- a/branches/sca-java-1.x/itest/large-sdo-ws/pom.xml
+++ b/sca-java-1.x/trunk/itest/large-sdo-ws/pom.xml
diff --git a/branches/sca-java-1.x/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqClient.java b/sca-java-1.x/trunk/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqClient.java
index f5a8830c4a..f5a8830c4a 100644
--- a/branches/sca-java-1.x/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqClient.java
+++ b/sca-java-1.x/trunk/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqClient.java
diff --git a/branches/sca-java-1.x/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqService.java b/sca-java-1.x/trunk/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqService.java
index 14da53cf98..14da53cf98 100644
--- a/branches/sca-java-1.x/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqService.java
+++ b/sca-java-1.x/trunk/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqService.java
diff --git a/branches/sca-java-1.x/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java b/sca-java-1.x/trunk/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java
index 3575d94f48..3575d94f48 100644
--- a/branches/sca-java-1.x/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java
+++ b/sca-java-1.x/trunk/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java
diff --git a/branches/sca-java-1.x/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml
index ac66b6a425..ac66b6a425 100644
--- a/branches/sca-java-1.x/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/large-sdo-ws/src/main/resources/trnInq.composite b/sca-java-1.x/trunk/itest/large-sdo-ws/src/main/resources/trnInq.composite
index 97594216e1..97594216e1 100644
--- a/branches/sca-java-1.x/itest/large-sdo-ws/src/main/resources/trnInq.composite
+++ b/sca-java-1.x/trunk/itest/large-sdo-ws/src/main/resources/trnInq.composite
diff --git a/branches/sca-java-1.x/itest/large-sdo-ws/src/main/resources/wsdl/IFX170_XSD.xsd b/sca-java-1.x/trunk/itest/large-sdo-ws/src/main/resources/wsdl/IFX170_XSD.xsd
index b85b80abc4..b85b80abc4 100644
--- a/branches/sca-java-1.x/itest/large-sdo-ws/src/main/resources/wsdl/IFX170_XSD.xsd
+++ b/sca-java-1.x/trunk/itest/large-sdo-ws/src/main/resources/wsdl/IFX170_XSD.xsd
diff --git a/branches/sca-java-1.x/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl b/sca-java-1.x/trunk/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl
index 842f7a9d4c..842f7a9d4c 100644
--- a/branches/sca-java-1.x/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl
+++ b/sca-java-1.x/trunk/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl
diff --git a/branches/sca-java-1.x/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java b/sca-java-1.x/trunk/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java
index 446105c67a..446105c67a 100644
--- a/branches/sca-java-1.x/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java
+++ b/sca-java-1.x/trunk/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java
diff --git a/branches/sca-java-1.x/itest/late-reference-resolution/pom.xml b/sca-java-1.x/trunk/itest/late-reference-resolution/pom.xml
index dc95ecbe2c..dc95ecbe2c 100644
--- a/branches/sca-java-1.x/itest/late-reference-resolution/pom.xml
+++ b/sca-java-1.x/trunk/itest/late-reference-resolution/pom.xml
diff --git a/branches/sca-java-1.x/itest/late-reference-resolution/src/main/java/calculator/AddService.java b/sca-java-1.x/trunk/itest/late-reference-resolution/src/main/java/calculator/AddService.java
index d7dc4473ad..d7dc4473ad 100644
--- a/branches/sca-java-1.x/itest/late-reference-resolution/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/trunk/itest/late-reference-resolution/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.x/itest/late-reference-resolution/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/trunk/itest/late-reference-resolution/src/main/java/calculator/AddServiceImpl.java
index e9b7e254e5..e9b7e254e5 100644
--- a/branches/sca-java-1.x/itest/late-reference-resolution/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/late-reference-resolution/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/late-reference-resolution/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/trunk/itest/late-reference-resolution/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-java-1.x/itest/late-reference-resolution/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/trunk/itest/late-reference-resolution/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.x/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/trunk/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java
index da869e00fd..da869e00fd 100644
--- a/branches/sca-java-1.x/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/late-reference-resolution/src/main/java/calculator/DivideService.java b/sca-java-1.x/trunk/itest/late-reference-resolution/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-java-1.x/itest/late-reference-resolution/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/trunk/itest/late-reference-resolution/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.x/itest/late-reference-resolution/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/trunk/itest/late-reference-resolution/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-java-1.x/itest/late-reference-resolution/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/late-reference-resolution/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/late-reference-resolution/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/trunk/itest/late-reference-resolution/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.x/itest/late-reference-resolution/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/trunk/itest/late-reference-resolution/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.x/itest/late-reference-resolution/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/trunk/itest/late-reference-resolution/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-java-1.x/itest/late-reference-resolution/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/late-reference-resolution/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java b/sca-java-1.x/trunk/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java
index 78ab9c6ee0..78ab9c6ee0 100644
--- a/branches/sca-java-1.x/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/trunk/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.x/itest/late-reference-resolution/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/trunk/itest/late-reference-resolution/src/main/java/calculator/SubtractServiceImpl.java
index 1010207154..1010207154 100644
--- a/branches/sca-java-1.x/itest/late-reference-resolution/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/late-reference-resolution/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/late-reference-resolution/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory b/sca-java-1.x/trunk/itest/late-reference-resolution/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
index c53b55aacf..c53b55aacf 100644
--- a/branches/sca-java-1.x/itest/late-reference-resolution/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
+++ b/sca-java-1.x/trunk/itest/late-reference-resolution/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
diff --git a/branches/sca-java-1.x/itest/late-reference-resolution/src/main/resources/nodeA/Calculator.composite b/sca-java-1.x/trunk/itest/late-reference-resolution/src/main/resources/nodeA/Calculator.composite
index 378d6e9706..378d6e9706 100644
--- a/branches/sca-java-1.x/itest/late-reference-resolution/src/main/resources/nodeA/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/late-reference-resolution/src/main/resources/nodeA/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/late-reference-resolution/src/main/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/late-reference-resolution/src/main/resources/nodeA/META-INF/sca-contribution.xml
index db255e0232..db255e0232 100644
--- a/branches/sca-java-1.x/itest/late-reference-resolution/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/late-reference-resolution/src/main/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/late-reference-resolution/src/main/resources/nodeB/Calculator.composite b/sca-java-1.x/trunk/itest/late-reference-resolution/src/main/resources/nodeB/Calculator.composite
index 3fb16fa619..3fb16fa619 100644
--- a/branches/sca-java-1.x/itest/late-reference-resolution/src/main/resources/nodeB/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/late-reference-resolution/src/main/resources/nodeB/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/late-reference-resolution/src/main/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/late-reference-resolution/src/main/resources/nodeB/META-INF/sca-contribution.xml
index 130157ac04..130157ac04 100644
--- a/branches/sca-java-1.x/itest/late-reference-resolution/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/late-reference-resolution/src/main/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/late-reference-resolution/src/main/resources/nodeC/Calculator.composite b/sca-java-1.x/trunk/itest/late-reference-resolution/src/main/resources/nodeC/Calculator.composite
index c615b4355a..c615b4355a 100644
--- a/branches/sca-java-1.x/itest/late-reference-resolution/src/main/resources/nodeC/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/late-reference-resolution/src/main/resources/nodeC/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/late-reference-resolution/src/main/resources/nodeC/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/late-reference-resolution/src/main/resources/nodeC/META-INF/sca-contribution.xml
index cba0a5c281..cba0a5c281 100644
--- a/branches/sca-java-1.x/itest/late-reference-resolution/src/main/resources/nodeC/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/late-reference-resolution/src/main/resources/nodeC/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverFactoryImpl.java b/sca-java-1.x/trunk/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverFactoryImpl.java
index e4bd3035e2..e4bd3035e2 100644
--- a/branches/sca-java-1.x/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverFactoryImpl.java
+++ b/sca-java-1.x/trunk/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverFactoryImpl.java
diff --git a/branches/sca-java-1.x/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverImpl.java b/sca-java-1.x/trunk/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverImpl.java
index c6e0689837..c6e0689837 100644
--- a/branches/sca-java-1.x/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverImpl.java
+++ b/sca-java-1.x/trunk/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverImpl.java
diff --git a/branches/sca-java-1.x/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java b/sca-java-1.x/trunk/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java
index ebe834028d..ebe834028d 100644
--- a/branches/sca-java-1.x/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java
+++ b/sca-java-1.x/trunk/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java
diff --git a/branches/sca-java-1.x/itest/late-reference-resolution/src/test/java/calculator/TestRegistryImpl.java b/sca-java-1.x/trunk/itest/late-reference-resolution/src/test/java/calculator/TestRegistryImpl.java
index 57afc9ea50..57afc9ea50 100644
--- a/branches/sca-java-1.x/itest/late-reference-resolution/src/test/java/calculator/TestRegistryImpl.java
+++ b/sca-java-1.x/trunk/itest/late-reference-resolution/src/test/java/calculator/TestRegistryImpl.java
diff --git a/branches/sca-java-1.x/itest/oneway/build.xml b/sca-java-1.x/trunk/itest/oneway/build.xml
index 47e6814621..47e6814621 100644
--- a/branches/sca-java-1.x/itest/oneway/build.xml
+++ b/sca-java-1.x/trunk/itest/oneway/build.xml
diff --git a/branches/sca-java-1.x/itest/oneway/pom.xml b/sca-java-1.x/trunk/itest/oneway/pom.xml
index 4df53f4e18..4df53f4e18 100644
--- a/branches/sca-java-1.x/itest/oneway/pom.xml
+++ b/sca-java-1.x/trunk/itest/oneway/pom.xml
diff --git a/branches/sca-java-1.x/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java b/sca-java-1.x/trunk/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java
index 04c6069dfe..04c6069dfe 100644
--- a/branches/sca-java-1.x/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java
+++ b/sca-java-1.x/trunk/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java
diff --git a/branches/sca-java-1.x/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java b/sca-java-1.x/trunk/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java
index b3cec51b1f..b3cec51b1f 100644
--- a/branches/sca-java-1.x/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java
+++ b/sca-java-1.x/trunk/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java
diff --git a/branches/sca-java-1.x/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java b/sca-java-1.x/trunk/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
index 8013c5c0e8..8013c5c0e8 100644
--- a/branches/sca-java-1.x/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
+++ b/sca-java-1.x/trunk/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
diff --git a/branches/sca-java-1.x/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java b/sca-java-1.x/trunk/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
index 01f956cb67..01f956cb67 100644
--- a/branches/sca-java-1.x/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite b/sca-java-1.x/trunk/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
index d053a6278c..d053a6278c 100644
--- a/branches/sca-java-1.x/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
+++ b/sca-java-1.x/trunk/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
diff --git a/branches/sca-java-1.x/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java b/sca-java-1.x/trunk/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
index c490150ec5..c490150ec5 100644
--- a/branches/sca-java-1.x/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
+++ b/sca-java-1.x/trunk/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
diff --git a/branches/sca-java-1.x/itest/operation-overloading/pom.xml b/sca-java-1.x/trunk/itest/operation-overloading/pom.xml
index 468ba80da4..468ba80da4 100644
--- a/branches/sca-java-1.x/itest/operation-overloading/pom.xml
+++ b/sca-java-1.x/trunk/itest/operation-overloading/pom.xml
diff --git a/branches/sca-java-1.x/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java b/sca-java-1.x/trunk/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
index 85b5717c00..85b5717c00 100644
--- a/branches/sca-java-1.x/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
+++ b/sca-java-1.x/trunk/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
diff --git a/branches/sca-java-1.x/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java b/sca-java-1.x/trunk/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
index e5d5083a2d..e5d5083a2d 100644
--- a/branches/sca-java-1.x/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
+++ b/sca-java-1.x/trunk/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
diff --git a/branches/sca-java-1.x/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java b/sca-java-1.x/trunk/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
index e206a86768..e206a86768 100644
--- a/branches/sca-java-1.x/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
+++ b/sca-java-1.x/trunk/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
diff --git a/branches/sca-java-1.x/itest/operation-overloading/src/main/resources/OperationOverload.composite b/sca-java-1.x/trunk/itest/operation-overloading/src/main/resources/OperationOverload.composite
index cbf5aa2078..cbf5aa2078 100644
--- a/branches/sca-java-1.x/itest/operation-overloading/src/main/resources/OperationOverload.composite
+++ b/sca-java-1.x/trunk/itest/operation-overloading/src/main/resources/OperationOverload.composite
diff --git a/branches/sca-java-1.x/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java b/sca-java-1.x/trunk/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
index 0b3b12c762..0b3b12c762 100644
--- a/branches/sca-java-1.x/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
+++ b/sca-java-1.x/trunk/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml
index 82d536cbfe..82d536cbfe 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/pom.xml b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/pom.xml
index a93e64237f..a93e64237f 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/pom.xml
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/pom.xml
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java
index fba9a109b3..fba9a109b3 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java
index 225dce0236..225dce0236 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index 2b8c973e2c..2b8c973e2c 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
index a1c7fce60a..a1c7fce60a 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java
index 4647a716c7..4647a716c7 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index cc5d44d279..cc5d44d279 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
index 1b7fb15bf1..1b7fb15bf1 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
index e97331c06c..e97331c06c 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index 2d1bb68e5b..2d1bb68e5b 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
index 0f88cca213..0f88cca213 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java
index f55a068ede..f55a068ede 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index c39a34cb96..c39a34cb96 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
index 600f3f0c74..600f3f0c74 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
index 0ba54b363a..0ba54b363a 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType
index 7edc392f46..7edc392f46 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType
index 7edc392f46..7edc392f46 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml
index 4779eff514..4779eff514 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml
index d505834f15..d505834f15 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml
index 6bcf6cef0a..6bcf6cef0a 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml
index 210a68011f..210a68011f 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml
index e23e1a2ecd..e23e1a2ecd 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType
index 9832da880e..9832da880e 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType
index 5586179421..5586179421 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType
index ccc4f84ee4..ccc4f84ee4 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf
index 644b207e70..644b207e70 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf
index e649870356..e649870356 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf
index 8e8e33ecd1..8e8e33ecd1 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf
index 2f4b56835b..2f4b56835b 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf
index 5f4a8b94ec..5f4a8b94ec 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf
index 57d2ac9e4d..57d2ac9e4d 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf
index 2e1399bb3b..2e1399bb3b 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite
index bb8fb2b07c..bb8fb2b07c 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/build-bundles.xml b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/build-bundles.xml
index 82d536cbfe..82d536cbfe 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/build-bundles.xml
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/build-bundles.xml
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/pom.xml b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/pom.xml
index 62bedf61e4..62bedf61e4 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/pom.xml
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/pom.xml
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java
index fba9a109b3..fba9a109b3 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java
index 225dce0236..225dce0236 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index d0b0a13e6d..d0b0a13e6d 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
index a1c7fce60a..a1c7fce60a 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java
index 4647a716c7..4647a716c7 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index d2bf71ed28..d2bf71ed28 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
index 1b7fb15bf1..1b7fb15bf1 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
index e97331c06c..e97331c06c 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index 2556a0cfa0..2556a0cfa0 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
index 0f88cca213..0f88cca213 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java
index f55a068ede..f55a068ede 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index e180c37e3f..e180c37e3f 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
index 600f3f0c74..600f3f0c74 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
index 0ba54b363a..0ba54b363a 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType
index 7edc392f46..7edc392f46 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType
index 7edc392f46..7edc392f46 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
index 828dc6f472..828dc6f472 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
index 9293b1ff52..9293b1ff52 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
index 03077aa4d4..03077aa4d4 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
index 210a68011f..210a68011f 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
index c96deb4e1b..c96deb4e1b 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType
index 9832da880e..9832da880e 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType
index 5586179421..5586179421 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType
index ccc4f84ee4..ccc4f84ee4 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf
index 404995a90f..404995a90f 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf
index 0441e8c6f0..0441e8c6f0 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf
index ac0ca72030..ac0ca72030 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf
index 2f4b56835b..2f4b56835b 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf
index 61f62fa16e..61f62fa16e 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf
index dc4aa2c30e..dc4aa2c30e 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf
index d149165366..d149165366 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite
index 4a18aed5f3..4a18aed5f3 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-test/pom.xml b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-test/pom.xml
index 6d543876d0..6d543876d0 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-test/pom.xml
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-test/pom.xml
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java
index 108481fcbd..108481fcbd 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java
index 28fe368663..28fe368663 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java
index be3b7365e5..be3b7365e5 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java
index 03372349f8..03372349f8 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java
index a2b3a7bc92..a2b3a7bc92 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
index ea8d272a0c..ea8d272a0c 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
diff --git a/branches/sca-java-1.x/itest/osgi-contribution/pom.xml b/sca-java-1.x/trunk/itest/osgi-contribution/pom.xml
index 29c3609c59..29c3609c59 100644
--- a/branches/sca-java-1.x/itest/osgi-contribution/pom.xml
+++ b/sca-java-1.x/trunk/itest/osgi-contribution/pom.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/build-bundles.xml b/sca-java-1.x/trunk/itest/osgi-implementation/build-bundles.xml
index 53bf014546..53bf014546 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/build-bundles.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/build-bundles.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/pom.xml b/sca-java-1.x/trunk/itest/osgi-implementation/pom.xml
index 12e2f7ea65..12e2f7ea65 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/pom.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/pom.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java
index cfecd989fe..cfecd989fe 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java
index 43bc26f2f5..43bc26f2f5 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java
index f78878ef47..f78878ef47 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java
index 1c65ca573b..1c65ca573b 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java
index 5383e1e268..5383e1e268 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java
index b2af2fa68d..b2af2fa68d 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java
index c05a3f52a8..c05a3f52a8 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java
index c92f078e49..c92f078e49 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java
index af269052c7..af269052c7 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java
index 5eb16be597..5eb16be597 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java
index 8479624546..8479624546 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java
index 3aedabc29c..3aedabc29c 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java
index b12e094bc1..b12e094bc1 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java
index 59e128b993..59e128b993 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java
index ff6f16cba3..ff6f16cba3 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java
index 4524c6bd3d..4524c6bd3d 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java
index bcd24ef0b1..bcd24ef0b1 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java
index 903f8bf229..903f8bf229 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java
index fe8bd23f07..fe8bd23f07 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java
index ec30d641ac..ec30d641ac 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java
index 34baca71d1..34baca71d1 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/helloworld/Greetings.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
index 9285c0a8d5..9285c0a8d5 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
index 16d0eae990..16d0eae990 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
index 3d0e045225..3d0e045225 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
index c055aee142..c055aee142 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
index 661eb5a8cb..661eb5a8cb 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
index 0588da9a85..0588da9a85 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java
index fff67e1978..fff67e1978 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java
index 98085449e6..98085449e6 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java
index 5089019671..5089019671 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java
index 1aabf4d10c..1aabf4d10c 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
index 039a214856..039a214856 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java
index 4a3cd4aed2..4a3cd4aed2 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
index 2251bf5be6..2251bf5be6 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
index e2d25bf47d..e2d25bf47d 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
index f2ae804ad1..f2ae804ad1 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
index a47f68c579..a47f68c579 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
index 25d7bcf2ff..25d7bcf2ff 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
index 2762bc62be..2762bc62be 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index 80346311b1..80346311b1 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
index a879505610..a879505610 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
index c8cb522cf4..c8cb522cf4 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
index 546971860e..546971860e 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
index 593e55f3f5..593e55f3f5 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
index 18483817ad..18483817ad 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java
index 5ba42780f2..5ba42780f2 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java
index bc569d0ac0..bc569d0ac0 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
index 599ab51a50..599ab51a50 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index df52c6c760..df52c6c760 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
index aca5943552..aca5943552 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
index e71c624f49..e71c624f49 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java
index a036ecfc76..a036ecfc76 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
index db877bb366..db877bb366 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
index ee1f575e70..ee1f575e70 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
index 09e60ca626..09e60ca626 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
index 7dd70889c7..7dd70889c7 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java
index 354f40a064..354f40a064 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index d0cf43a960..d0cf43a960 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
index ff40a7ae36..ff40a7ae36 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
index ef989d6fcf..ef989d6fcf 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
index effae8c246..effae8c246 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
index 4effadf208..4effadf208 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java
index 13bce67bb4..13bce67bb4 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java
index 071a131f40..071a131f40 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
index 6ebd1f2894..6ebd1f2894 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
index b66961b1c2..b66961b1c2 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index 9edf3567e5..9edf3567e5 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
index 659f16be7f..659f16be7f 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
index 7c9e102fd2..7c9e102fd2 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
index bb04ff42e0..bb04ff42e0 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
index 3317816557..3317816557 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java
index 6d1ad76796..6d1ad76796 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
index 71e248590b..71e248590b 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
index 7c1125bbb5..7c1125bbb5 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
index 8456b878f2..8456b878f2 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
index d5a47c6403..d5a47c6403 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
index e6391d2159..e6391d2159 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
index c79ede815b..c79ede815b 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
index 04cc73b85c..04cc73b85c 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
index 9ece700efe..9ece700efe 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
index 52bc43478d..52bc43478d 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/factory/Customer.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
index 1fd551be3b..1fd551be3b 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
index 5599c44bc3..5599c44bc3 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
index 1fd551be3b..1fd551be3b 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
index 5599c44bc3..5599c44bc3 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
index 0b8d2e5851..0b8d2e5851 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/factory/factory-test.composite b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
index 87370a6df4..87370a6df4 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
index 127349eacf..127349eacf 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
index 7e3810c458..7e3810c458 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
index fb9a112d18..fb9a112d18 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
index ee732b5efc..ee732b5efc 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
index b1723660d7..b1723660d7 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
index fb9a112d18..fb9a112d18 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
index ee732b5efc..ee732b5efc 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
index b1723660d7..b1723660d7 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
index 5172cbe21e..5172cbe21e 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
index b7591e732d..b7591e732d 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
index cf8717fcf5..cf8717fcf5 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
index 785212fa6d..785212fa6d 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
index 7a06030e32..7a06030e32 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
index 5c39b53b0a..5c39b53b0a 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
index b8bb809319..b8bb809319 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
index 26f32fe617..26f32fe617 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
index 1b9e0e847e..1b9e0e847e 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
index 6066a38f29..6066a38f29 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
index 777edd3f7d..777edd3f7d 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
index d8adaa2ba3..d8adaa2ba3 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
index e0bd9d8c10..e0bd9d8c10 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
index 6005ae785c..6005ae785c 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
index 6f0b79ebc2..6f0b79ebc2 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
index d4b461460e..d4b461460e 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
index bb15e6e3aa..bb15e6e3aa 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
index 7591201b8c..7591201b8c 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
index 0e844fab99..0e844fab99 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
index fc86a76784..fc86a76784 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
index a8a87c5c8c..a8a87c5c8c 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
index 05bbf4db88..05bbf4db88 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
index a12d1a21ea..a12d1a21ea 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
index 2214db11a6..2214db11a6 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
index 8d44067992..8d44067992 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
index 60c0fb3fd3..60c0fb3fd3 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
index ca1392d2b8..ca1392d2b8 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
index 7c9f67c36d..7c9f67c36d 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
index 760c761666..760c761666 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
index 7d56770311..7d56770311 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
index 321bdc713f..321bdc713f 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
index 66f98011cb..66f98011cb 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
index 6874a66db9..6874a66db9 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
index 47d290eb1a..47d290eb1a 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
index c7f13a50a7..c7f13a50a7 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
index f4c102c4f0..f4c102c4f0 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
index cbebf7eec2..cbebf7eec2 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
index 6a3c845cca..6a3c845cca 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml
index cb6345432f..cb6345432f 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
index 89871fa8f6..89871fa8f6 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml
index d968d1ffc5..d968d1ffc5 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
index fc762df8d5..fc762df8d5 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
index 02e42bc010..02e42bc010 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
index 390367b99b..390367b99b 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
index 4715cbd976..4715cbd976 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
index 932fb8a483..932fb8a483 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
index b10d0416dc..b10d0416dc 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
index c799f31606..c799f31606 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
index db68d7e333..db68d7e333 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
index 1aea3cf669..1aea3cf669 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
index 106bd1b6aa..106bd1b6aa 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
index 1e3c915a59..1e3c915a59 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
index d7d0b41f5e..d7d0b41f5e 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
index 81c51e6804..81c51e6804 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
index ca50b554df..ca50b554df 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
index 14658127f8..14658127f8 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
index 335bc419c1..335bc419c1 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
index a68b9d6dbb..a68b9d6dbb 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
index 02f79c15f3..02f79c15f3 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
index 8428b08d96..8428b08d96 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
index c81bf00d00..c81bf00d00 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
index 61c161617c..61c161617c 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
index fd6a26a65f..fd6a26a65f 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
index 0168bc2435..0168bc2435 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
index 6674cdd7f2..6674cdd7f2 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
index 72df35ef41..72df35ef41 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
index 724c8132df..724c8132df 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
index 1e5035d949..1e5035d949 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
index 85bfd86422..85bfd86422 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
index 6e51b3d6f2..6e51b3d6f2 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
index 9a87758ec2..9a87758ec2 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
index e134bd1061..e134bd1061 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
index c19895bab1..c19895bab1 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
index 707609d2c4..707609d2c4 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
index e084e5831a..e084e5831a 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
index d96f6481fb..d96f6481fb 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
index 10ef690c9b..10ef690c9b 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
index 003f9dca5a..003f9dca5a 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
index fefdea106d..fefdea106d 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
index f6b847ed59..f6b847ed59 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
index 5cff2f573e..5cff2f573e 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
index ca50b554df..ca50b554df 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
index 14658127f8..14658127f8 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
index 0fec68a725..0fec68a725 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
index ca50b554df..ca50b554df 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
index 14658127f8..14658127f8 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
index 678014d48d..678014d48d 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
index f0090fb52b..f0090fb52b 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
index 0b50923a05..0b50923a05 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
index 1000a5f974..1000a5f974 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
index 4e392a9ff1..4e392a9ff1 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
index b10d0416dc..b10d0416dc 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
index 788ec4f19a..788ec4f19a 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
index 1ba16d0693..1ba16d0693 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
index a55ebd02a8..a55ebd02a8 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
index e7459360e6..e7459360e6 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
index d518ecab62..d518ecab62 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
index d7d0b41f5e..d7d0b41f5e 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
index 880304187b..880304187b 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
index d72db04425..d72db04425 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
index f9c1218f82..f9c1218f82 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
index d8e4c1cb7e..d8e4c1cb7e 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
index a6de268bf6..a6de268bf6 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
index 660e277693..660e277693 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
index 5e0965d047..5e0965d047 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
index 5e0965d047..5e0965d047 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
index 5e0965d047..5e0965d047 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
index 5e0965d047..5e0965d047 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
index 02ae93aec2..02ae93aec2 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
index c94504f07d..c94504f07d 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/properties/properties-test.composite b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
index fea03404fd..fea03404fd 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
index 3c425fcbc9..3c425fcbc9 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType
index f6c04de980..f6c04de980 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType
index 87918132e6..87918132e6 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml
index 9b00787162..9b00787162 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl
index 2ecc0bea43..2ecc0bea43 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite
index af79dc4bdf..af79dc4bdf 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/services/Customer.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/services/Customer.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/services/Customer.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/services/Customer.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/services/Retailer.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
index eadb539ea5..eadb539ea5 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/services/Shipper.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
index 532293b03f..532293b03f 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
index eadb539ea5..eadb539ea5 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
index 532293b03f..532293b03f 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
index c144a1bc18..c144a1bc18 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/services/services-test.composite b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/services/services-test.composite
index 64f3b30f88..64f3b30f88 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/services/services-test.composite
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/services/services-test.composite
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
index 0b0aa0912b..0b0aa0912b 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/Customer1.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/Customer2.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
index eadb539ea5..eadb539ea5 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
index eadb539ea5..eadb539ea5 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
index 532293b03f..532293b03f 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
index 532293b03f..532293b03f 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
index eadb539ea5..eadb539ea5 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
index eadb539ea5..eadb539ea5 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
index 532293b03f..532293b03f 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
index 532293b03f..532293b03f 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
index 877d0de1c9..877d0de1c9 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/version-test.composite b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/version-test.composite
index bbb397ee70..bbb397ee70 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/version/version-test.composite
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/version/version-test.composite
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
index 1fd551be3b..1fd551be3b 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
index 5599c44bc3..5599c44bc3 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
index 1fd551be3b..1fd551be3b 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
index 5599c44bc3..5599c44bc3 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
index 617200d8dd..617200d8dd 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
index 213cde2c1d..213cde2c1d 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
index 0dca0da75e..0dca0da75e 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
index 953045fefa..953045fefa 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
index c621d9aca0..c621d9aca0 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
index 6d3f853382..6d3f853382 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite
index d545c844d2..d545c844d2 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java
index 54b9b00bc8..54b9b00bc8 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java
index b26bfbd98d..b26bfbd98d 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java
index 667df7aa12..667df7aa12 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java
index a95437f8c1..a95437f8c1 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java
index c5d94df93d..c5d94df93d 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java
index d340923938..d340923938 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java
index c1f11d0b6e..c1f11d0b6e 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java
index 49afb3d8e8..49afb3d8e8 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
index a858c18a90..a858c18a90 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
index a9941aebcd..a9941aebcd 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
index 8e939b1a83..8e939b1a83 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
index 39d90bb75c..39d90bb75c 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
index 5376687b61..5376687b61 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
index 6d8dc1021e..6d8dc1021e 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
index e037ae9675..e037ae9675 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
index eecf67913d..eecf67913d 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
index 203bf5123c..203bf5123c 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
index 429b1f10ef..429b1f10ef 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
index dbc980f8c4..dbc980f8c4 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
index e39295a402..e39295a402 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
index c2f6bff4f5..c2f6bff4f5 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
index 17ba7a2f14..17ba7a2f14 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
index 8c33720018..8c33720018 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
index 0c6edd6691..0c6edd6691 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
index 0b48ac90ba..0b48ac90ba 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
index c84741f34f..c84741f34f 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java
index 5a9b2a8b1d..5a9b2a8b1d 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
index 7b95c12038..7b95c12038 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
diff --git a/branches/sca-java-1.x/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
index 8399991503..8399991503 100644
--- a/branches/sca-java-1.x/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
+++ b/sca-java-1.x/trunk/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/pom.xml b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
index 34fefd68ac..34fefd68ac 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java
index 2e3137239e..2e3137239e 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java
index 0dafffdb8c..0dafffdb8c 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java
index 6356718fe5..6356718fe5 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java
index c9f77b71cf..c9f77b71cf 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java
index 1fba0d6dcd..1fba0d6dcd 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java
index 8bf7a1fb2f..8bf7a1fb2f 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java
index ba9b7007b4..ba9b7007b4 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java
index 85397195bd..85397195bd 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java
index 9346fb8ed2..9346fb8ed2 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java
index 501cded48d..501cded48d 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java
index 687335b3c4..687335b3c4 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java
index f605e024ba..f605e024ba 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java
index 4f5640960b..4f5640960b 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java
index 9a491304bf..9a491304bf 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java
index 2e0b49e693..2e0b49e693 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java
index eac9979f56..eac9979f56 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java
index 62c0eef16d..62c0eef16d 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java
index 155dd368a3..155dd368a3 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java
index b45c062761..b45c062761 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java
index c2dae9eb97..c2dae9eb97 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF
index 8985947286..8985947286 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
index 6a38f48c4a..6a38f48c4a 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/pom.xml b/sca-java-1.x/trunk/itest/osgi-tuscany/pom.xml
index 1ed5bb001d..1ed5bb001d 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/pom.xml
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/pom.xml
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/test-bundles/build-bundles.xml b/sca-java-1.x/trunk/itest/osgi-tuscany/test-bundles/build-bundles.xml
index c7ea66863f..c7ea66863f 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/test-bundles/build-bundles.xml
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/test-bundles/build-bundles.xml
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/test-bundles/pom.xml b/sca-java-1.x/trunk/itest/osgi-tuscany/test-bundles/pom.xml
index ae651a75c1..ae651a75c1 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/test-bundles/pom.xml
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/test-bundles/pom.xml
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java b/sca-java-1.x/trunk/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java
index 0ac96b35a3..0ac96b35a3 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java b/sca-java-1.x/trunk/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java
index a3aa2531fc..a3aa2531fc 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-1.x/trunk/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index 5f1342c40b..5f1342c40b 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-1.x/trunk/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index f5708dec40..f5708dec40 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java b/sca-java-1.x/trunk/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java
index 17b342f8dd..17b342f8dd 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-1.x/trunk/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index afaf7aea02..afaf7aea02 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java b/sca-java-1.x/trunk/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java
index cd204ebc2e..cd204ebc2e 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-1.x/trunk/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index ca720085c5..ca720085c5 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-1.x/trunk/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java
index b4807b80d1..b4807b80d1 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf b/sca-java-1.x/trunk/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf
index f71d822bbe..f71d822bbe 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf b/sca-java-1.x/trunk/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf
index 13a3c9b82a..13a3c9b82a 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml
index b524abc2a6..b524abc2a6 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite b/sca-java-1.x/trunk/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite
index 5be79b741a..5be79b741a 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl b/sca-java-1.x/trunk/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl
index 8549ca3409..8549ca3409 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite b/sca-java-1.x/trunk/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite
index 88d1e72efc..88d1e72efc 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml b/sca-java-1.x/trunk/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
index 3232784c33..3232784c33 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java b/sca-java-1.x/trunk/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
index 0c26477a43..0c26477a43 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
diff --git a/branches/sca-java-1.x/itest/osgi-tuscany/tuscany-versioned/pom.xml b/sca-java-1.x/trunk/itest/osgi-tuscany/tuscany-versioned/pom.xml
index 8bb73d1f18..8bb73d1f18 100644
--- a/branches/sca-java-1.x/itest/osgi-tuscany/tuscany-versioned/pom.xml
+++ b/sca-java-1.x/trunk/itest/osgi-tuscany/tuscany-versioned/pom.xml
diff --git a/branches/sca-java-1.x/itest/policy-security-basicauth/pom.xml b/sca-java-1.x/trunk/itest/policy-security-basicauth/pom.xml
index 5bedabfb5b..5bedabfb5b 100644
--- a/branches/sca-java-1.x/itest/policy-security-basicauth/pom.xml
+++ b/sca-java-1.x/trunk/itest/policy-security-basicauth/pom.xml
diff --git a/branches/sca-java-1.x/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java b/sca-java-1.x/trunk/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java
index 7345af7f7c..7345af7f7c 100644
--- a/branches/sca-java-1.x/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java
+++ b/sca-java-1.x/trunk/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java
diff --git a/branches/sca-java-1.x/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/trunk/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/branches/sca-java-1.x/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/trunk/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.x/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/trunk/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java
index 6372570d1f..6372570d1f 100644
--- a/branches/sca-java-1.x/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/policy-security-basicauth/src/main/resources/definitions.xml b/sca-java-1.x/trunk/itest/policy-security-basicauth/src/main/resources/definitions.xml
index dbdf0cd263..dbdf0cd263 100644
--- a/branches/sca-java-1.x/itest/policy-security-basicauth/src/main/resources/definitions.xml
+++ b/sca-java-1.x/trunk/itest/policy-security-basicauth/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.x/itest/policy-security-basicauth/src/main/resources/helloworld.composite b/sca-java-1.x/trunk/itest/policy-security-basicauth/src/main/resources/helloworld.composite
index f883629180..f883629180 100644
--- a/branches/sca-java-1.x/itest/policy-security-basicauth/src/main/resources/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/policy-security-basicauth/src/main/resources/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java b/sca-java-1.x/trunk/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java
index b6e0444d2d..b6e0444d2d 100644
--- a/branches/sca-java-1.x/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java
+++ b/sca-java-1.x/trunk/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java
diff --git a/branches/sca-java-1.x/itest/policy-security-jsr250/pom.xml b/sca-java-1.x/trunk/itest/policy-security-jsr250/pom.xml
index cd64e65167..cd64e65167 100644
--- a/branches/sca-java-1.x/itest/policy-security-jsr250/pom.xml
+++ b/sca-java-1.x/trunk/itest/policy-security-jsr250/pom.xml
diff --git a/branches/sca-java-1.x/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/trunk/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java
index 3569410e7d..3569410e7d 100644
--- a/branches/sca-java-1.x/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/trunk/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.x/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/trunk/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java
index 3e752144a0..3e752144a0 100644
--- a/branches/sca-java-1.x/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/trunk/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.x/itest/policy-security-jsr250/src/main/resources/definitions.xml b/sca-java-1.x/trunk/itest/policy-security-jsr250/src/main/resources/definitions.xml
index 64b8a95d18..64b8a95d18 100644
--- a/branches/sca-java-1.x/itest/policy-security-jsr250/src/main/resources/definitions.xml
+++ b/sca-java-1.x/trunk/itest/policy-security-jsr250/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.x/itest/policy-security-jsr250/src/main/resources/helloworld.composite b/sca-java-1.x/trunk/itest/policy-security-jsr250/src/main/resources/helloworld.composite
index 456ca450f1..456ca450f1 100644
--- a/branches/sca-java-1.x/itest/policy-security-jsr250/src/main/resources/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/policy-security-jsr250/src/main/resources/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java b/sca-java-1.x/trunk/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java
index da5f6409ba..da5f6409ba 100644
--- a/branches/sca-java-1.x/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java
+++ b/sca-java-1.x/trunk/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java
diff --git a/branches/sca-java-1.x/itest/policy-security-token/pom.xml b/sca-java-1.x/trunk/itest/policy-security-token/pom.xml
index fc114918e0..fc114918e0 100644
--- a/branches/sca-java-1.x/itest/policy-security-token/pom.xml
+++ b/sca-java-1.x/trunk/itest/policy-security-token/pom.xml
diff --git a/branches/sca-java-1.x/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java b/sca-java-1.x/trunk/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java
index 769be60538..769be60538 100644
--- a/branches/sca-java-1.x/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java
+++ b/sca-java-1.x/trunk/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java
diff --git a/branches/sca-java-1.x/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/trunk/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/branches/sca-java-1.x/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/trunk/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.x/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/trunk/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java
index 60c07f6f73..60c07f6f73 100644
--- a/branches/sca-java-1.x/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/policy-security-token/src/main/resources/definitions.xml b/sca-java-1.x/trunk/itest/policy-security-token/src/main/resources/definitions.xml
index f7bb9bc374..f7bb9bc374 100644
--- a/branches/sca-java-1.x/itest/policy-security-token/src/main/resources/definitions.xml
+++ b/sca-java-1.x/trunk/itest/policy-security-token/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.x/itest/policy-security-token/src/main/resources/helloworld.composite b/sca-java-1.x/trunk/itest/policy-security-token/src/main/resources/helloworld.composite
index 1db89fd502..1db89fd502 100644
--- a/branches/sca-java-1.x/itest/policy-security-token/src/main/resources/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/policy-security-token/src/main/resources/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/policy-security-token/src/main/resources/jndi.properties b/sca-java-1.x/trunk/itest/policy-security-token/src/main/resources/jndi.properties
index 9abdff215d..9abdff215d 100644
--- a/branches/sca-java-1.x/itest/policy-security-token/src/main/resources/jndi.properties
+++ b/sca-java-1.x/trunk/itest/policy-security-token/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.x/itest/policy-security-token/src/test/java/org/apache/tuscany/sca/itest/TokenAuthTestCase.java b/sca-java-1.x/trunk/itest/policy-security-token/src/test/java/org/apache/tuscany/sca/itest/TokenAuthTestCase.java
index b0ae00b639..b0ae00b639 100644
--- a/branches/sca-java-1.x/itest/policy-security-token/src/test/java/org/apache/tuscany/sca/itest/TokenAuthTestCase.java
+++ b/sca-java-1.x/trunk/itest/policy-security-token/src/test/java/org/apache/tuscany/sca/itest/TokenAuthTestCase.java
diff --git a/branches/sca-java-1.x/itest/policy-security/pom.xml b/sca-java-1.x/trunk/itest/policy-security/pom.xml
index ce7842d5c6..ce7842d5c6 100644
--- a/branches/sca-java-1.x/itest/policy-security/pom.xml
+++ b/sca-java-1.x/trunk/itest/policy-security/pom.xml
diff --git a/branches/sca-java-1.x/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/trunk/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/branches/sca-java-1.x/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/trunk/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.x/itest/policy-security/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/trunk/itest/policy-security/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/branches/sca-java-1.x/itest/policy-security/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/trunk/itest/policy-security/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.x/itest/policy-security/src/main/resources/definitions.xml b/sca-java-1.x/trunk/itest/policy-security/src/main/resources/definitions.xml
index c8118a0caf..c8118a0caf 100644
--- a/branches/sca-java-1.x/itest/policy-security/src/main/resources/definitions.xml
+++ b/sca-java-1.x/trunk/itest/policy-security/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.x/itest/policy-security/src/main/resources/helloworld.composite b/sca-java-1.x/trunk/itest/policy-security/src/main/resources/helloworld.composite
index 9e0f289f87..9e0f289f87 100644
--- a/branches/sca-java-1.x/itest/policy-security/src/main/resources/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/policy-security/src/main/resources/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java b/sca-java-1.x/trunk/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java
index 9dad17741e..9dad17741e 100644
--- a/branches/sca-java-1.x/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java
+++ b/sca-java-1.x/trunk/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java
diff --git a/branches/sca-java-1.x/itest/policy/pom.xml b/sca-java-1.x/trunk/itest/policy/pom.xml
index ceb3e7dbe3..ceb3e7dbe3 100644
--- a/branches/sca-java-1.x/itest/policy/pom.xml
+++ b/sca-java-1.x/trunk/itest/policy/pom.xml
diff --git a/branches/sca-java-1.x/itest/policy/src/main/java/calculator/AddService.java b/sca-java-1.x/trunk/itest/policy/src/main/java/calculator/AddService.java
index 3e56bf3fad..3e56bf3fad 100644
--- a/branches/sca-java-1.x/itest/policy/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/trunk/itest/policy/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.x/itest/policy/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/trunk/itest/policy/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-java-1.x/itest/policy/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/policy/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/policy/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/trunk/itest/policy/src/main/java/calculator/CalculatorClient.java
index 9abc488523..9abc488523 100644
--- a/branches/sca-java-1.x/itest/policy/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/trunk/itest/policy/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.x/itest/policy/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/trunk/itest/policy/src/main/java/calculator/CalculatorService.java
index a1880698ea..a1880698ea 100644
--- a/branches/sca-java-1.x/itest/policy/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/trunk/itest/policy/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.x/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/trunk/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java
index 28ce0ec78a..28ce0ec78a 100644
--- a/branches/sca-java-1.x/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/policy/src/main/java/calculator/DivideService.java b/sca-java-1.x/trunk/itest/policy/src/main/java/calculator/DivideService.java
index f72b05cece..f72b05cece 100644
--- a/branches/sca-java-1.x/itest/policy/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/trunk/itest/policy/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.x/itest/policy/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/trunk/itest/policy/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-java-1.x/itest/policy/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/policy/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/policy/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/trunk/itest/policy/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.x/itest/policy/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/trunk/itest/policy/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.x/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/trunk/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-java-1.x/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/policy/src/main/java/calculator/PolicyQNames.java b/sca-java-1.x/trunk/itest/policy/src/main/java/calculator/PolicyQNames.java
index 3e1bc45842..3e1bc45842 100644
--- a/branches/sca-java-1.x/itest/policy/src/main/java/calculator/PolicyQNames.java
+++ b/sca-java-1.x/trunk/itest/policy/src/main/java/calculator/PolicyQNames.java
diff --git a/branches/sca-java-1.x/itest/policy/src/main/java/calculator/SubtractService.java b/sca-java-1.x/trunk/itest/policy/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-java-1.x/itest/policy/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/trunk/itest/policy/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.x/itest/policy/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/trunk/itest/policy/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-java-1.x/itest/policy/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/policy/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java b/sca-java-1.x/trunk/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java
index 4b04a4d0b8..4b04a4d0b8 100644
--- a/branches/sca-java-1.x/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java
+++ b/sca-java-1.x/trunk/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java
diff --git a/branches/sca-java-1.x/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java b/sca-java-1.x/trunk/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java
index 3dcadd724e..3dcadd724e 100644
--- a/branches/sca-java-1.x/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java
+++ b/sca-java-1.x/trunk/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java
diff --git a/branches/sca-java-1.x/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java b/sca-java-1.x/trunk/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java
index 3d314a9d14..3d314a9d14 100644
--- a/branches/sca-java-1.x/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java
+++ b/sca-java-1.x/trunk/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java
diff --git a/branches/sca-java-1.x/itest/policy/src/main/resources/Calculator.composite b/sca-java-1.x/trunk/itest/policy/src/main/resources/Calculator.composite
index aed7684099..aed7684099 100644
--- a/branches/sca-java-1.x/itest/policy/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/policy/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/trunk/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index a20489035b..a20489035b 100644
--- a/branches/sca-java-1.x/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/trunk/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.x/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-1.x/trunk/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index d9f144b3ff..d9f144b3ff 100644
--- a/branches/sca-java-1.x/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/sca-java-1.x/trunk/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-java-1.x/itest/policy/src/main/resources/definitions.xml b/sca-java-1.x/trunk/itest/policy/src/main/resources/definitions.xml
index 0009d712f3..0009d712f3 100644
--- a/branches/sca-java-1.x/itest/policy/src/main/resources/definitions.xml
+++ b/sca-java-1.x/trunk/itest/policy/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.x/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java b/sca-java-1.x/trunk/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java
index 885e8314ef..885e8314ef 100644
--- a/branches/sca-java-1.x/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java
+++ b/sca-java-1.x/trunk/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java
diff --git a/branches/sca-java-1.x/itest/policy/src/test/java/org/apache/tuscany/sca/itest/Policy.java b/sca-java-1.x/trunk/itest/policy/src/test/java/org/apache/tuscany/sca/itest/Policy.java
index ba17755b88..ba17755b88 100644
--- a/branches/sca-java-1.x/itest/policy/src/test/java/org/apache/tuscany/sca/itest/Policy.java
+++ b/sca-java-1.x/trunk/itest/policy/src/test/java/org/apache/tuscany/sca/itest/Policy.java
diff --git a/branches/sca-java-1.x/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java b/sca-java-1.x/trunk/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java
index ff47988bce..ff47988bce 100644
--- a/branches/sca-java-1.x/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java
+++ b/sca-java-1.x/trunk/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java
diff --git a/branches/sca-java-1.x/itest/pom.xml b/sca-java-1.x/trunk/itest/pom.xml
index 14312bfade..14312bfade 100644
--- a/branches/sca-java-1.x/itest/pom.xml
+++ b/sca-java-1.x/trunk/itest/pom.xml
diff --git a/branches/sca-java-1.x/itest/promotion-interface-missmatch/pom.xml b/sca-java-1.x/trunk/itest/promotion-interface-missmatch/pom.xml
index a26b164892..a26b164892 100644
--- a/branches/sca-java-1.x/itest/promotion-interface-missmatch/pom.xml
+++ b/sca-java-1.x/trunk/itest/promotion-interface-missmatch/pom.xml
diff --git a/branches/sca-java-1.x/itest/promotion-interface-missmatch/src/main/java/com/example/BusinessException.java b/sca-java-1.x/trunk/itest/promotion-interface-missmatch/src/main/java/com/example/BusinessException.java
index 764f31b7cd..764f31b7cd 100644
--- a/branches/sca-java-1.x/itest/promotion-interface-missmatch/src/main/java/com/example/BusinessException.java
+++ b/sca-java-1.x/trunk/itest/promotion-interface-missmatch/src/main/java/com/example/BusinessException.java
diff --git a/branches/sca-java-1.x/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClient.java b/sca-java-1.x/trunk/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClient.java
index 0c72b52ed9..0c72b52ed9 100644
--- a/branches/sca-java-1.x/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClient.java
+++ b/sca-java-1.x/trunk/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClient.java
diff --git a/branches/sca-java-1.x/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java b/sca-java-1.x/trunk/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java
index d6545b5a23..d6545b5a23 100644
--- a/branches/sca-java-1.x/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java
+++ b/sca-java-1.x/trunk/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java
diff --git a/branches/sca-java-1.x/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java b/sca-java-1.x/trunk/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java
index 30ea559694..30ea559694 100644
--- a/branches/sca-java-1.x/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java
+++ b/sca-java-1.x/trunk/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java
diff --git a/branches/sca-java-1.x/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleServiceImpl.java b/sca-java-1.x/trunk/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleServiceImpl.java
index b3b6f033e5..b3b6f033e5 100644
--- a/branches/sca-java-1.x/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/promotion-interface-missmatch/src/main/resources/example.composite b/sca-java-1.x/trunk/itest/promotion-interface-missmatch/src/main/resources/example.composite
index cddf951d65..cddf951d65 100644
--- a/branches/sca-java-1.x/itest/promotion-interface-missmatch/src/main/resources/example.composite
+++ b/sca-java-1.x/trunk/itest/promotion-interface-missmatch/src/main/resources/example.composite
diff --git a/branches/sca-java-1.x/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleService.wsdl b/sca-java-1.x/trunk/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleService.wsdl
index a8ccde2e11..a8ccde2e11 100644
--- a/branches/sca-java-1.x/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleService.wsdl
+++ b/sca-java-1.x/trunk/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleService.wsdl
diff --git a/branches/sca-java-1.x/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleServiceTypes.xsd b/sca-java-1.x/trunk/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleServiceTypes.xsd
index 2caec0f20d..2caec0f20d 100644
--- a/branches/sca-java-1.x/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleServiceTypes.xsd
+++ b/sca-java-1.x/trunk/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleServiceTypes.xsd
diff --git a/branches/sca-java-1.x/itest/promotion-interface-missmatch/src/test/java/com/example/ExampleTestCase.java b/sca-java-1.x/trunk/itest/promotion-interface-missmatch/src/test/java/com/example/ExampleTestCase.java
index 740af4f43d..740af4f43d 100644
--- a/branches/sca-java-1.x/itest/promotion-interface-missmatch/src/test/java/com/example/ExampleTestCase.java
+++ b/sca-java-1.x/trunk/itest/promotion-interface-missmatch/src/test/java/com/example/ExampleTestCase.java
diff --git a/branches/sca-java-1.x/itest/properties/pom.xml b/sca-java-1.x/trunk/itest/properties/pom.xml
index 9624815357..9624815357 100644
--- a/branches/sca-java-1.x/itest/properties/pom.xml
+++ b/sca-java-1.x/trunk/itest/properties/pom.xml
diff --git a/branches/sca-java-1.x/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java b/sca-java-1.x/trunk/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
index b0fd64c9da..b0fd64c9da 100644
--- a/branches/sca-java-1.x/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
+++ b/sca-java-1.x/trunk/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
diff --git a/branches/sca-java-1.x/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java b/sca-java-1.x/trunk/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
index 51d064ba81..51d064ba81 100644
--- a/branches/sca-java-1.x/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java b/sca-java-1.x/trunk/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
index 38c26e70d6..38c26e70d6 100644
--- a/branches/sca-java-1.x/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java b/sca-java-1.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
index 68ce5a3cb6..68ce5a3cb6 100644
--- a/branches/sca-java-1.x/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
+++ b/sca-java-1.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
diff --git a/branches/sca-java-1.x/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java b/sca-java-1.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
index 6b714c0d67..6b714c0d67 100644
--- a/branches/sca-java-1.x/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java b/sca-java-1.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
index 586d4864a9..586d4864a9 100644
--- a/branches/sca-java-1.x/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
+++ b/sca-java-1.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
diff --git a/branches/sca-java-1.x/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java b/sca-java-1.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
index 5e3c985144..5e3c985144 100644
--- a/branches/sca-java-1.x/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java b/sca-java-1.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
index 52f9871d1b..52f9871d1b 100644
--- a/branches/sca-java-1.x/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
+++ b/sca-java-1.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
diff --git a/branches/sca-java-1.x/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java b/sca-java-1.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
index 5b93bd8b8a..5b93bd8b8a 100644
--- a/branches/sca-java-1.x/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java b/sca-java-1.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
index c0c068d12e..c0c068d12e 100644
--- a/branches/sca-java-1.x/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
+++ b/sca-java-1.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
diff --git a/branches/sca-java-1.x/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java b/sca-java-1.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
index acd1f26670..acd1f26670 100644
--- a/branches/sca-java-1.x/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
+++ b/sca-java-1.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
diff --git a/branches/sca-java-1.x/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java b/sca-java-1.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
index 71dce41efc..71dce41efc 100644
--- a/branches/sca-java-1.x/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java b/sca-java-1.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
index 17b4e582d6..17b4e582d6 100644
--- a/branches/sca-java-1.x/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
+++ b/sca-java-1.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
diff --git a/branches/sca-java-1.x/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java b/sca-java-1.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
index eb642b6637..eb642b6637 100644
--- a/branches/sca-java-1.x/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java b/sca-java-1.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
index a57ccd90c8..a57ccd90c8 100644
--- a/branches/sca-java-1.x/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
+++ b/sca-java-1.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
diff --git a/branches/sca-java-1.x/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java b/sca-java-1.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
index c147a2affe..c147a2affe 100644
--- a/branches/sca-java-1.x/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
+++ b/sca-java-1.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
diff --git a/branches/sca-java-1.x/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java b/sca-java-1.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
index 0a84e93828..0a84e93828 100644
--- a/branches/sca-java-1.x/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
+++ b/sca-java-1.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
diff --git a/branches/sca-java-1.x/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java b/sca-java-1.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
index 6344a8aa83..6344a8aa83 100644
--- a/branches/sca-java-1.x/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
+++ b/sca-java-1.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
diff --git a/branches/sca-java-1.x/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java b/sca-java-1.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
index 11a0a758cd..11a0a758cd 100644
--- a/branches/sca-java-1.x/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
+++ b/sca-java-1.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
diff --git a/branches/sca-java-1.x/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java b/sca-java-1.x/trunk/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
index 76bcd06fca..76bcd06fca 100644
--- a/branches/sca-java-1.x/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
+++ b/sca-java-1.x/trunk/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
diff --git a/branches/sca-java-1.x/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java b/sca-java-1.x/trunk/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
index 7a809ebf1e..7a809ebf1e 100644
--- a/branches/sca-java-1.x/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
+++ b/sca-java-1.x/trunk/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
diff --git a/branches/sca-java-1.x/itest/properties/src/main/java/test/jaxb/props/package-info.java b/sca-java-1.x/trunk/itest/properties/src/main/java/test/jaxb/props/package-info.java
index f726552a62..f726552a62 100644
--- a/branches/sca-java-1.x/itest/properties/src/main/java/test/jaxb/props/package-info.java
+++ b/sca-java-1.x/trunk/itest/properties/src/main/java/test/jaxb/props/package-info.java
diff --git a/branches/sca-java-1.x/itest/properties/src/main/resources/ConstructorPropertyInjection.composite b/sca-java-1.x/trunk/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
index 70a251fa16..70a251fa16 100644
--- a/branches/sca-java-1.x/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
+++ b/sca-java-1.x/trunk/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
diff --git a/branches/sca-java-1.x/itest/properties/src/main/resources/Outer.composite b/sca-java-1.x/trunk/itest/properties/src/main/resources/Outer.composite
index b3e529e8b5..b3e529e8b5 100644
--- a/branches/sca-java-1.x/itest/properties/src/main/resources/Outer.composite
+++ b/sca-java-1.x/trunk/itest/properties/src/main/resources/Outer.composite
diff --git a/branches/sca-java-1.x/itest/properties/src/main/resources/OuterPropertyTest.composite b/sca-java-1.x/trunk/itest/properties/src/main/resources/OuterPropertyTest.composite
index 5237e964a3..5237e964a3 100644
--- a/branches/sca-java-1.x/itest/properties/src/main/resources/OuterPropertyTest.composite
+++ b/sca-java-1.x/trunk/itest/properties/src/main/resources/OuterPropertyTest.composite
diff --git a/branches/sca-java-1.x/itest/properties/src/main/resources/PropertyTest.composite b/sca-java-1.x/trunk/itest/properties/src/main/resources/PropertyTest.composite
index 75deddbdad..75deddbdad 100644
--- a/branches/sca-java-1.x/itest/properties/src/main/resources/PropertyTest.composite
+++ b/sca-java-1.x/trunk/itest/properties/src/main/resources/PropertyTest.composite
diff --git a/branches/sca-java-1.x/itest/properties/src/main/resources/customer.xsd b/sca-java-1.x/trunk/itest/properties/src/main/resources/customer.xsd
index 8861d7e7b8..8861d7e7b8 100644
--- a/branches/sca-java-1.x/itest/properties/src/main/resources/customer.xsd
+++ b/sca-java-1.x/trunk/itest/properties/src/main/resources/customer.xsd
diff --git a/branches/sca-java-1.x/itest/properties/src/main/resources/fileProperty.txt b/sca-java-1.x/trunk/itest/properties/src/main/resources/fileProperty.txt
index 0d3d9ead83..0d3d9ead83 100644
--- a/branches/sca-java-1.x/itest/properties/src/main/resources/fileProperty.txt
+++ b/sca-java-1.x/trunk/itest/properties/src/main/resources/fileProperty.txt
diff --git a/branches/sca-java-1.x/itest/properties/src/main/resources/manyValuesFileProperty.txt b/sca-java-1.x/trunk/itest/properties/src/main/resources/manyValuesFileProperty.txt
index 450f397b30..450f397b30 100644
--- a/branches/sca-java-1.x/itest/properties/src/main/resources/manyValuesFileProperty.txt
+++ b/sca-java-1.x/trunk/itest/properties/src/main/resources/manyValuesFileProperty.txt
diff --git a/branches/sca-java-1.x/itest/properties/src/main/resources/mySimpleService.composite b/sca-java-1.x/trunk/itest/properties/src/main/resources/mySimpleService.composite
index 75fdd24add..75fdd24add 100644
--- a/branches/sca-java-1.x/itest/properties/src/main/resources/mySimpleService.composite
+++ b/sca-java-1.x/trunk/itest/properties/src/main/resources/mySimpleService.composite
diff --git a/branches/sca-java-1.x/itest/properties/src/main/resources/rcProps.txt b/sca-java-1.x/trunk/itest/properties/src/main/resources/rcProps.txt
index 052c291fd0..052c291fd0 100644
--- a/branches/sca-java-1.x/itest/properties/src/main/resources/rcProps.txt
+++ b/sca-java-1.x/trunk/itest/properties/src/main/resources/rcProps.txt
diff --git a/branches/sca-java-1.x/itest/properties/src/main/resources/rcprops.xsd b/sca-java-1.x/trunk/itest/properties/src/main/resources/rcprops.xsd
index 21289fa7b2..21289fa7b2 100644
--- a/branches/sca-java-1.x/itest/properties/src/main/resources/rcprops.xsd
+++ b/sca-java-1.x/trunk/itest/properties/src/main/resources/rcprops.xsd
diff --git a/branches/sca-java-1.x/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java b/sca-java-1.x/trunk/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
index 8cf182e24a..8cf182e24a 100644
--- a/branches/sca-java-1.x/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
+++ b/sca-java-1.x/trunk/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
diff --git a/branches/sca-java-1.x/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java b/sca-java-1.x/trunk/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
index 28357c5bbe..28357c5bbe 100644
--- a/branches/sca-java-1.x/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
+++ b/sca-java-1.x/trunk/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
diff --git a/branches/sca-java-1.x/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java b/sca-java-1.x/trunk/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
index 6979659ece..6979659ece 100644
--- a/branches/sca-java-1.x/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
+++ b/sca-java-1.x/trunk/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
diff --git a/branches/sca-java-1.x/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java b/sca-java-1.x/trunk/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
index 8ee5dce91f..8ee5dce91f 100644
--- a/branches/sca-java-1.x/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
+++ b/sca-java-1.x/trunk/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
diff --git a/branches/sca-java-1.x/itest/recursive-multi-level/pom.xml b/sca-java-1.x/trunk/itest/recursive-multi-level/pom.xml
index b18e5f6914..b18e5f6914 100644
--- a/branches/sca-java-1.x/itest/recursive-multi-level/pom.xml
+++ b/sca-java-1.x/trunk/itest/recursive-multi-level/pom.xml
diff --git a/branches/sca-java-1.x/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java b/sca-java-1.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
index 214d4d8a1f..214d4d8a1f 100644
--- a/branches/sca-java-1.x/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
+++ b/sca-java-1.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
diff --git a/branches/sca-java-1.x/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java b/sca-java-1.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
index 51948a3b81..51948a3b81 100644
--- a/branches/sca-java-1.x/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java b/sca-java-1.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
index 08df8ade17..08df8ade17 100644
--- a/branches/sca-java-1.x/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
+++ b/sca-java-1.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
diff --git a/branches/sca-java-1.x/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java b/sca-java-1.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
index 2ad9f815f0..2ad9f815f0 100644
--- a/branches/sca-java-1.x/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite b/sca-java-1.x/trunk/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
index 975f61c664..975f61c664 100644
--- a/branches/sca-java-1.x/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
+++ b/sca-java-1.x/trunk/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
diff --git a/branches/sca-java-1.x/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite b/sca-java-1.x/trunk/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
index f9bbcc76d8..f9bbcc76d8 100644
--- a/branches/sca-java-1.x/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
+++ b/sca-java-1.x/trunk/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
diff --git a/branches/sca-java-1.x/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite b/sca-java-1.x/trunk/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
index 09fd10fb7e..09fd10fb7e 100644
--- a/branches/sca-java-1.x/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
+++ b/sca-java-1.x/trunk/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
diff --git a/branches/sca-java-1.x/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java b/sca-java-1.x/trunk/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
index d8d6fe0dc5..d8d6fe0dc5 100644
--- a/branches/sca-java-1.x/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
+++ b/sca-java-1.x/trunk/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
diff --git a/branches/sca-java-1.x/itest/recursive-ws/pom.xml b/sca-java-1.x/trunk/itest/recursive-ws/pom.xml
index e3110d3f86..e3110d3f86 100644
--- a/branches/sca-java-1.x/itest/recursive-ws/pom.xml
+++ b/sca-java-1.x/trunk/itest/recursive-ws/pom.xml
diff --git a/branches/sca-java-1.x/itest/recursive-ws/src/main/java/policy/Target.java b/sca-java-1.x/trunk/itest/recursive-ws/src/main/java/policy/Target.java
index c77fcea868..c77fcea868 100644
--- a/branches/sca-java-1.x/itest/recursive-ws/src/main/java/policy/Target.java
+++ b/sca-java-1.x/trunk/itest/recursive-ws/src/main/java/policy/Target.java
diff --git a/branches/sca-java-1.x/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java b/sca-java-1.x/trunk/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java
index 87e412829e..87e412829e 100644
--- a/branches/sca-java-1.x/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java
+++ b/sca-java-1.x/trunk/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java
diff --git a/branches/sca-java-1.x/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java b/sca-java-1.x/trunk/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java
index e565055252..e565055252 100644
--- a/branches/sca-java-1.x/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/recursive-ws/src/main/java/recursive/Composer.java b/sca-java-1.x/trunk/itest/recursive-ws/src/main/java/recursive/Composer.java
index e53f99d9c3..e53f99d9c3 100644
--- a/branches/sca-java-1.x/itest/recursive-ws/src/main/java/recursive/Composer.java
+++ b/sca-java-1.x/trunk/itest/recursive-ws/src/main/java/recursive/Composer.java
diff --git a/branches/sca-java-1.x/itest/recursive-ws/src/main/java/recursive/ComposerClient.java b/sca-java-1.x/trunk/itest/recursive-ws/src/main/java/recursive/ComposerClient.java
index 7956d153cb..7956d153cb 100644
--- a/branches/sca-java-1.x/itest/recursive-ws/src/main/java/recursive/ComposerClient.java
+++ b/sca-java-1.x/trunk/itest/recursive-ws/src/main/java/recursive/ComposerClient.java
diff --git a/branches/sca-java-1.x/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java b/sca-java-1.x/trunk/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java
index 3d75b7b165..3d75b7b165 100644
--- a/branches/sca-java-1.x/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java
+++ b/sca-java-1.x/trunk/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java
diff --git a/branches/sca-java-1.x/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java b/sca-java-1.x/trunk/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java
index 8b77484922..8b77484922 100644
--- a/branches/sca-java-1.x/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java
+++ b/sca-java-1.x/trunk/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java
diff --git a/branches/sca-java-1.x/itest/recursive-ws/src/main/java/recursive/ComposerServer.java b/sca-java-1.x/trunk/itest/recursive-ws/src/main/java/recursive/ComposerServer.java
index 5035d1cbd9..5035d1cbd9 100644
--- a/branches/sca-java-1.x/itest/recursive-ws/src/main/java/recursive/ComposerServer.java
+++ b/sca-java-1.x/trunk/itest/recursive-ws/src/main/java/recursive/ComposerServer.java
diff --git a/branches/sca-java-1.x/itest/recursive-ws/src/main/resources/Client.composite b/sca-java-1.x/trunk/itest/recursive-ws/src/main/resources/Client.composite
index 56d7c01377..56d7c01377 100644
--- a/branches/sca-java-1.x/itest/recursive-ws/src/main/resources/Client.composite
+++ b/sca-java-1.x/trunk/itest/recursive-ws/src/main/resources/Client.composite
diff --git a/branches/sca-java-1.x/itest/recursive-ws/src/main/resources/Inner.composite b/sca-java-1.x/trunk/itest/recursive-ws/src/main/resources/Inner.composite
index b054ae0944..b054ae0944 100644
--- a/branches/sca-java-1.x/itest/recursive-ws/src/main/resources/Inner.composite
+++ b/sca-java-1.x/trunk/itest/recursive-ws/src/main/resources/Inner.composite
diff --git a/branches/sca-java-1.x/itest/recursive-ws/src/main/resources/Outer.composite b/sca-java-1.x/trunk/itest/recursive-ws/src/main/resources/Outer.composite
index 3c3f327b28..3c3f327b28 100644
--- a/branches/sca-java-1.x/itest/recursive-ws/src/main/resources/Outer.composite
+++ b/sca-java-1.x/trunk/itest/recursive-ws/src/main/resources/Outer.composite
diff --git a/branches/sca-java-1.x/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite b/sca-java-1.x/trunk/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite
index b5c180919c..b5c180919c 100644
--- a/branches/sca-java-1.x/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite
+++ b/sca-java-1.x/trunk/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite
diff --git a/branches/sca-java-1.x/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite b/sca-java-1.x/trunk/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite
index 891cac0b79..891cac0b79 100644
--- a/branches/sca-java-1.x/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite
+++ b/sca-java-1.x/trunk/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite
diff --git a/branches/sca-java-1.x/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite b/sca-java-1.x/trunk/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite
index 4b398743eb..4b398743eb 100644
--- a/branches/sca-java-1.x/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite
+++ b/sca-java-1.x/trunk/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite
diff --git a/branches/sca-java-1.x/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite b/sca-java-1.x/trunk/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite
index b50bc29a1f..b50bc29a1f 100644
--- a/branches/sca-java-1.x/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite
+++ b/sca-java-1.x/trunk/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite
diff --git a/branches/sca-java-1.x/itest/recursive-ws/src/main/resources/policy/definitions.xml b/sca-java-1.x/trunk/itest/recursive-ws/src/main/resources/policy/definitions.xml
index 3ae202f4aa..3ae202f4aa 100644
--- a/branches/sca-java-1.x/itest/recursive-ws/src/main/resources/policy/definitions.xml
+++ b/sca-java-1.x/trunk/itest/recursive-ws/src/main/resources/policy/definitions.xml
diff --git a/branches/sca-java-1.x/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java b/sca-java-1.x/trunk/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java
index c6e46564f0..c6e46564f0 100644
--- a/branches/sca-java-1.x/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java
+++ b/sca-java-1.x/trunk/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java
diff --git a/branches/sca-java-1.x/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java b/sca-java-1.x/trunk/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java
index 3e71246da2..3e71246da2 100644
--- a/branches/sca-java-1.x/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java
+++ b/sca-java-1.x/trunk/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java
diff --git a/branches/sca-java-1.x/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java b/sca-java-1.x/trunk/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java
index 6638d65551..6638d65551 100644
--- a/branches/sca-java-1.x/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java
+++ b/sca-java-1.x/trunk/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java
diff --git a/branches/sca-java-1.x/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java b/sca-java-1.x/trunk/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java
index 214379bcea..214379bcea 100644
--- a/branches/sca-java-1.x/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java
+++ b/sca-java-1.x/trunk/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java
diff --git a/branches/sca-java-1.x/itest/recursive/pom.xml b/sca-java-1.x/trunk/itest/recursive/pom.xml
index a3d5ba9e1b..a3d5ba9e1b 100644
--- a/branches/sca-java-1.x/itest/recursive/pom.xml
+++ b/sca-java-1.x/trunk/itest/recursive/pom.xml
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/java/circular/include/DemoClass.java b/sca-java-1.x/trunk/itest/recursive/src/main/java/circular/include/DemoClass.java
index fe42911486..fe42911486 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/java/circular/include/DemoClass.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/java/circular/include/DemoClass.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/java/composite/CompositeClient.java b/sca-java-1.x/trunk/itest/recursive/src/main/java/composite/CompositeClient.java
index 5edc305970..5edc305970 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/java/composite/CompositeClient.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/java/composite/CompositeClient.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/java/composite/Source.java b/sca-java-1.x/trunk/itest/recursive/src/main/java/composite/Source.java
index d0efcc1df1..d0efcc1df1 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/java/composite/Source.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/java/composite/Source.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/java/composite/SourceCallback.java b/sca-java-1.x/trunk/itest/recursive/src/main/java/composite/SourceCallback.java
index baa95a8e39..baa95a8e39 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/java/composite/SourceCallback.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/java/composite/SourceCallback.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/java/composite/SourceImpl.java b/sca-java-1.x/trunk/itest/recursive/src/main/java/composite/SourceImpl.java
index 72bf552a1e..72bf552a1e 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/java/composite/SourceImpl.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/java/composite/SourceImpl.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/java/composite/Target.java b/sca-java-1.x/trunk/itest/recursive/src/main/java/composite/Target.java
index 9a8f68a7fa..9a8f68a7fa 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/java/composite/Target.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/java/composite/Target.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/java/composite/TargetImpl.java b/sca-java-1.x/trunk/itest/recursive/src/main/java/composite/TargetImpl.java
index e744aa7967..e744aa7967 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/java/composite/TargetImpl.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/java/composite/TargetImpl.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/java/foo/A.java b/sca-java-1.x/trunk/itest/recursive/src/main/java/foo/A.java
index e87cbde26d..e87cbde26d 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/java/foo/A.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/java/foo/A.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/java/foo/B.java b/sca-java-1.x/trunk/itest/recursive/src/main/java/foo/B.java
index 9d060cab59..9d060cab59 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/java/foo/B.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/java/foo/B.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/java/foo/I.java b/sca-java-1.x/trunk/itest/recursive/src/main/java/foo/I.java
index f6d55baef3..f6d55baef3 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/java/foo/I.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/java/foo/I.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/java/policy/Target.java b/sca-java-1.x/trunk/itest/recursive/src/main/java/policy/Target.java
index c77fcea868..c77fcea868 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/java/policy/Target.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/java/policy/Target.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/java/policy/TargetClientImpl.java b/sca-java-1.x/trunk/itest/recursive/src/main/java/policy/TargetClientImpl.java
index 87e412829e..87e412829e 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/java/policy/TargetClientImpl.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/java/policy/TargetClientImpl.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/java/policy/TargetServiceImpl.java b/sca-java-1.x/trunk/itest/recursive/src/main/java/policy/TargetServiceImpl.java
index e565055252..e565055252 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/java/policy/TargetServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/java/policy/TargetServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/java/sample/ComponentAImpl.java b/sca-java-1.x/trunk/itest/recursive/src/main/java/sample/ComponentAImpl.java
index f513949105..f513949105 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/java/sample/ComponentAImpl.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/java/sample/ComponentAImpl.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/java/sample/ComponentCImpl.java b/sca-java-1.x/trunk/itest/recursive/src/main/java/sample/ComponentCImpl.java
index 586a9ee6a7..586a9ee6a7 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/java/sample/ComponentCImpl.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/java/sample/ComponentCImpl.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/java/sample/ComponentEImpl.java b/sca-java-1.x/trunk/itest/recursive/src/main/java/sample/ComponentEImpl.java
index dbf2735aa7..dbf2735aa7 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/java/sample/ComponentEImpl.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/java/sample/ComponentEImpl.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/java/sample/ComponentFImpl.java b/sca-java-1.x/trunk/itest/recursive/src/main/java/sample/ComponentFImpl.java
index 5e136e536c..5e136e536c 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/java/sample/ComponentFImpl.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/java/sample/ComponentFImpl.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/java/sample/Service1.java b/sca-java-1.x/trunk/itest/recursive/src/main/java/sample/Service1.java
index 81bdce79f1..81bdce79f1 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/java/sample/Service1.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/java/sample/Service1.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/java/test/Aggregator.java b/sca-java-1.x/trunk/itest/recursive/src/main/java/test/Aggregator.java
index 88b3bed1b2..88b3bed1b2 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/java/test/Aggregator.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/java/test/Aggregator.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/java/test/AggregatorImpl.java b/sca-java-1.x/trunk/itest/recursive/src/main/java/test/AggregatorImpl.java
index f6ac6c8741..f6ac6c8741 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/java/test/AggregatorImpl.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/java/test/AggregatorImpl.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/java/test/InnerSourceImpl.java b/sca-java-1.x/trunk/itest/recursive/src/main/java/test/InnerSourceImpl.java
index c8dad5ae35..c8dad5ae35 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/java/test/InnerSourceImpl.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/java/test/InnerSourceImpl.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/java/test/OuterSourceImpl.java b/sca-java-1.x/trunk/itest/recursive/src/main/java/test/OuterSourceImpl.java
index 11816e82cf..11816e82cf 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/java/test/OuterSourceImpl.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/java/test/OuterSourceImpl.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/java/test/Source.java b/sca-java-1.x/trunk/itest/recursive/src/main/java/test/Source.java
index 9b93740d9d..9b93740d9d 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/java/test/Source.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/java/test/Source.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/java/test1/composite/Target.java b/sca-java-1.x/trunk/itest/recursive/src/main/java/test1/composite/Target.java
index 4883e12f49..4883e12f49 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/java/test1/composite/Target.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/java/test1/composite/Target.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/java/test1/composite/TargetOne.java b/sca-java-1.x/trunk/itest/recursive/src/main/java/test1/composite/TargetOne.java
index a7c68f4ffd..a7c68f4ffd 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/java/test1/composite/TargetOne.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/java/test1/composite/TargetOne.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/java/test1/composite/TargetTwo.java b/sca-java-1.x/trunk/itest/recursive/src/main/java/test1/composite/TargetTwo.java
index 7fff8e2e9b..7fff8e2e9b 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/java/test1/composite/TargetTwo.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/java/test1/composite/TargetTwo.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/resources/AComposite.composite b/sca-java-1.x/trunk/itest/recursive/src/main/resources/AComposite.composite
index 1b5dee8762..1b5dee8762 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/resources/AComposite.composite
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/resources/AComposite.composite
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/resources/BComposite.composite b/sca-java-1.x/trunk/itest/recursive/src/main/resources/BComposite.composite
index 7d4588eba4..7d4588eba4 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/resources/BComposite.composite
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/resources/BComposite.composite
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/resources/CComposite.composite b/sca-java-1.x/trunk/itest/recursive/src/main/resources/CComposite.composite
index 6d7b4ec600..6d7b4ec600 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/resources/CComposite.composite
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/resources/CComposite.composite
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/resources/Composite1.composite b/sca-java-1.x/trunk/itest/recursive/src/main/resources/Composite1.composite
index 56fd7c621f..56fd7c621f 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/resources/Composite1.composite
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/resources/Composite1.composite
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/resources/Composite2.composite b/sca-java-1.x/trunk/itest/recursive/src/main/resources/Composite2.composite
index 54f10673a4..54f10673a4 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/resources/Composite2.composite
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/resources/Composite2.composite
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/resources/Composite3.composite b/sca-java-1.x/trunk/itest/recursive/src/main/resources/Composite3.composite
index 040653493f..040653493f 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/resources/Composite3.composite
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/resources/Composite3.composite
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/resources/Demo1Composite.composite b/sca-java-1.x/trunk/itest/recursive/src/main/resources/Demo1Composite.composite
index 6b2a964b9b..6b2a964b9b 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/resources/Demo1Composite.composite
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/resources/Demo1Composite.composite
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/resources/Demo2Composite.composite b/sca-java-1.x/trunk/itest/recursive/src/main/resources/Demo2Composite.composite
index 6b8c0a348e..6b8c0a348e 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/resources/Demo2Composite.composite
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/resources/Demo2Composite.composite
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/resources/Inner.composite b/sca-java-1.x/trunk/itest/recursive/src/main/resources/Inner.composite
index 398ebdf6e2..398ebdf6e2 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/resources/Inner.composite
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/resources/Inner.composite
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/resources/InnerComposite.composite b/sca-java-1.x/trunk/itest/recursive/src/main/resources/InnerComposite.composite
index 3376ac8ff5..3376ac8ff5 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/resources/InnerComposite.composite
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/resources/InnerComposite.composite
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/resources/InnerComposite2.composite b/sca-java-1.x/trunk/itest/recursive/src/main/resources/InnerComposite2.composite
index c9eff4fa9d..c9eff4fa9d 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/resources/InnerComposite2.composite
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/resources/InnerComposite2.composite
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/recursive/src/main/resources/META-INF/sca-contribution.xml
index 289b92a3f2..289b92a3f2 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/resources/Outer.composite b/sca-java-1.x/trunk/itest/recursive/src/main/resources/Outer.composite
index 987990d854..987990d854 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/resources/Outer.composite
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/resources/Outer.composite
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/resources/OuterComposite.composite b/sca-java-1.x/trunk/itest/recursive/src/main/resources/OuterComposite.composite
index cb1c1e13d4..cb1c1e13d4 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/resources/OuterComposite.composite
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/resources/OuterComposite.composite
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/resources/foo/foo.png b/sca-java-1.x/trunk/itest/recursive/src/main/resources/foo/foo.png
index 0f2ec78aaf..0f2ec78aaf 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/resources/foo/foo.png
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/resources/foo/foo.png
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/resources/foo/o1.composite b/sca-java-1.x/trunk/itest/recursive/src/main/resources/foo/o1.composite
index 1d31c2f424..1d31c2f424 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/resources/foo/o1.composite
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/resources/foo/o1.composite
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/resources/foo/o2.composite b/sca-java-1.x/trunk/itest/recursive/src/main/resources/foo/o2.composite
index 4f21c21860..4f21c21860 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/resources/foo/o2.composite
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/resources/foo/o2.composite
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/resources/foo/o3.composite b/sca-java-1.x/trunk/itest/recursive/src/main/resources/foo/o3.composite
index 72c732c03e..72c732c03e 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/resources/foo/o3.composite
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/resources/foo/o3.composite
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/resources/foo/o4.composite b/sca-java-1.x/trunk/itest/recursive/src/main/resources/foo/o4.composite
index f8f07eed09..f8f07eed09 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/resources/foo/o4.composite
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/resources/foo/o4.composite
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/resources/policy/PolicyInnerComposite.composite b/sca-java-1.x/trunk/itest/recursive/src/main/resources/policy/PolicyInnerComposite.composite
index 4a6df023b8..4a6df023b8 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/resources/policy/PolicyInnerComposite.composite
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/resources/policy/PolicyInnerComposite.composite
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/resources/policy/PolicyOuterComposite.composite b/sca-java-1.x/trunk/itest/recursive/src/main/resources/policy/PolicyOuterComposite.composite
index 25007aebb2..25007aebb2 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/resources/policy/PolicyOuterComposite.composite
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/resources/policy/PolicyOuterComposite.composite
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/resources/policy/definitions.xml b/sca-java-1.x/trunk/itest/recursive/src/main/resources/policy/definitions.xml
index 957028e3bd..957028e3bd 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/resources/policy/definitions.xml
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/resources/policy/definitions.xml
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/resources/test1/InnerComposite.composite b/sca-java-1.x/trunk/itest/recursive/src/main/resources/test1/InnerComposite.composite
index 177fa10550..177fa10550 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/resources/test1/InnerComposite.composite
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/resources/test1/InnerComposite.composite
diff --git a/branches/sca-java-1.x/itest/recursive/src/main/resources/test1/OuterComposite.composite b/sca-java-1.x/trunk/itest/recursive/src/main/resources/test1/OuterComposite.composite
index d05a67f45f..d05a67f45f 100644
--- a/branches/sca-java-1.x/itest/recursive/src/main/resources/test1/OuterComposite.composite
+++ b/sca-java-1.x/trunk/itest/recursive/src/main/resources/test1/OuterComposite.composite
diff --git a/branches/sca-java-1.x/itest/recursive/src/test/java/circular/include/CircularIncludeTestCase.java b/sca-java-1.x/trunk/itest/recursive/src/test/java/circular/include/CircularIncludeTestCase.java
index 1f7c35dd91..1f7c35dd91 100644
--- a/branches/sca-java-1.x/itest/recursive/src/test/java/circular/include/CircularIncludeTestCase.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/test/java/circular/include/CircularIncludeTestCase.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/test/java/composite/CompositeTestCase.java b/sca-java-1.x/trunk/itest/recursive/src/test/java/composite/CompositeTestCase.java
index 928cb3fea9..928cb3fea9 100644
--- a/branches/sca-java-1.x/itest/recursive/src/test/java/composite/CompositeTestCase.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/test/java/composite/CompositeTestCase.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java b/sca-java-1.x/trunk/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
index f042113f7a..f042113f7a 100644
--- a/branches/sca-java-1.x/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java b/sca-java-1.x/trunk/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
index 87eb948452..87eb948452 100644
--- a/branches/sca-java-1.x/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/test/java/foo/O2TestCase.java b/sca-java-1.x/trunk/itest/recursive/src/test/java/foo/O2TestCase.java
index d617ec8592..d617ec8592 100644
--- a/branches/sca-java-1.x/itest/recursive/src/test/java/foo/O2TestCase.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/test/java/foo/O2TestCase.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/test/java/foo/O4TestCase.java b/sca-java-1.x/trunk/itest/recursive/src/test/java/foo/O4TestCase.java
index 15626c75ac..15626c75ac 100644
--- a/branches/sca-java-1.x/itest/recursive/src/test/java/foo/O4TestCase.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/test/java/foo/O4TestCase.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/test/java/policy/PolicyTestCase.java b/sca-java-1.x/trunk/itest/recursive/src/test/java/policy/PolicyTestCase.java
index c9cc84f7d4..c9cc84f7d4 100644
--- a/branches/sca-java-1.x/itest/recursive/src/test/java/policy/PolicyTestCase.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/test/java/policy/PolicyTestCase.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/test/java/sample/C.java b/sca-java-1.x/trunk/itest/recursive/src/test/java/sample/C.java
index bf8391348b..bf8391348b 100644
--- a/branches/sca-java-1.x/itest/recursive/src/test/java/sample/C.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/test/java/sample/C.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/test/java/sample/CImpl.java b/sca-java-1.x/trunk/itest/recursive/src/test/java/sample/CImpl.java
index 466284983e..466284983e 100644
--- a/branches/sca-java-1.x/itest/recursive/src/test/java/sample/CImpl.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/test/java/sample/CImpl.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/test/java/sample/NestedTestCase.java b/sca-java-1.x/trunk/itest/recursive/src/test/java/sample/NestedTestCase.java
index fc5d251460..fc5d251460 100644
--- a/branches/sca-java-1.x/itest/recursive/src/test/java/sample/NestedTestCase.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/test/java/sample/NestedTestCase.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java b/sca-java-1.x/trunk/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java
index a543add69b..a543add69b 100644
--- a/branches/sca-java-1.x/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/test/java/sample/X.java b/sca-java-1.x/trunk/itest/recursive/src/test/java/sample/X.java
index e3a9335068..e3a9335068 100644
--- a/branches/sca-java-1.x/itest/recursive/src/test/java/sample/X.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/test/java/sample/X.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/test/java/sample/XImpl.java b/sca-java-1.x/trunk/itest/recursive/src/test/java/sample/XImpl.java
index e430807568..e430807568 100644
--- a/branches/sca-java-1.x/itest/recursive/src/test/java/sample/XImpl.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/test/java/sample/XImpl.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/test/java/sample/Y.java b/sca-java-1.x/trunk/itest/recursive/src/test/java/sample/Y.java
index c15a4f635a..c15a4f635a 100644
--- a/branches/sca-java-1.x/itest/recursive/src/test/java/sample/Y.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/test/java/sample/Y.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/test/java/sample/YImpl.java b/sca-java-1.x/trunk/itest/recursive/src/test/java/sample/YImpl.java
index 994c9eb95f..994c9eb95f 100644
--- a/branches/sca-java-1.x/itest/recursive/src/test/java/sample/YImpl.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/test/java/sample/YImpl.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/test/java/test/InnerTestCase.java b/sca-java-1.x/trunk/itest/recursive/src/test/java/test/InnerTestCase.java
index ebb4bc7acb..ebb4bc7acb 100644
--- a/branches/sca-java-1.x/itest/recursive/src/test/java/test/InnerTestCase.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/test/java/test/InnerTestCase.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/test/java/test/OuterTestCase.java b/sca-java-1.x/trunk/itest/recursive/src/test/java/test/OuterTestCase.java
index 6e95f5808b..6e95f5808b 100644
--- a/branches/sca-java-1.x/itest/recursive/src/test/java/test/OuterTestCase.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/test/java/test/OuterTestCase.java
diff --git a/branches/sca-java-1.x/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java b/sca-java-1.x/trunk/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java
index b3abcac06e..b3abcac06e 100644
--- a/branches/sca-java-1.x/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java
+++ b/sca-java-1.x/trunk/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java
diff --git a/branches/sca-java-1.x/itest/references-collection/pom.xml b/sca-java-1.x/trunk/itest/references-collection/pom.xml
index 31ca4e6907..31ca4e6907 100644
--- a/branches/sca-java-1.x/itest/references-collection/pom.xml
+++ b/sca-java-1.x/trunk/itest/references-collection/pom.xml
diff --git a/branches/sca-java-1.x/itest/references-collection/src/main/java/crawler/Crawler.java b/sca-java-1.x/trunk/itest/references-collection/src/main/java/crawler/Crawler.java
index 2607e9aabc..2607e9aabc 100644
--- a/branches/sca-java-1.x/itest/references-collection/src/main/java/crawler/Crawler.java
+++ b/sca-java-1.x/trunk/itest/references-collection/src/main/java/crawler/Crawler.java
diff --git a/branches/sca-java-1.x/itest/references-collection/src/main/java/crawler/CrawlerController.java b/sca-java-1.x/trunk/itest/references-collection/src/main/java/crawler/CrawlerController.java
index 11b1b6b580..11b1b6b580 100644
--- a/branches/sca-java-1.x/itest/references-collection/src/main/java/crawler/CrawlerController.java
+++ b/sca-java-1.x/trunk/itest/references-collection/src/main/java/crawler/CrawlerController.java
diff --git a/branches/sca-java-1.x/itest/references-collection/src/main/java/crawler/impl/CrawlerControllerImpl.java b/sca-java-1.x/trunk/itest/references-collection/src/main/java/crawler/impl/CrawlerControllerImpl.java
index 1ca2a3797a..1ca2a3797a 100644
--- a/branches/sca-java-1.x/itest/references-collection/src/main/java/crawler/impl/CrawlerControllerImpl.java
+++ b/sca-java-1.x/trunk/itest/references-collection/src/main/java/crawler/impl/CrawlerControllerImpl.java
diff --git a/branches/sca-java-1.x/itest/references-collection/src/main/java/crawler/impl/CrawlerImpl.java b/sca-java-1.x/trunk/itest/references-collection/src/main/java/crawler/impl/CrawlerImpl.java
index 0224d7750e..0224d7750e 100644
--- a/branches/sca-java-1.x/itest/references-collection/src/main/java/crawler/impl/CrawlerImpl.java
+++ b/sca-java-1.x/trunk/itest/references-collection/src/main/java/crawler/impl/CrawlerImpl.java
diff --git a/branches/sca-java-1.x/itest/references-collection/src/main/java/crawler/impl/SpecialCrawlerImpl.java b/sca-java-1.x/trunk/itest/references-collection/src/main/java/crawler/impl/SpecialCrawlerImpl.java
index e486a23e23..e486a23e23 100644
--- a/branches/sca-java-1.x/itest/references-collection/src/main/java/crawler/impl/SpecialCrawlerImpl.java
+++ b/sca-java-1.x/trunk/itest/references-collection/src/main/java/crawler/impl/SpecialCrawlerImpl.java
diff --git a/branches/sca-java-1.x/itest/references-collection/src/main/resources/test.composite b/sca-java-1.x/trunk/itest/references-collection/src/main/resources/test.composite
index ed3adfc7ae..ed3adfc7ae 100644
--- a/branches/sca-java-1.x/itest/references-collection/src/main/resources/test.composite
+++ b/sca-java-1.x/trunk/itest/references-collection/src/main/resources/test.composite
diff --git a/branches/sca-java-1.x/itest/references-collection/src/test/java/crawler/ReferenceMultiplicityTestCase.java b/sca-java-1.x/trunk/itest/references-collection/src/test/java/crawler/ReferenceMultiplicityTestCase.java
index 1fc0e758c4..1fc0e758c4 100644
--- a/branches/sca-java-1.x/itest/references-collection/src/test/java/crawler/ReferenceMultiplicityTestCase.java
+++ b/sca-java-1.x/trunk/itest/references-collection/src/test/java/crawler/ReferenceMultiplicityTestCase.java
diff --git a/branches/sca-java-1.x/itest/references/pom.xml b/sca-java-1.x/trunk/itest/references/pom.xml
index eb6f079a34..eb6f079a34 100644
--- a/branches/sca-java-1.x/itest/references/pom.xml
+++ b/sca-java-1.x/trunk/itest/references/pom.xml
diff --git a/branches/sca-java-1.x/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java b/sca-java-1.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
index f8c0850118..f8c0850118 100644
--- a/branches/sca-java-1.x/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
+++ b/sca-java-1.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
diff --git a/branches/sca-java-1.x/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java b/sca-java-1.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
index 647fff0159..647fff0159 100644
--- a/branches/sca-java-1.x/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java b/sca-java-1.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
index 785920bb2d..785920bb2d 100644
--- a/branches/sca-java-1.x/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
+++ b/sca-java-1.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
diff --git a/branches/sca-java-1.x/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java b/sca-java-1.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
index 6b1065ab0d..6b1065ab0d 100644
--- a/branches/sca-java-1.x/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java b/sca-java-1.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java
index 1cd7cb7fe5..1cd7cb7fe5 100644
--- a/branches/sca-java-1.x/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java
+++ b/sca-java-1.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java
diff --git a/branches/sca-java-1.x/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java b/sca-java-1.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
index d436c28adc..d436c28adc 100644
--- a/branches/sca-java-1.x/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
+++ b/sca-java-1.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
diff --git a/branches/sca-java-1.x/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java b/sca-java-1.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
index a1823e1cdc..a1823e1cdc 100644
--- a/branches/sca-java-1.x/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java b/sca-java-1.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
index 2618ec7095..2618ec7095 100644
--- a/branches/sca-java-1.x/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
+++ b/sca-java-1.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
diff --git a/branches/sca-java-1.x/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java b/sca-java-1.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
index 79c802bc97..79c802bc97 100644
--- a/branches/sca-java-1.x/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/references/src/main/resources/AutoWiredReferencesTest.composite b/sca-java-1.x/trunk/itest/references/src/main/resources/AutoWiredReferencesTest.composite
index 894f6681c2..894f6681c2 100644
--- a/branches/sca-java-1.x/itest/references/src/main/resources/AutoWiredReferencesTest.composite
+++ b/sca-java-1.x/trunk/itest/references/src/main/resources/AutoWiredReferencesTest.composite
diff --git a/branches/sca-java-1.x/itest/references/src/main/resources/InnerReferencesTest.composite b/sca-java-1.x/trunk/itest/references/src/main/resources/InnerReferencesTest.composite
index 6cadc52c13..6cadc52c13 100644
--- a/branches/sca-java-1.x/itest/references/src/main/resources/InnerReferencesTest.composite
+++ b/sca-java-1.x/trunk/itest/references/src/main/resources/InnerReferencesTest.composite
diff --git a/branches/sca-java-1.x/itest/references/src/main/resources/ManualWiredReferencesTest.composite b/sca-java-1.x/trunk/itest/references/src/main/resources/ManualWiredReferencesTest.composite
index 708960974b..708960974b 100644
--- a/branches/sca-java-1.x/itest/references/src/main/resources/ManualWiredReferencesTest.composite
+++ b/sca-java-1.x/trunk/itest/references/src/main/resources/ManualWiredReferencesTest.composite
diff --git a/branches/sca-java-1.x/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java b/sca-java-1.x/trunk/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
index bfd542e2f2..bfd542e2f2 100644
--- a/branches/sca-java-1.x/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
+++ b/sca-java-1.x/trunk/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
diff --git a/branches/sca-java-1.x/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java b/sca-java-1.x/trunk/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
index 1d8284f0fd..1d8284f0fd 100644
--- a/branches/sca-java-1.x/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
+++ b/sca-java-1.x/trunk/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
diff --git a/branches/sca-java-1.x/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java b/sca-java-1.x/trunk/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
index 4b3a745a19..4b3a745a19 100644
--- a/branches/sca-java-1.x/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
+++ b/sca-java-1.x/trunk/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
diff --git a/branches/sca-java-1.x/itest/scopes/pom.xml b/sca-java-1.x/trunk/itest/scopes/pom.xml
index a08a13a4d0..a08a13a4d0 100644
--- a/branches/sca-java-1.x/itest/scopes/pom.xml
+++ b/sca-java-1.x/trunk/itest/scopes/pom.xml
diff --git a/branches/sca-java-1.x/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java b/sca-java-1.x/trunk/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
index 4aa414be8e..4aa414be8e 100644
--- a/branches/sca-java-1.x/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
+++ b/sca-java-1.x/trunk/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
diff --git a/branches/sca-java-1.x/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java b/sca-java-1.x/trunk/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java
index fae4dcd586..fae4dcd586 100644
--- a/branches/sca-java-1.x/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java
+++ b/sca-java-1.x/trunk/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java
diff --git a/branches/sca-java-1.x/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java b/sca-java-1.x/trunk/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
index 878f7e4cc6..878f7e4cc6 100644
--- a/branches/sca-java-1.x/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
+++ b/sca-java-1.x/trunk/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
diff --git a/branches/sca-java-1.x/itest/scopes/src/main/resources/scopes.composite b/sca-java-1.x/trunk/itest/scopes/src/main/resources/scopes.composite
index 54a1b66830..54a1b66830 100644
--- a/branches/sca-java-1.x/itest/scopes/src/main/resources/scopes.composite
+++ b/sca-java-1.x/trunk/itest/scopes/src/main/resources/scopes.composite
diff --git a/branches/sca-java-1.x/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java b/sca-java-1.x/trunk/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
index ce2519cbc0..ce2519cbc0 100644
--- a/branches/sca-java-1.x/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
+++ b/sca-java-1.x/trunk/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
diff --git a/branches/sca-java-1.x/itest/serialization/pom.xml b/sca-java-1.x/trunk/itest/serialization/pom.xml
index 79fec1f707..79fec1f707 100644
--- a/branches/sca-java-1.x/itest/serialization/pom.xml
+++ b/sca-java-1.x/trunk/itest/serialization/pom.xml
diff --git a/branches/sca-java-1.x/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java b/sca-java-1.x/trunk/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java
index fa0f1c88d6..fa0f1c88d6 100644
--- a/branches/sca-java-1.x/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java
+++ b/sca-java-1.x/trunk/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java
diff --git a/branches/sca-java-1.x/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java b/sca-java-1.x/trunk/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java
index 85d5dd860c..85d5dd860c 100644
--- a/branches/sca-java-1.x/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java
+++ b/sca-java-1.x/trunk/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java
diff --git a/branches/sca-java-1.x/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java b/sca-java-1.x/trunk/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java
index 50c98d1afc..50c98d1afc 100644
--- a/branches/sca-java-1.x/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java b/sca-java-1.x/trunk/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java
index c268f9bda7..c268f9bda7 100644
--- a/branches/sca-java-1.x/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java
+++ b/sca-java-1.x/trunk/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java
diff --git a/branches/sca-java-1.x/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java b/sca-java-1.x/trunk/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java
index cf0307eb8e..cf0307eb8e 100644
--- a/branches/sca-java-1.x/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java
+++ b/sca-java-1.x/trunk/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java
diff --git a/branches/sca-java-1.x/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java b/sca-java-1.x/trunk/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java
index deb8f75816..deb8f75816 100644
--- a/branches/sca-java-1.x/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java
+++ b/sca-java-1.x/trunk/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java
diff --git a/branches/sca-java-1.x/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java b/sca-java-1.x/trunk/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java
index 60ecb7717a..60ecb7717a 100644
--- a/branches/sca-java-1.x/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java
+++ b/sca-java-1.x/trunk/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java
diff --git a/branches/sca-java-1.x/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java b/sca-java-1.x/trunk/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java
index 8a1fe48436..8a1fe48436 100644
--- a/branches/sca-java-1.x/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java
+++ b/sca-java-1.x/trunk/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java
diff --git a/branches/sca-java-1.x/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.java b/sca-java-1.x/trunk/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.java
index ffe3a3b8ef..ffe3a3b8ef 100644
--- a/branches/sca-java-1.x/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.java
+++ b/sca-java-1.x/trunk/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.java
diff --git a/branches/sca-java-1.x/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java b/sca-java-1.x/trunk/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java
index 24d43f79e3..24d43f79e3 100644
--- a/branches/sca-java-1.x/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java b/sca-java-1.x/trunk/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java
index 2749891bd4..2749891bd4 100644
--- a/branches/sca-java-1.x/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java
+++ b/sca-java-1.x/trunk/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java
diff --git a/branches/sca-java-1.x/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.composite b/sca-java-1.x/trunk/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.composite
index 28c32d6fa4..28c32d6fa4 100644
--- a/branches/sca-java-1.x/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.composite
+++ b/sca-java-1.x/trunk/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.composite
diff --git a/branches/sca-java-1.x/itest/serialization/src/main/resources/nestedcomposite.composite b/sca-java-1.x/trunk/itest/serialization/src/main/resources/nestedcomposite.composite
index 8e1a132b0a..8e1a132b0a 100644
--- a/branches/sca-java-1.x/itest/serialization/src/main/resources/nestedcomposite.composite
+++ b/sca-java-1.x/trunk/itest/serialization/src/main/resources/nestedcomposite.composite
diff --git a/branches/sca-java-1.x/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java b/sca-java-1.x/trunk/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java
index 76e77284fb..76e77284fb 100644
--- a/branches/sca-java-1.x/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java
+++ b/sca-java-1.x/trunk/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java
diff --git a/branches/sca-java-1.x/itest/services/pom.xml b/sca-java-1.x/trunk/itest/services/pom.xml
index e7b5c8bd72..e7b5c8bd72 100644
--- a/branches/sca-java-1.x/itest/services/pom.xml
+++ b/sca-java-1.x/trunk/itest/services/pom.xml
diff --git a/branches/sca-java-1.x/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java b/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
index 1304ba4288..1304ba4288 100644
--- a/branches/sca-java-1.x/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
+++ b/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
diff --git a/branches/sca-java-1.x/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java b/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
index 3577e09add..3577e09add 100644
--- a/branches/sca-java-1.x/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java b/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
index 2e9b56d64d..2e9b56d64d 100644
--- a/branches/sca-java-1.x/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
+++ b/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
diff --git a/branches/sca-java-1.x/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java b/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
index cda3f38636..cda3f38636 100644
--- a/branches/sca-java-1.x/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java b/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
index 39806a8101..39806a8101 100644
--- a/branches/sca-java-1.x/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
+++ b/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
diff --git a/branches/sca-java-1.x/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java b/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
index 8713e5ab22..8713e5ab22 100644
--- a/branches/sca-java-1.x/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java b/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
index aa745deb63..aa745deb63 100644
--- a/branches/sca-java-1.x/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
+++ b/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
diff --git a/branches/sca-java-1.x/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java b/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
index 83da15089f..83da15089f 100644
--- a/branches/sca-java-1.x/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
+++ b/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
diff --git a/branches/sca-java-1.x/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java b/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
index 36189f94bb..36189f94bb 100644
--- a/branches/sca-java-1.x/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
+++ b/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
diff --git a/branches/sca-java-1.x/itest/services/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/services/src/main/resources/META-INF/sca-contribution.xml
index 37ea8f677d..37ea8f677d 100644
--- a/branches/sca-java-1.x/itest/services/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/services/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/services/src/main/resources/ServicesTest.composite b/sca-java-1.x/trunk/itest/services/src/main/resources/ServicesTest.composite
index eda885f9ec..eda885f9ec 100644
--- a/branches/sca-java-1.x/itest/services/src/main/resources/ServicesTest.composite
+++ b/sca-java-1.x/trunk/itest/services/src/main/resources/ServicesTest.composite
diff --git a/branches/sca-java-1.x/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java b/sca-java-1.x/trunk/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
index 4857b751b9..4857b751b9 100644
--- a/branches/sca-java-1.x/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
+++ b/sca-java-1.x/trunk/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
diff --git a/branches/sca-java-1.x/itest/spring/pom.xml b/sca-java-1.x/trunk/itest/spring/pom.xml
index dbeebc48f1..dbeebc48f1 100644
--- a/branches/sca-java-1.x/itest/spring/pom.xml
+++ b/sca-java-1.x/trunk/itest/spring/pom.xml
diff --git a/branches/sca-java-1.x/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/sca-java-1.x/trunk/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
index 81c47a78d1..81c47a78d1 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
+++ b/sca-java-1.x/trunk/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
diff --git a/branches/sca-java-1.x/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java b/sca-java-1.x/trunk/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java
index d4b3fe9035..d4b3fe9035 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ b/sca-java-1.x/trunk/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/branches/sca-java-1.x/itest/spring/src/main/java/calculator/AddService.java b/sca-java-1.x/trunk/itest/spring/src/main/java/calculator/AddService.java
index 5a1e7a638a..5a1e7a638a 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/trunk/itest/spring/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.x/itest/spring/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/trunk/itest/spring/src/main/java/calculator/AddServiceImpl.java
index a597691905..a597691905 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/spring/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/spring/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/trunk/itest/spring/src/main/java/calculator/CalculatorService.java
index ad87375529..ad87375529 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/trunk/itest/spring/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.x/itest/spring/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/trunk/itest/spring/src/main/java/calculator/CalculatorServiceImpl.java
index 4363650e52..4363650e52 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/spring/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/spring/src/main/java/calculator/DivideService.java b/sca-java-1.x/trunk/itest/spring/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/trunk/itest/spring/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.x/itest/spring/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/trunk/itest/spring/src/main/java/calculator/DivideServiceImpl.java
index cd91935f08..cd91935f08 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/spring/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/spring/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/trunk/itest/spring/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/trunk/itest/spring/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.x/itest/spring/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/trunk/itest/spring/src/main/java/calculator/MultiplyServiceImpl.java
index c85357fcd8..c85357fcd8 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/spring/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/spring/src/main/java/calculator/SubtractService.java b/sca-java-1.x/trunk/itest/spring/src/main/java/calculator/SubtractService.java
index 56ee372fc4..56ee372fc4 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/trunk/itest/spring/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.x/itest/spring/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/trunk/itest/spring/src/main/java/calculator/SubtractServiceImpl.java
index 1b669084d9..1b669084d9 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/spring/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/spring/src/main/java/calculator/security/CalculatorCallbackHandler.java b/sca-java-1.x/trunk/itest/spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
index b48fb90148..b48fb90148 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
+++ b/sca-java-1.x/trunk/itest/spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
diff --git a/branches/sca-java-1.x/itest/spring/src/main/java/calculator/security/JaasLoginModule.java b/sca-java-1.x/trunk/itest/spring/src/main/java/calculator/security/JaasLoginModule.java
index fe4097640b..fe4097640b 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/java/calculator/security/JaasLoginModule.java
+++ b/sca-java-1.x/trunk/itest/spring/src/main/java/calculator/security/JaasLoginModule.java
diff --git a/branches/sca-java-1.x/itest/spring/src/main/java/calculator/security/UserPrincipal.java b/sca-java-1.x/trunk/itest/spring/src/main/java/calculator/security/UserPrincipal.java
index 09024197db..09024197db 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/java/calculator/security/UserPrincipal.java
+++ b/sca-java-1.x/trunk/itest/spring/src/main/java/calculator/security/UserPrincipal.java
diff --git a/branches/sca-java-1.x/itest/spring/src/main/java/context/access/SCAApplicationContextProvider.java b/sca-java-1.x/trunk/itest/spring/src/main/java/context/access/SCAApplicationContextProvider.java
index 77d98d50aa..77d98d50aa 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/java/context/access/SCAApplicationContextProvider.java
+++ b/sca-java-1.x/trunk/itest/spring/src/main/java/context/access/SCAApplicationContextProvider.java
diff --git a/branches/sca-java-1.x/itest/spring/src/main/java/helloworld/HelloWorld.java b/sca-java-1.x/trunk/itest/spring/src/main/java/helloworld/HelloWorld.java
index 46f8facf78..46f8facf78 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/java/helloworld/HelloWorld.java
+++ b/sca-java-1.x/trunk/itest/spring/src/main/java/helloworld/HelloWorld.java
diff --git a/branches/sca-java-1.x/itest/spring/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/trunk/itest/spring/src/main/java/helloworld/HelloWorldImpl.java
index 73939693a4..73939693a4 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/trunk/itest/spring/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.x/itest/spring/src/main/java/helloworld/HelloWorldProxy.java b/sca-java-1.x/trunk/itest/spring/src/main/java/helloworld/HelloWorldProxy.java
index 4d4b5a2931..4d4b5a2931 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/java/helloworld/HelloWorldProxy.java
+++ b/sca-java-1.x/trunk/itest/spring/src/main/java/helloworld/HelloWorldProxy.java
diff --git a/branches/sca-java-1.x/itest/spring/src/main/java/mock/TestBean.java b/sca-java-1.x/trunk/itest/spring/src/main/java/mock/TestBean.java
index 96df81fc0c..96df81fc0c 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/java/mock/TestBean.java
+++ b/sca-java-1.x/trunk/itest/spring/src/main/java/mock/TestBean.java
diff --git a/branches/sca-java-1.x/itest/spring/src/main/java/mock/TestBeanImpl.java b/sca-java-1.x/trunk/itest/spring/src/main/java/mock/TestBeanImpl.java
index 538d3547f4..538d3547f4 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/java/mock/TestBeanImpl.java
+++ b/sca-java-1.x/trunk/itest/spring/src/main/java/mock/TestBeanImpl.java
diff --git a/branches/sca-java-1.x/itest/spring/src/main/java/mock/TestHelloWorldBean.java b/sca-java-1.x/trunk/itest/spring/src/main/java/mock/TestHelloWorldBean.java
index 5c9dede7ec..5c9dede7ec 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/java/mock/TestHelloWorldBean.java
+++ b/sca-java-1.x/trunk/itest/spring/src/main/java/mock/TestHelloWorldBean.java
diff --git a/branches/sca-java-1.x/itest/spring/src/main/java/mock/TestReference.java b/sca-java-1.x/trunk/itest/spring/src/main/java/mock/TestReference.java
index 0a8742d242..0a8742d242 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/java/mock/TestReference.java
+++ b/sca-java-1.x/trunk/itest/spring/src/main/java/mock/TestReference.java
diff --git a/branches/sca-java-1.x/itest/spring/src/main/java/mock/TestReferenceBean.java b/sca-java-1.x/trunk/itest/spring/src/main/java/mock/TestReferenceBean.java
index 27ccdbdd77..27ccdbdd77 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/java/mock/TestReferenceBean.java
+++ b/sca-java-1.x/trunk/itest/spring/src/main/java/mock/TestReferenceBean.java
diff --git a/branches/sca-java-1.x/itest/spring/src/main/java/mock/TestSCAPropertyBean.java b/sca-java-1.x/trunk/itest/spring/src/main/java/mock/TestSCAPropertyBean.java
index 881ca8bb7d..881ca8bb7d 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/java/mock/TestSCAPropertyBean.java
+++ b/sca-java-1.x/trunk/itest/spring/src/main/java/mock/TestSCAPropertyBean.java
diff --git a/branches/sca-java-1.x/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java b/sca-java-1.x/trunk/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
index 0206849a53..0206849a53 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/context/access/Calculator.composite b/sca-java-1.x/trunk/itest/spring/src/main/resources/context/access/Calculator.composite
index 4704239620..4704239620 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/context/access/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/context/access/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/context/access/CalculatorService-context.xml b/sca-java-1.x/trunk/itest/spring/src/main/resources/context/access/CalculatorService-context.xml
index 87458b99a3..87458b99a3 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/context/access/CalculatorService-context.xml
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/context/access/CalculatorService-context.xml
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/Calculator.composite b/sca-java-1.x/trunk/itest/spring/src/main/resources/context/imports/Calculator.composite
index 6662531971..6662531971 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/context/imports/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml b/sca-java-1.x/trunk/itest/spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml
index 4532810433..4532810433 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml b/sca-java-1.x/trunk/itest/spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml
index 6dbcef46a6..6dbcef46a6 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/StockQuote.composite b/sca-java-1.x/trunk/itest/spring/src/main/resources/context/multiple/StockQuote.composite
index 051529d7de..051529d7de 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/StockQuote.composite
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/context/multiple/StockQuote.composite
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/springapps/META-INF/MANIFEST.MF b/sca-java-1.x/trunk/itest/spring/src/main/resources/context/multiple/springapps/META-INF/MANIFEST.MF
index 72370a0683..72370a0683 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/springapps/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/context/multiple/springapps/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/springapps/META-INF/spring/SpringHelloWorld-context.xml b/sca-java-1.x/trunk/itest/spring/src/main/resources/context/multiple/springapps/META-INF/spring/SpringHelloWorld-context.xml
index 62e4e077b6..62e4e077b6 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/springapps/META-INF/spring/SpringHelloWorld-context.xml
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/context/multiple/springapps/META-INF/spring/SpringHelloWorld-context.xml
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/springapps/META-INF/spring/StockQuoteService-context.xml b/sca-java-1.x/trunk/itest/spring/src/main/resources/context/multiple/springapps/META-INF/spring/StockQuoteService-context.xml
index 5738d0f890..5738d0f890 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/springapps/META-INF/spring/StockQuoteService-context.xml
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/context/multiple/springapps/META-INF/spring/StockQuoteService-context.xml
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/implementation/policies/Calculator.composite b/sca-java-1.x/trunk/itest/spring/src/main/resources/implementation/policies/Calculator.composite
index 98cd9ec225..98cd9ec225 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/implementation/policies/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/implementation/policies/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/implementation/policies/CalculatorJass.config b/sca-java-1.x/trunk/itest/spring/src/main/resources/implementation/policies/CalculatorJass.config
index 0e7cb86633..0e7cb86633 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/implementation/policies/CalculatorJass.config
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/implementation/policies/CalculatorJass.config
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties b/sca-java-1.x/trunk/itest/spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
index f62125eaa9..f62125eaa9 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml b/sca-java-1.x/trunk/itest/spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml
index 7c84965629..7c84965629 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/implementation/policies/definitions.xml b/sca-java-1.x/trunk/itest/spring/src/main/resources/implementation/policies/definitions.xml
index 992c1b92f5..992c1b92f5 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/implementation/policies/definitions.xml
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/implementation/policies/definitions.xml
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/SpringFolderLocation.composite b/sca-java-1.x/trunk/itest/spring/src/main/resources/location/folder/SpringFolderLocation.composite
index c6f2111d0e..c6f2111d0e 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/SpringFolderLocation.composite
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/location/folder/SpringFolderLocation.composite
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/SpringFolderNoManifest.composite b/sca-java-1.x/trunk/itest/spring/src/main/resources/location/folder/SpringFolderNoManifest.composite
index b0efbfd5b7..b0efbfd5b7 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/SpringFolderNoManifest.composite
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/location/folder/SpringFolderNoManifest.composite
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF b/sca-java-1.x/trunk/itest/spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF
index 950dbeba4c..950dbeba4c 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml b/sca-java-1.x/trunk/itest/spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml
index d2f406294d..d2f406294d 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/springappnomanifest/META-INF/spring/application-context.xml b/sca-java-1.x/trunk/itest/spring/src/main/resources/location/folder/springappnomanifest/META-INF/spring/application-context.xml
index d2f406294d..d2f406294d 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/springappnomanifest/META-INF/spring/application-context.xml
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/location/folder/springappnomanifest/META-INF/spring/application-context.xml
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/SpringJarLocation.composite b/sca-java-1.x/trunk/itest/spring/src/main/resources/location/jar/SpringJarLocation.composite
index 7b16c221cf..7b16c221cf 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/SpringJarLocation.composite
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/location/jar/SpringJarLocation.composite
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/SpringJarNoManifest.composite b/sca-java-1.x/trunk/itest/spring/src/main/resources/location/jar/SpringJarNoManifest.composite
index c3d49757eb..c3d49757eb 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/SpringJarNoManifest.composite
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/location/jar/SpringJarNoManifest.composite
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/spring-context-nomanifest.jar b/sca-java-1.x/trunk/itest/spring/src/main/resources/location/jar/spring-context-nomanifest.jar
index 26062e1e53..26062e1e53 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/spring-context-nomanifest.jar
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/location/jar/spring-context-nomanifest.jar
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/spring-context.jar b/sca-java-1.x/trunk/itest/spring/src/main/resources/location/jar/spring-context.jar
index d8ee59a610..d8ee59a610 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/spring-context.jar
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/location/jar/spring-context.jar
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml b/sca-java-1.x/trunk/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml
index 932ebb1361..932ebb1361 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml b/sca-java-1.x/trunk/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml
index c20679241f..c20679241f 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite b/sca-java-1.x/trunk/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
index 7d72242df3..7d72242df3 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite b/sca-java-1.x/trunk/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
index 847056adf6..847056adf6 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml b/sca-java-1.x/trunk/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml
index d18d8312e3..d18d8312e3 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml b/sca-java-1.x/trunk/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml
index df4b9b28cf..df4b9b28cf 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/SpringExplicitReference.composite b/sca-java-1.x/trunk/itest/spring/src/main/resources/sca/references/SpringExplicitReference.composite
index 25adcc183e..25adcc183e 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/SpringExplicitReference.composite
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/sca/references/SpringExplicitReference.composite
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/SpringImplicitReference.composite b/sca-java-1.x/trunk/itest/spring/src/main/resources/sca/references/SpringImplicitReference.composite
index 31429e5f63..31429e5f63 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/SpringImplicitReference.composite
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/sca/references/SpringImplicitReference.composite
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml b/sca-java-1.x/trunk/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml
index 194bc4bcc9..194bc4bcc9 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml b/sca-java-1.x/trunk/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml
index 1c63311367..1c63311367 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/SpringExplicitService.composite b/sca-java-1.x/trunk/itest/spring/src/main/resources/sca/services/SpringExplicitService.composite
index 6958c28361..6958c28361 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/SpringExplicitService.composite
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/sca/services/SpringExplicitService.composite
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/SpringImplicitService.composite b/sca-java-1.x/trunk/itest/spring/src/main/resources/sca/services/SpringImplicitService.composite
index 3969eef213..3969eef213 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/SpringImplicitService.composite
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/sca/services/SpringImplicitService.composite
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/spring/annotations/Calculator.composite b/sca-java-1.x/trunk/itest/spring/src/main/resources/spring/annotations/Calculator.composite
index 2c0de830ab..2c0de830ab 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/spring/annotations/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/spring/annotations/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/spring/annotations/META-INF/spring/CalculatorService-context.xml b/sca-java-1.x/trunk/itest/spring/src/main/resources/spring/annotations/META-INF/spring/CalculatorService-context.xml
index 4110a9a7b7..4110a9a7b7 100644
--- a/branches/sca-java-1.x/itest/spring/src/main/resources/spring/annotations/META-INF/spring/CalculatorService-context.xml
+++ b/sca-java-1.x/trunk/itest/spring/src/main/resources/spring/annotations/META-INF/spring/CalculatorService-context.xml
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/context/access/CalculatorClient.java b/sca-java-1.x/trunk/itest/spring/src/test/java/context/access/CalculatorClient.java
index 9b7202d951..9b7202d951 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/context/access/CalculatorClient.java
+++ b/sca-java-1.x/trunk/itest/spring/src/test/java/context/access/CalculatorClient.java
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/context/access/ContextAccessTestCase.java b/sca-java-1.x/trunk/itest/spring/src/test/java/context/access/ContextAccessTestCase.java
index 5feb293bc8..5feb293bc8 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/context/access/ContextAccessTestCase.java
+++ b/sca-java-1.x/trunk/itest/spring/src/test/java/context/access/ContextAccessTestCase.java
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/context/imports/CalculatorClient.java b/sca-java-1.x/trunk/itest/spring/src/test/java/context/imports/CalculatorClient.java
index 12ced16785..12ced16785 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/context/imports/CalculatorClient.java
+++ b/sca-java-1.x/trunk/itest/spring/src/test/java/context/imports/CalculatorClient.java
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/context/imports/ContextImportsTestCase.java b/sca-java-1.x/trunk/itest/spring/src/test/java/context/imports/ContextImportsTestCase.java
index 3940bf65fa..3940bf65fa 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/context/imports/ContextImportsTestCase.java
+++ b/sca-java-1.x/trunk/itest/spring/src/test/java/context/imports/ContextImportsTestCase.java
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java b/sca-java-1.x/trunk/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java
index 75b296bf32..75b296bf32 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java
+++ b/sca-java-1.x/trunk/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/context/multiple/StockQuoteServer.java b/sca-java-1.x/trunk/itest/spring/src/test/java/context/multiple/StockQuoteServer.java
index 18c7ca6a74..18c7ca6a74 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/context/multiple/StockQuoteServer.java
+++ b/sca-java-1.x/trunk/itest/spring/src/test/java/context/multiple/StockQuoteServer.java
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/implementation/policies/CalculatorClient.java b/sca-java-1.x/trunk/itest/spring/src/test/java/implementation/policies/CalculatorClient.java
index bc29f54d86..bc29f54d86 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/implementation/policies/CalculatorClient.java
+++ b/sca-java-1.x/trunk/itest/spring/src/test/java/implementation/policies/CalculatorClient.java
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java b/sca-java-1.x/trunk/itest/spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java
index 1e759f98a0..1e759f98a0 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java
+++ b/sca-java-1.x/trunk/itest/spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/location/folder/SpringFolderLocationTestCase.java b/sca-java-1.x/trunk/itest/spring/src/test/java/location/folder/SpringFolderLocationTestCase.java
index bd1150e99a..bd1150e99a 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/location/folder/SpringFolderLocationTestCase.java
+++ b/sca-java-1.x/trunk/itest/spring/src/test/java/location/folder/SpringFolderLocationTestCase.java
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/location/folder/SpringFolderNoManifestTestCase.java b/sca-java-1.x/trunk/itest/spring/src/test/java/location/folder/SpringFolderNoManifestTestCase.java
index c9876fd947..c9876fd947 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/location/folder/SpringFolderNoManifestTestCase.java
+++ b/sca-java-1.x/trunk/itest/spring/src/test/java/location/folder/SpringFolderNoManifestTestCase.java
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/location/jar/SpringJarLocationTestCase.java b/sca-java-1.x/trunk/itest/spring/src/test/java/location/jar/SpringJarLocationTestCase.java
index 102cd69874..102cd69874 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/location/jar/SpringJarLocationTestCase.java
+++ b/sca-java-1.x/trunk/itest/spring/src/test/java/location/jar/SpringJarLocationTestCase.java
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/location/jar/SpringJarNoManifestTestCase.java b/sca-java-1.x/trunk/itest/spring/src/test/java/location/jar/SpringJarNoManifestTestCase.java
index e32227cbe9..e32227cbe9 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/location/jar/SpringJarNoManifestTestCase.java
+++ b/sca-java-1.x/trunk/itest/spring/src/test/java/location/jar/SpringJarNoManifestTestCase.java
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java b/sca-java-1.x/trunk/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
index aa63fbd5c2..aa63fbd5c2 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
+++ b/sca-java-1.x/trunk/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java b/sca-java-1.x/trunk/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
index a2698cf9a3..a2698cf9a3 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
+++ b/sca-java-1.x/trunk/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java b/sca-java-1.x/trunk/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
index 1405310100..1405310100 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
+++ b/sca-java-1.x/trunk/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java b/sca-java-1.x/trunk/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
index d75d19295d..d75d19295d 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
+++ b/sca-java-1.x/trunk/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java b/sca-java-1.x/trunk/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
index 11ed16e6b4..11ed16e6b4 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
+++ b/sca-java-1.x/trunk/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java b/sca-java-1.x/trunk/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
index bec19b76de..bec19b76de 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
+++ b/sca-java-1.x/trunk/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java b/sca-java-1.x/trunk/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
index 45b47b47a8..45b47b47a8 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
+++ b/sca-java-1.x/trunk/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java b/sca-java-1.x/trunk/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
index 5dfeeffd97..5dfeeffd97 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
+++ b/sca-java-1.x/trunk/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java b/sca-java-1.x/trunk/itest/spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java
index 603d2524f6..603d2524f6 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java
+++ b/sca-java-1.x/trunk/itest/spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java b/sca-java-1.x/trunk/itest/spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java
index 757f12c08b..757f12c08b 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java
+++ b/sca-java-1.x/trunk/itest/spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java b/sca-java-1.x/trunk/itest/spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java
index 03af1e6b12..03af1e6b12 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java
+++ b/sca-java-1.x/trunk/itest/spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java b/sca-java-1.x/trunk/itest/spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java
index 6f17be1970..6f17be1970 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java
+++ b/sca-java-1.x/trunk/itest/spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/spring/annotations/CalculatorClient.java b/sca-java-1.x/trunk/itest/spring/src/test/java/spring/annotations/CalculatorClient.java
index 34e10de85b..34e10de85b 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/spring/annotations/CalculatorClient.java
+++ b/sca-java-1.x/trunk/itest/spring/src/test/java/spring/annotations/CalculatorClient.java
diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java b/sca-java-1.x/trunk/itest/spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java
index 3a9ec4bbb2..3a9ec4bbb2 100644
--- a/branches/sca-java-1.x/itest/spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java
+++ b/sca-java-1.x/trunk/itest/spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java
diff --git a/branches/sca-java-1.x/itest/transaction/pom.xml b/sca-java-1.x/trunk/itest/transaction/pom.xml
index dabbb1a6ce..dabbb1a6ce 100644
--- a/branches/sca-java-1.x/itest/transaction/pom.xml
+++ b/sca-java-1.x/trunk/itest/transaction/pom.xml
diff --git a/branches/sca-java-1.x/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java b/sca-java-1.x/trunk/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java
index d7d18181d9..d7d18181d9 100644
--- a/branches/sca-java-1.x/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java
+++ b/sca-java-1.x/trunk/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java
diff --git a/branches/sca-java-1.x/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java b/sca-java-1.x/trunk/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java
index ac986dd417..ac986dd417 100644
--- a/branches/sca-java-1.x/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java
+++ b/sca-java-1.x/trunk/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java
diff --git a/branches/sca-java-1.x/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java b/sca-java-1.x/trunk/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java
index a6ea036da7..a6ea036da7 100644
--- a/branches/sca-java-1.x/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java b/sca-java-1.x/trunk/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java
index 3e1cb29f33..3e1cb29f33 100644
--- a/branches/sca-java-1.x/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java b/sca-java-1.x/trunk/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java
index 4d504a6a36..4d504a6a36 100644
--- a/branches/sca-java-1.x/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java
+++ b/sca-java-1.x/trunk/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java
diff --git a/branches/sca-java-1.x/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java b/sca-java-1.x/trunk/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java
index 156b34227d..156b34227d 100644
--- a/branches/sca-java-1.x/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java b/sca-java-1.x/trunk/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java
index b7ea5f2663..b7ea5f2663 100644
--- a/branches/sca-java-1.x/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java
+++ b/sca-java-1.x/trunk/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java
diff --git a/branches/sca-java-1.x/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java b/sca-java-1.x/trunk/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java
index 341a7e53e3..341a7e53e3 100644
--- a/branches/sca-java-1.x/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/transaction/src/main/resources/accounts.composite b/sca-java-1.x/trunk/itest/transaction/src/main/resources/accounts.composite
index f4c6b650c7..f4c6b650c7 100644
--- a/branches/sca-java-1.x/itest/transaction/src/main/resources/accounts.composite
+++ b/sca-java-1.x/trunk/itest/transaction/src/main/resources/accounts.composite
diff --git a/branches/sca-java-1.x/itest/transaction/src/main/resources/definitions.xml b/sca-java-1.x/trunk/itest/transaction/src/main/resources/definitions.xml
index 8aa6ba313a..8aa6ba313a 100644
--- a/branches/sca-java-1.x/itest/transaction/src/main/resources/definitions.xml
+++ b/sca-java-1.x/trunk/itest/transaction/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.x/itest/transaction/src/main/resources/log4j.properties b/sca-java-1.x/trunk/itest/transaction/src/main/resources/log4j.properties
index 698ee41d7e..698ee41d7e 100644
--- a/branches/sca-java-1.x/itest/transaction/src/main/resources/log4j.properties
+++ b/sca-java-1.x/trunk/itest/transaction/src/main/resources/log4j.properties
diff --git a/branches/sca-java-1.x/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java b/sca-java-1.x/trunk/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java
index c23628ff91..c23628ff91 100644
--- a/branches/sca-java-1.x/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java
+++ b/sca-java-1.x/trunk/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java
diff --git a/branches/sca-java-1.x/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java b/sca-java-1.x/trunk/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java
index 36884f6098..36884f6098 100644
--- a/branches/sca-java-1.x/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java
+++ b/sca-java-1.x/trunk/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/pom.xml b/sca-java-1.x/trunk/itest/validation/pom.xml
index 5f4de7cf26..5f4de7cf26 100644
--- a/branches/sca-java-1.x/itest/validation/pom.xml
+++ b/sca-java-1.x/trunk/itest/validation/pom.xml
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/binding/ejb/account/Customer.java b/sca-java-1.x/trunk/itest/validation/src/main/java/binding/ejb/account/Customer.java
index acb74c38ae..acb74c38ae 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/binding/ejb/account/Customer.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/binding/ejb/account/Customer.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java b/sca-java-1.x/trunk/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java
index 52ddfa9aba..52ddfa9aba 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/binding/ejb/calculator/AddService.java b/sca-java-1.x/trunk/itest/validation/src/main/java/binding/ejb/calculator/AddService.java
index aec8998083..aec8998083 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/binding/ejb/calculator/AddService.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/binding/ejb/calculator/AddService.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java b/sca-java-1.x/trunk/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java
index 5df24b6379..5df24b6379 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/binding/jms/HelloWorldService.java b/sca-java-1.x/trunk/itest/validation/src/main/java/binding/jms/HelloWorldService.java
index 33bfe1d0ea..33bfe1d0ea 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/binding/jms/HelloWorldService.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/binding/jms/HelloWorldService.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java b/sca-java-1.x/trunk/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java
index a6a40b0ed1..a6a40b0ed1 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/calculator/warning/AddService.java b/sca-java-1.x/trunk/itest/validation/src/main/java/calculator/warning/AddService.java
index 35ba2cbfac..35ba2cbfac 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/calculator/warning/AddService.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/calculator/warning/AddService.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java b/sca-java-1.x/trunk/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java
index ef305370cc..ef305370cc 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java b/sca-java-1.x/trunk/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java
index aacde27842..aacde27842 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/calculator/warning/CalculatorClient.java b/sca-java-1.x/trunk/itest/validation/src/main/java/calculator/warning/CalculatorClient.java
index 185f17a5ca..185f17a5ca 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/calculator/warning/CalculatorClient.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/calculator/warning/CalculatorClient.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/calculator/warning/CalculatorService.java b/sca-java-1.x/trunk/itest/validation/src/main/java/calculator/warning/CalculatorService.java
index f472d6aaf6..f472d6aaf6 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/calculator/warning/CalculatorService.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/calculator/warning/CalculatorService.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java b/sca-java-1.x/trunk/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java
index 77aafe83de..77aafe83de 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/calculator/warning/DivideService.java b/sca-java-1.x/trunk/itest/validation/src/main/java/calculator/warning/DivideService.java
index a93d23e61c..a93d23e61c 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/calculator/warning/DivideService.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/calculator/warning/DivideService.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java b/sca-java-1.x/trunk/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java
index 080594034b..080594034b 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/calculator/warning/MultiplyService.java b/sca-java-1.x/trunk/itest/validation/src/main/java/calculator/warning/MultiplyService.java
index 20d48e93d5..20d48e93d5 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/calculator/warning/MultiplyService.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/calculator/warning/MultiplyService.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java b/sca-java-1.x/trunk/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java
index 96f0b55fa2..96f0b55fa2 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/calculator/warning/PropertyService.java b/sca-java-1.x/trunk/itest/validation/src/main/java/calculator/warning/PropertyService.java
index 4f1ccc96f8..4f1ccc96f8 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/calculator/warning/PropertyService.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/calculator/warning/PropertyService.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java b/sca-java-1.x/trunk/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java
index 429daf5f2d..429daf5f2d 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/calculator/warning/SubtractService.java b/sca-java-1.x/trunk/itest/validation/src/main/java/calculator/warning/SubtractService.java
index 40e382dc74..40e382dc74 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/calculator/warning/SubtractService.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/calculator/warning/SubtractService.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java b/sca-java-1.x/trunk/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java
index 8cdbe0813d..8cdbe0813d 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java b/sca-java-1.x/trunk/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java
index d5e9fcf020..d5e9fcf020 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/impl/java/AddService.java b/sca-java-1.x/trunk/itest/validation/src/main/java/impl/java/AddService.java
index 0db8ce4f5c..0db8ce4f5c 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/impl/java/AddService.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/impl/java/AddService.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/impl/java/AddServiceImpl.java b/sca-java-1.x/trunk/itest/validation/src/main/java/impl/java/AddServiceImpl.java
index 83f2685d54..83f2685d54 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/impl/java/AddServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/impl/java/AddServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/impl/java/CalculatorClient.java b/sca-java-1.x/trunk/itest/validation/src/main/java/impl/java/CalculatorClient.java
index e34ce3db26..e34ce3db26 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/impl/java/CalculatorClient.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/impl/java/CalculatorClient.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/impl/java/CalculatorService.java b/sca-java-1.x/trunk/itest/validation/src/main/java/impl/java/CalculatorService.java
index 5d583fd604..5d583fd604 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/impl/java/CalculatorService.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/impl/java/CalculatorService.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java b/sca-java-1.x/trunk/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java
index 0183e2a259..0183e2a259 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/impl/java/DivideService.java b/sca-java-1.x/trunk/itest/validation/src/main/java/impl/java/DivideService.java
index 85ebadc9a0..85ebadc9a0 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/impl/java/DivideService.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/impl/java/DivideService.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/impl/java/DivideServiceImpl.java b/sca-java-1.x/trunk/itest/validation/src/main/java/impl/java/DivideServiceImpl.java
index 863c298234..863c298234 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/impl/java/DivideServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/impl/java/DivideServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/impl/java/MultiplyService.java b/sca-java-1.x/trunk/itest/validation/src/main/java/impl/java/MultiplyService.java
index e1bf7fbddc..e1bf7fbddc 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/impl/java/MultiplyService.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/impl/java/MultiplyService.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java b/sca-java-1.x/trunk/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java
index 6346ea3582..6346ea3582 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/impl/java/SubtractService.java b/sca-java-1.x/trunk/itest/validation/src/main/java/impl/java/SubtractService.java
index 57759bb496..57759bb496 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/impl/java/SubtractService.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/impl/java/SubtractService.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java b/sca-java-1.x/trunk/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java
index 16e3e6a23d..16e3e6a23d 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/impl/osgi/OSGiTestImpl.java b/sca-java-1.x/trunk/itest/validation/src/main/java/impl/osgi/OSGiTestImpl.java
index 6f9df2c034..6f9df2c034 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/impl/osgi/OSGiTestImpl.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/impl/osgi/OSGiTestImpl.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/impl/osgi/OSGiTestInterface.java b/sca-java-1.x/trunk/itest/validation/src/main/java/impl/osgi/OSGiTestInterface.java
index bafff878cd..bafff878cd 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/impl/osgi/OSGiTestInterface.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/impl/osgi/OSGiTestInterface.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/impl/osgi/OSGiTestWithPropertyImpl.java b/sca-java-1.x/trunk/itest/validation/src/main/java/impl/osgi/OSGiTestWithPropertyImpl.java
index e44d93e6be..e44d93e6be 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/impl/osgi/OSGiTestWithPropertyImpl.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/impl/osgi/OSGiTestWithPropertyImpl.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/impl/spring/HelloWorld.java b/sca-java-1.x/trunk/itest/validation/src/main/java/impl/spring/HelloWorld.java
index ef0b491617..ef0b491617 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/impl/spring/HelloWorld.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/impl/spring/HelloWorld.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java b/sca-java-1.x/trunk/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java
index 2e3458f0d3..2e3458f0d3 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java b/sca-java-1.x/trunk/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java
index 87904f2a72..87904f2a72 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java b/sca-java-1.x/trunk/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java
index fa1a621f12..fa1a621f12 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java b/sca-java-1.x/trunk/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java
index ebf7a79589..ebf7a79589 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite
index b2e7da05a2..b2e7da05a2 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite
index 4ba9f0724b..4ba9f0724b 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite
index b935dd194a..b935dd194a 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite
index 2b633f3139..2b633f3139 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite
index 940e27a1e7..940e27a1e7 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite
index 50d78cb2a6..50d78cb2a6 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite
index bd788e47b8..bd788e47b8 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite
index 7281878c0f..7281878c0f 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml b/sca-java-1.x/trunk/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
index 609ffed02d..609ffed02d 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite
index 08e18decc1..08e18decc1 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite
index 36e71e398b..36e71e398b 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite
index 9a46e09363..9a46e09363 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite
index 59017f0c09..59017f0c09 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite
index 462a95dd02..462a95dd02 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite
index 4b6c44bd58..4b6c44bd58 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite
index a397e3384c..a397e3384c 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite
index 08fab865fa..08fab865fa 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite
index 3a5f59b17c..3a5f59b17c 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite
index 8221e41430..8221e41430 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite
index 9c5ae7027f..9c5ae7027f 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite
index 3c85ed32e2..3c85ed32e2 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite
index 2d1a1e01f0..2d1a1e01f0 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite
index efb457ac9e..efb457ac9e 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite
index a5beaf4ec9..a5beaf4ec9 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite
index 06c3eeeaca..06c3eeeaca 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite
index 821ce570c8..821ce570c8 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/XsdValidation/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/XsdValidation/Calculator.composite
index 63ccaa9957..63ccaa9957 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/XsdValidation/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/XsdValidation/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite
index da565081f3..da565081f3 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite
index 6153d40c3d..6153d40c3d 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite
index a3eb60bf58..a3eb60bf58 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite
index 6233d47d8d..6233d47d8d 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite
index 6a9af9e070..6a9af9e070 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite
index 49b26c78f8..49b26c78f8 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite
index c34a160b61..c34a160b61 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworld.wsdl b/sca-java-1.x/trunk/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworld.wsdl
index ce3689afff..ce3689afff 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworld.wsdl
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworld.wsdl
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworldwsjms.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworldwsjms.composite
index 61a9dae367..61a9dae367 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworldwsjms.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworldwsjms.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite
index 293c4d725d..293c4d725d 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl b/sca-java-1.x/trunk/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl
index 013a55b61e..013a55b61e 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite
index b7ff1e304f..b7ff1e304f 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl b/sca-java-1.x/trunk/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl
index 218dbc47c4..218dbc47c4 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite
index 5975c27663..5975c27663 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl b/sca-java-1.x/trunk/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl
index 013a55b61e..013a55b61e 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite
index 8cda0b007e..8cda0b007e 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite
index 781319d619..781319d619 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite
index 8a0dfac98b..8a0dfac98b 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite
index fcfe408582..fcfe408582 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite
index ede3b3fd40..ede3b3fd40 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite
index a8c89a0bf5..a8c89a0bf5 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite
index b4e56d1789..b4e56d1789 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite
index e68eb75d64..e68eb75d64 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite
index 00c7a3f86b..00c7a3f86b 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite
index d656d47cfd..d656d47cfd 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite
index ad1daacfcf..ad1daacfcf 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/InvalidJMSDeliveryMode/service.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/InvalidJMSDeliveryMode/service.composite
index 145aea9fbc..145aea9fbc 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/InvalidJMSDeliveryMode/service.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/InvalidJMSDeliveryMode/service.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/InvalidJMSPriority/service.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/InvalidJMSPriority/service.composite
index c52da84a0c..c52da84a0c 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/InvalidJMSPriority/service.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/InvalidJMSPriority/service.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite
index fb35f5d1b8..fb35f5d1b8 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite
index fcdf25455c..fcdf25455c 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite
index 14f1314a1b..14f1314a1b 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite
index 1a3cb21ac6..1a3cb21ac6 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite
index 80b8f9d938..80b8f9d938 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite
index 8fd1e2f554..8fd1e2f554 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite
index 3077c328b6..3077c328b6 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite
index e22f30152e..e22f30152e 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite
index 6ef7558d95..6ef7558d95 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite
index 77a2715373..77a2715373 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite
index 6e5fcf1286..6e5fcf1286 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml
index d3ce4d91c1..d3ce4d91c1 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite
index 70f91d1a7d..70f91d1a7d 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml b/sca-java-1.x/trunk/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml
index 7f5eb546e0..7f5eb546e0 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/Calculator.composite
index 70f91d1a7d..70f91d1a7d 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/sca-contribution.xml b/sca-java-1.x/trunk/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/sca-contribution.xml
index c1ff61f07c..c1ff61f07c 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite
index 0dfe52985a..0dfe52985a 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite
index d3f249720d..d3f249720d 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel
index a8eb389704..a8eb389704 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite
index 575927a5de..575927a5de 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel
index a8eb389704..a8eb389704 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel
index 973d1f618a..973d1f618a 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel
index 5d2aeddc3d..5d2aeddc3d 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel
index 68df3156a8..68df3156a8 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel
index a8eb389704..a8eb389704 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl
index 695fd60887..695fd60887 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/ejb/EJBLinkAttributeMissing/ejb.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/ejb/EJBLinkAttributeMissing/ejb.composite
index 94ee650207..94ee650207 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/ejb/EJBLinkAttributeMissing/ejb.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/ejb/EJBLinkAttributeMissing/ejb.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite
index f3cf93ddaa..f3cf93ddaa 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite
index f9016219a5..f9016219a5 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType
index 634c13b3cc..634c13b3cc 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite
index 0d1861f2f5..0d1861f2f5 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite
index 9b3adc4828..9b3adc4828 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType
index 634c13b3cc..634c13b3cc 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite
index 881c24854b..881c24854b 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite
index 4e680f1200..4e680f1200 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite
index e01643ed8f..e01643ed8f 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite
index d776882ed0..d776882ed0 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite
index 0d1ffc97e4..0d1ffc97e4 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml
index e69de29bb2..e69de29bb2 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite
index 99c529d77f..99c529d77f 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType
index c75f209b6d..c75f209b6d 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite
index a5874707da..a5874707da 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite
index 393b9fe674..393b9fe674 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite
index 1dca444938..1dca444938 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite
index 9a60183c5c..9a60183c5c 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite
index 70f91d1a7d..70f91d1a7d 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType b/sca-java-1.x/trunk/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType
index bc7bf3f250..bc7bf3f250 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite
index a1a699fc75..a1a699fc75 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType b/sca-java-1.x/trunk/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType
index 7446e4f06a..7446e4f06a 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite
index 0bbb10706e..0bbb10706e 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl b/sca-java-1.x/trunk/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl
index 9d9376ad6c..9d9376ad6c 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl b/sca-java-1.x/trunk/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl
index 3885357625..3885357625 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl b/sca-java-1.x/trunk/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl
index 013a55b61e..013a55b61e 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite
index d9252ba54f..d9252ba54f 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml
index 53d1a581f0..53d1a581f0 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml
index ac45d95ce8..ac45d95ce8 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml
index 5cf6963a96..5cf6963a96 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml
index d31c705fb5..d31c705fb5 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml
index d214a7f40a..d214a7f40a 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml
index ede1786942..ede1786942 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml
index fcb43c949b..fcb43c949b 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
index 8346dcc01a..8346dcc01a 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite
diff --git a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml
index 60f4de5cd3..60f4de5cd3 100644
--- a/branches/sca-java-1.x/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml
+++ b/sca-java-1.x/trunk/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/ContributionReadException.java b/sca-java-1.x/trunk/itest/validation/src/test/java/assembly/xml/ContributionReadException.java
index 0b3a828a41..0b3a828a41 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/ContributionReadException.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/assembly/xml/ContributionReadException.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java b/sca-java-1.x/trunk/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java
index 14e47f464a..14e47f464a 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java b/sca-java-1.x/trunk/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java
index c4cdc2358d..c4cdc2358d 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java b/sca-java-1.x/trunk/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java
index 18d9820d10..18d9820d10 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java b/sca-java-1.x/trunk/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java
index bd211aad97..bd211aad97 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java b/sca-java-1.x/trunk/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java
index 61956a8712..61956a8712 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java
index 773f347170..773f347170 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java
index 9ebfa0637b..9ebfa0637b 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
index d32bb33d93..d32bb33d93 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
index 2ba2e6cd12..2ba2e6cd12 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
index 011d9e427d..011d9e427d 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
index f0b798c2e4..f0b798c2e4 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java
index a114501098..a114501098 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java
index d31e02054a..d31e02054a 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
index 1727217fe0..1727217fe0 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
index 33bf2882e5..33bf2882e5 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
index fcb4345293..fcb4345293 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
index 04d1ba1055..04d1ba1055 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
index 8725a714e8..8725a714e8 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
index b62cd22d6f..b62cd22d6f 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
index 90a82ebe1f..90a82ebe1f 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
index df86fe1564..df86fe1564 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java
index 00e6873361..00e6873361 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/MissingImportedXSDTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/wsxml/MissingImportedXSDTestCase.java
index 0ceae597fb..0ceae597fb 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/MissingImportedXSDTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/wsxml/MissingImportedXSDTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java
index 6b2bf20329..6b2bf20329 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java
index 8c21abb896..8c21abb896 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java
index 83b4722b60..83b4722b60 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java
index 8f7786f08a..8f7786f08a 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
index 6426e8599b..6426e8599b 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
index 5e41d1d1ed..5e41d1d1ed 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
index 173d1e4a20..173d1e4a20 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
index e016a1465b..e016a1465b 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
index 2e4a3daeca..2e4a3daeca 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
index 61c30913cf..61c30913cf 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
index 0bbb3a5074..0bbb3a5074 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
index d8a19eb5c7..d8a19eb5c7 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
index 313c8fdbe0..313c8fdbe0 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
index cf86d01f3d..cf86d01f3d 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
index 3578567b2a..3578567b2a 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
index 4688f836e0..4688f836e0 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
index b0883a5227..b0883a5227 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
index 1d6f905c20..1d6f905c20 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
index 4d91dfb79c..4d91dfb79c 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
index 73a83dd074..73a83dd074 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
index 993ccde9fd..993ccde9fd 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
index 6dc8a321fc..6dc8a321fc 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
index 66b233b87a..66b233b87a 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
index 2e676282ae..2e676282ae 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
index ef67ece5e9..ef67ece5e9 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
index b9bbd3fdd3..b9bbd3fdd3 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
index 040adc09c7..040adc09c7 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
index 91c7e41e9e..91c7e41e9e 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java
index c306373ecb..c306373ecb 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java
index c412a16f24..c412a16f24 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
index 8a3687e618..8a3687e618 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java
index e966c5104a..e966c5104a 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/xml/MultipleCompositeErrorsTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/contribution/xml/MultipleCompositeErrorsTestCase.java
index 28bc3af4e3..28bc3af4e3 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/xml/MultipleCompositeErrorsTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/contribution/xml/MultipleCompositeErrorsTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/domain/CustomCompositeBuilder.java b/sca-java-1.x/trunk/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
index 7f3199d472..7f3199d472 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java
index cbc9e199e3..cbc9e199e3 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java
index eb2eedb340..eb2eedb340 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java
index e93918a94c..e93918a94c 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java
index d711758a21..d711758a21 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java
index b6c3b6c7c9..b6c3b6c7c9 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
index c623c2b157..c623c2b157 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java
index 311a1fd8e7..311a1fd8e7 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
index 999f4a4955..999f4a4955 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java
index e0a3216d52..e0a3216d52 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java
index 24d1c197a6..24d1c197a6 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java
index e3e38e86c3..e3e38e86c3 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java
index b51403fec1..b51403fec1 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java
index 1939455192..1939455192 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/OSGiTestBundles.java b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/osgi/OSGiTestBundles.java
index 398c028dd8..398c028dd8 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/OSGiTestBundles.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/osgi/OSGiTestBundles.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java
index 4a82f569de..4a82f569de 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java
index 5881d866a0..5881d866a0 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java
index 8fefaa05eb..8fefaa05eb 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java
index ebdd05d980..ebdd05d980 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java
index 7974aa5daf..7974aa5daf 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java
index 0ad7bc0918..0ad7bc0918 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java
index 3935afa79c..3935afa79c 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java
index daf8eab56f..daf8eab56f 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java
index 3dbbc61d9c..3dbbc61d9c 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java
index 584c11c061..584c11c061 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java
index d941f41d2e..d941f41d2e 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java
index 0fb397011b..0fb397011b 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java
index ecd2e0a760..ecd2e0a760 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java
index 2149942c25..2149942c25 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java
index 1254f273b7..1254f273b7 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java
index 150a9267c1..150a9267c1 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java
index 1e243689d6..1e243689d6 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java
index f2b0b7222f..f2b0b7222f 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java
index e5aba5b481..e5aba5b481 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java
index 5bfc77d267..5bfc77d267 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java b/sca-java-1.x/trunk/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java
index 64b527e131..64b527e131 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java
+++ b/sca-java-1.x/trunk/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java
diff --git a/branches/sca-java-1.x/itest/wasAdmin.py b/sca-java-1.x/trunk/itest/wasAdmin.py
index 2be2b1eff7..2be2b1eff7 100644
--- a/branches/sca-java-1.x/itest/wasAdmin.py
+++ b/sca-java-1.x/trunk/itest/wasAdmin.py
diff --git a/branches/sca-java-1.x/itest/wires/pom.xml b/sca-java-1.x/trunk/itest/wires/pom.xml
index 019eef1764..019eef1764 100644
--- a/branches/sca-java-1.x/itest/wires/pom.xml
+++ b/sca-java-1.x/trunk/itest/wires/pom.xml
diff --git a/branches/sca-java-1.x/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java b/sca-java-1.x/trunk/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
index 09d5b0278e..09d5b0278e 100644
--- a/branches/sca-java-1.x/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
+++ b/sca-java-1.x/trunk/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
diff --git a/branches/sca-java-1.x/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java b/sca-java-1.x/trunk/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
index f0964ebb93..f0964ebb93 100644
--- a/branches/sca-java-1.x/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
+++ b/sca-java-1.x/trunk/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
diff --git a/branches/sca-java-1.x/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java b/sca-java-1.x/trunk/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
index c19a0b4f74..c19a0b4f74 100644
--- a/branches/sca-java-1.x/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
+++ b/sca-java-1.x/trunk/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
diff --git a/branches/sca-java-1.x/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java b/sca-java-1.x/trunk/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
index b7ccdbf8d1..b7ccdbf8d1 100644
--- a/branches/sca-java-1.x/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/wires/src/main/resources/WireTest.composite b/sca-java-1.x/trunk/itest/wires/src/main/resources/WireTest.composite
index 8b764d0e7d..8b764d0e7d 100644
--- a/branches/sca-java-1.x/itest/wires/src/main/resources/WireTest.composite
+++ b/sca-java-1.x/trunk/itest/wires/src/main/resources/WireTest.composite
diff --git a/branches/sca-java-1.x/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java b/sca-java-1.x/trunk/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
index 95f721cd8e..95f721cd8e 100644
--- a/branches/sca-java-1.x/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
+++ b/sca-java-1.x/trunk/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
diff --git a/branches/sca-java-1.x/itest/workspace-manager/pom.xml b/sca-java-1.x/trunk/itest/workspace-manager/pom.xml
index 500db282a8..500db282a8 100644
--- a/branches/sca-java-1.x/itest/workspace-manager/pom.xml
+++ b/sca-java-1.x/trunk/itest/workspace-manager/pom.xml
diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZ.java b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZ.java
index 3d12ddfdd2..3d12ddfdd2 100644
--- a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZ.java
+++ b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZ.java
diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZModelResolver.java b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZModelResolver.java
index ee8c881d22..ee8c881d22 100644
--- a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZModelResolver.java
+++ b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZModelResolver.java
diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZProcessor.java b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZProcessor.java
index a0c7c899ec..a0c7c899ec 100644
--- a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZProcessor.java
+++ b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZProcessor.java
diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZ.java b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZ.java
index c7df99691b..c7df99691b 100644
--- a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZ.java
+++ b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZ.java
diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZFactory.java b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZFactory.java
index f0e3f20c15..f0e3f20c15 100644
--- a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZFactory.java
+++ b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZFactory.java
diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZFactoryImpl.java b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZFactoryImpl.java
index 1e457d2786..1e457d2786 100644
--- a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZFactoryImpl.java
+++ b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZFactoryImpl.java
diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZImpl.java b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZImpl.java
index 42dcc2419d..42dcc2419d 100644
--- a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZImpl.java
+++ b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZImpl.java
diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZInvoker.java b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZInvoker.java
index 711f919339..711f919339 100644
--- a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZInvoker.java
+++ b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZInvoker.java
diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProcessor.java b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProcessor.java
index 792732e73f..792732e73f 100644
--- a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProcessor.java
+++ b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProcessor.java
diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProvider.java b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProvider.java
index 9d526b007f..9d526b007f 100644
--- a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProvider.java
+++ b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProvider.java
diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProviderFactory.java b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProviderFactory.java
index bb561008d8..bb561008d8 100644
--- a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProviderFactory.java
+++ b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProviderFactory.java
diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/DefaultImportExportXYZFactory.java b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/DefaultImportExportXYZFactory.java
index b9a7bf6c0c..b9a7bf6c0c 100644
--- a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/DefaultImportExportXYZFactory.java
+++ b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/DefaultImportExportXYZFactory.java
diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZ.java b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZ.java
index b099cfee11..b099cfee11 100644
--- a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZ.java
+++ b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZ.java
diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZImpl.java b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZImpl.java
index 6e98979b5d..6e98979b5d 100644
--- a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZImpl.java
+++ b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZImpl.java
diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZModelResolver.java b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZModelResolver.java
index c3d2663d62..c3d2663d62 100644
--- a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZModelResolver.java
+++ b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZModelResolver.java
diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZProcessor.java b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZProcessor.java
index 7d4aafa31f..7d4aafa31f 100644
--- a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZProcessor.java
+++ b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZProcessor.java
diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportExportXYZFactory.java b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportExportXYZFactory.java
index db2bab7f99..db2bab7f99 100644
--- a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportExportXYZFactory.java
+++ b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportExportXYZFactory.java
diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportExportXYZFactoryImpl.java b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportExportXYZFactoryImpl.java
index b0a9c80d88..b0a9c80d88 100644
--- a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportExportXYZFactoryImpl.java
+++ b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportExportXYZFactoryImpl.java
diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZ.java b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZ.java
index 3e883e84a2..3e883e84a2 100644
--- a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZ.java
+++ b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZ.java
diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZImpl.java b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZImpl.java
index ef3f0653f3..ef3f0653f3 100644
--- a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZImpl.java
+++ b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZImpl.java
diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZProcessor.java b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZProcessor.java
index 763fa30002..763fa30002 100644
--- a/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZProcessor.java
+++ b/sca-java-1.x/trunk/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZProcessor.java
diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/main/resources/contrib1/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/workspace-manager/src/main/resources/contrib1/META-INF/sca-contribution.xml
index ba8f0a4793..ba8f0a4793 100644
--- a/branches/sca-java-1.x/itest/workspace-manager/src/main/resources/contrib1/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/workspace-manager/src/main/resources/contrib1/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/main/resources/contrib1/contrib1.composite b/sca-java-1.x/trunk/itest/workspace-manager/src/main/resources/contrib1/contrib1.composite
index 9b56f92027..9b56f92027 100644
--- a/branches/sca-java-1.x/itest/workspace-manager/src/main/resources/contrib1/contrib1.composite
+++ b/sca-java-1.x/trunk/itest/workspace-manager/src/main/resources/contrib1/contrib1.composite
diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/main/resources/contrib2/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/workspace-manager/src/main/resources/contrib2/META-INF/sca-contribution.xml
index 8511d427f9..8511d427f9 100644
--- a/branches/sca-java-1.x/itest/workspace-manager/src/main/resources/contrib2/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/workspace-manager/src/main/resources/contrib2/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/main/resources/contrib2/abcdef.xyz b/sca-java-1.x/trunk/itest/workspace-manager/src/main/resources/contrib2/abcdef.xyz
index 037869c9ef..037869c9ef 100644
--- a/branches/sca-java-1.x/itest/workspace-manager/src/main/resources/contrib2/abcdef.xyz
+++ b/sca-java-1.x/trunk/itest/workspace-manager/src/main/resources/contrib2/abcdef.xyz
diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/main/resources/contrib2/contrib2.composite b/sca-java-1.x/trunk/itest/workspace-manager/src/main/resources/contrib2/contrib2.composite
index 75c0513423..75c0513423 100644
--- a/branches/sca-java-1.x/itest/workspace-manager/src/main/resources/contrib2/contrib2.composite
+++ b/sca-java-1.x/trunk/itest/workspace-manager/src/main/resources/contrib2/contrib2.composite
diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/main/resources/implementation-xyz.xsd b/sca-java-1.x/trunk/itest/workspace-manager/src/main/resources/implementation-xyz.xsd
index 7527779cda..7527779cda 100644
--- a/branches/sca-java-1.x/itest/workspace-manager/src/main/resources/implementation-xyz.xsd
+++ b/sca-java-1.x/trunk/itest/workspace-manager/src/main/resources/implementation-xyz.xsd
diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/main/resources/import-xyz.xsd b/sca-java-1.x/trunk/itest/workspace-manager/src/main/resources/import-xyz.xsd
index e8535fe3a7..e8535fe3a7 100644
--- a/branches/sca-java-1.x/itest/workspace-manager/src/main/resources/import-xyz.xsd
+++ b/sca-java-1.x/trunk/itest/workspace-manager/src/main/resources/import-xyz.xsd
diff --git a/branches/sca-java-1.x/itest/workspace-manager/src/test/java/org/apache/tuscany/sca/workspace/manager/test/WorkspaceManagerTestCase.java b/sca-java-1.x/trunk/itest/workspace-manager/src/test/java/org/apache/tuscany/sca/workspace/manager/test/WorkspaceManagerTestCase.java
index efd6d11b8e..efd6d11b8e 100644
--- a/branches/sca-java-1.x/itest/workspace-manager/src/test/java/org/apache/tuscany/sca/workspace/manager/test/WorkspaceManagerTestCase.java
+++ b/sca-java-1.x/trunk/itest/workspace-manager/src/test/java/org/apache/tuscany/sca/workspace/manager/test/WorkspaceManagerTestCase.java
diff --git a/branches/sca-java-1.x/itest/ws-void-args-return/pom.xml b/sca-java-1.x/trunk/itest/ws-void-args-return/pom.xml
index 2da07c3aa2..2da07c3aa2 100644
--- a/branches/sca-java-1.x/itest/ws-void-args-return/pom.xml
+++ b/sca-java-1.x/trunk/itest/ws-void-args-return/pom.xml
diff --git a/branches/sca-java-1.x/itest/ws-void-args-return/src/main/java/voidtest/Bean.java b/sca-java-1.x/trunk/itest/ws-void-args-return/src/main/java/voidtest/Bean.java
index 43e251369d..43e251369d 100644
--- a/branches/sca-java-1.x/itest/ws-void-args-return/src/main/java/voidtest/Bean.java
+++ b/sca-java-1.x/trunk/itest/ws-void-args-return/src/main/java/voidtest/Bean.java
diff --git a/branches/sca-java-1.x/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java b/sca-java-1.x/trunk/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java
index dc949b5191..dc949b5191 100644
--- a/branches/sca-java-1.x/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java
+++ b/sca-java-1.x/trunk/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java
diff --git a/branches/sca-java-1.x/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java b/sca-java-1.x/trunk/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java
index 4777f793e0..4777f793e0 100644
--- a/branches/sca-java-1.x/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java
+++ b/sca-java-1.x/trunk/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java
diff --git a/branches/sca-java-1.x/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java b/sca-java-1.x/trunk/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java
index d549bccaf0..d549bccaf0 100644
--- a/branches/sca-java-1.x/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java
+++ b/sca-java-1.x/trunk/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java
diff --git a/branches/sca-java-1.x/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java b/sca-java-1.x/trunk/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java
index 1cdd094c50..1cdd094c50 100644
--- a/branches/sca-java-1.x/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java
+++ b/sca-java-1.x/trunk/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java
diff --git a/branches/sca-java-1.x/itest/ws-void-args-return/src/main/resources/voidtest.composite b/sca-java-1.x/trunk/itest/ws-void-args-return/src/main/resources/voidtest.composite
index 0f31c4cd2c..0f31c4cd2c 100644
--- a/branches/sca-java-1.x/itest/ws-void-args-return/src/main/resources/voidtest.composite
+++ b/sca-java-1.x/trunk/itest/ws-void-args-return/src/main/resources/voidtest.composite
diff --git a/branches/sca-java-1.x/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java b/sca-java-1.x/trunk/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java
index eaaa67c22c..eaaa67c22c 100644
--- a/branches/sca-java-1.x/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java
+++ b/sca-java-1.x/trunk/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java
diff --git a/branches/sca-java-1.x/itest/wsdl-multiple/pom.xml b/sca-java-1.x/trunk/itest/wsdl-multiple/pom.xml
index eaea89e7a2..eaea89e7a2 100644
--- a/branches/sca-java-1.x/itest/wsdl-multiple/pom.xml
+++ b/sca-java-1.x/trunk/itest/wsdl-multiple/pom.xml
diff --git a/branches/sca-java-1.x/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java b/sca-java-1.x/trunk/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java
index 842ae0a692..842ae0a692 100644
--- a/branches/sca-java-1.x/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java
+++ b/sca-java-1.x/trunk/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java
diff --git a/branches/sca-java-1.x/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java b/sca-java-1.x/trunk/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java
index d2d898e9c4..d2d898e9c4 100644
--- a/branches/sca-java-1.x/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java
+++ b/sca-java-1.x/trunk/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java
diff --git a/branches/sca-java-1.x/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/trunk/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java
index d4fbd434fe..d4fbd434fe 100644
--- a/branches/sca-java-1.x/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/trunk/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.x/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/trunk/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java
index a46f763960..a46f763960 100644
--- a/branches/sca-java-1.x/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite b/sca-java-1.x/trunk/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite
index 9d9ed57cc7..9d9ed57cc7 100644
--- a/branches/sca-java-1.x/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite
+++ b/sca-java-1.x/trunk/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite
diff --git a/branches/sca-java-1.x/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite b/sca-java-1.x/trunk/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite
index 0c1dc5d353..0c1dc5d353 100644
--- a/branches/sca-java-1.x/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite
+++ b/sca-java-1.x/trunk/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite
diff --git a/branches/sca-java-1.x/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl b/sca-java-1.x/trunk/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl
index ea2f93c3e6..ea2f93c3e6 100644
--- a/branches/sca-java-1.x/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl
+++ b/sca-java-1.x/trunk/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl
diff --git a/branches/sca-java-1.x/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl b/sca-java-1.x/trunk/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl
index 1e50e146f2..1e50e146f2 100644
--- a/branches/sca-java-1.x/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl
+++ b/sca-java-1.x/trunk/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl
diff --git a/branches/sca-java-1.x/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java b/sca-java-1.x/trunk/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java
index 6a872faa17..6a872faa17 100644
--- a/branches/sca-java-1.x/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java
+++ b/sca-java-1.x/trunk/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java
diff --git a/branches/sca-java-1.x/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java b/sca-java-1.x/trunk/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java
index 5852f8d802..5852f8d802 100644
--- a/branches/sca-java-1.x/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java
+++ b/sca-java-1.x/trunk/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java
diff --git a/branches/sca-java-1.x/itest/wsdl/pom.xml b/sca-java-1.x/trunk/itest/wsdl/pom.xml
index b394cf2427..b394cf2427 100644
--- a/branches/sca-java-1.x/itest/wsdl/pom.xml
+++ b/sca-java-1.x/trunk/itest/wsdl/pom.xml
diff --git a/branches/sca-java-1.x/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java b/sca-java-1.x/trunk/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
index 265b11f7dd..265b11f7dd 100644
--- a/branches/sca-java-1.x/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
+++ b/sca-java-1.x/trunk/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
diff --git a/branches/sca-java-1.x/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java b/sca-java-1.x/trunk/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
index f8c9c28f26..f8c9c28f26 100644
--- a/branches/sca-java-1.x/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java b/sca-java-1.x/trunk/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
index f16d20689d..f16d20689d 100644
--- a/branches/sca-java-1.x/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
+++ b/sca-java-1.x/trunk/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
diff --git a/branches/sca-java-1.x/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java b/sca-java-1.x/trunk/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
index cba6f2ee6c..cba6f2ee6c 100644
--- a/branches/sca-java-1.x/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
+++ b/sca-java-1.x/trunk/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
diff --git a/branches/sca-java-1.x/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java b/sca-java-1.x/trunk/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
index 9f15be0236..9f15be0236 100644
--- a/branches/sca-java-1.x/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
+++ b/sca-java-1.x/trunk/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
diff --git a/branches/sca-java-1.x/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java b/sca-java-1.x/trunk/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
index f174e1af07..f174e1af07 100644
--- a/branches/sca-java-1.x/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
+++ b/sca-java-1.x/trunk/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
diff --git a/branches/sca-java-1.x/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java b/sca-java-1.x/trunk/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
index 4a5b7bceef..4a5b7bceef 100644
--- a/branches/sca-java-1.x/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
+++ b/sca-java-1.x/trunk/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
diff --git a/branches/sca-java-1.x/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java b/sca-java-1.x/trunk/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
index e747eb041f..e747eb041f 100644
--- a/branches/sca-java-1.x/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
+++ b/sca-java-1.x/trunk/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
diff --git a/branches/sca-java-1.x/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/trunk/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java
index c9076ebba6..c9076ebba6 100644
--- a/branches/sca-java-1.x/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/trunk/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.x/itest/wsdl/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/trunk/itest/wsdl/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/branches/sca-java-1.x/itest/wsdl/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/trunk/itest/wsdl/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.x/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/trunk/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java
index d706517b76..d706517b76 100644
--- a/branches/sca-java-1.x/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-1.x/trunk/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-java-1.x/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java b/sca-java-1.x/trunk/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
index 9d147dc013..9d147dc013 100644
--- a/branches/sca-java-1.x/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
+++ b/sca-java-1.x/trunk/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
diff --git a/branches/sca-java-1.x/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java b/sca-java-1.x/trunk/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
index 7556e02b36..7556e02b36 100644
--- a/branches/sca-java-1.x/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
+++ b/sca-java-1.x/trunk/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
diff --git a/branches/sca-java-1.x/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java b/sca-java-1.x/trunk/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
index e7031ff41c..e7031ff41c 100644
--- a/branches/sca-java-1.x/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
+++ b/sca-java-1.x/trunk/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
diff --git a/branches/sca-java-1.x/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java b/sca-java-1.x/trunk/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
index 7a049ed7b0..7a049ed7b0 100644
--- a/branches/sca-java-1.x/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
+++ b/sca-java-1.x/trunk/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
diff --git a/branches/sca-java-1.x/itest/wsdl/src/main/resources/META-INF/wsdl/helloworld-import.wsdl b/sca-java-1.x/trunk/itest/wsdl/src/main/resources/META-INF/wsdl/helloworld-import.wsdl
index f47ad202b4..f47ad202b4 100644
--- a/branches/sca-java-1.x/itest/wsdl/src/main/resources/META-INF/wsdl/helloworld-import.wsdl
+++ b/sca-java-1.x/trunk/itest/wsdl/src/main/resources/META-INF/wsdl/helloworld-import.wsdl
diff --git a/branches/sca-java-1.x/itest/wsdl/src/main/resources/META-INF/wsdl/helloworld.xsd b/sca-java-1.x/trunk/itest/wsdl/src/main/resources/META-INF/wsdl/helloworld.xsd
index d3c83b08c6..d3c83b08c6 100644
--- a/branches/sca-java-1.x/itest/wsdl/src/main/resources/META-INF/wsdl/helloworld.xsd
+++ b/sca-java-1.x/trunk/itest/wsdl/src/main/resources/META-INF/wsdl/helloworld.xsd
diff --git a/branches/sca-java-1.x/itest/wsdl/src/main/resources/SDOWSDLTest.composite b/sca-java-1.x/trunk/itest/wsdl/src/main/resources/SDOWSDLTest.composite
index 62596ee62a..62596ee62a 100644
--- a/branches/sca-java-1.x/itest/wsdl/src/main/resources/SDOWSDLTest.composite
+++ b/sca-java-1.x/trunk/itest/wsdl/src/main/resources/SDOWSDLTest.composite
diff --git a/branches/sca-java-1.x/itest/wsdl/src/main/resources/WSDLTest.composite b/sca-java-1.x/trunk/itest/wsdl/src/main/resources/WSDLTest.composite
index 2024578dae..2024578dae 100644
--- a/branches/sca-java-1.x/itest/wsdl/src/main/resources/WSDLTest.composite
+++ b/sca-java-1.x/trunk/itest/wsdl/src/main/resources/WSDLTest.composite
diff --git a/branches/sca-java-1.x/itest/wsdl/src/main/resources/imports/wsdl/META-INF/wsdl/helloworld-import.wsdl b/sca-java-1.x/trunk/itest/wsdl/src/main/resources/imports/wsdl/META-INF/wsdl/helloworld-import.wsdl
index 2920c43a31..2920c43a31 100644
--- a/branches/sca-java-1.x/itest/wsdl/src/main/resources/imports/wsdl/META-INF/wsdl/helloworld-import.wsdl
+++ b/sca-java-1.x/trunk/itest/wsdl/src/main/resources/imports/wsdl/META-INF/wsdl/helloworld-import.wsdl
diff --git a/branches/sca-java-1.x/itest/wsdl/src/main/resources/imports/wsdl/META-INF/wsdl/helloworld.xsd b/sca-java-1.x/trunk/itest/wsdl/src/main/resources/imports/wsdl/META-INF/wsdl/helloworld.xsd
index d49e2ead99..d49e2ead99 100644
--- a/branches/sca-java-1.x/itest/wsdl/src/main/resources/imports/wsdl/META-INF/wsdl/helloworld.xsd
+++ b/sca-java-1.x/trunk/itest/wsdl/src/main/resources/imports/wsdl/META-INF/wsdl/helloworld.xsd
diff --git a/branches/sca-java-1.x/itest/wsdl/src/main/resources/imports/wsdl/helloworld.wsdl b/sca-java-1.x/trunk/itest/wsdl/src/main/resources/imports/wsdl/helloworld.wsdl
index 90eeae3c8a..90eeae3c8a 100644
--- a/branches/sca-java-1.x/itest/wsdl/src/main/resources/imports/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/trunk/itest/wsdl/src/main/resources/imports/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.x/itest/wsdl/src/main/resources/imports/wsdl/helloworldws.composite b/sca-java-1.x/trunk/itest/wsdl/src/main/resources/imports/wsdl/helloworldws.composite
index 1af51162ac..1af51162ac 100644
--- a/branches/sca-java-1.x/itest/wsdl/src/main/resources/imports/wsdl/helloworldws.composite
+++ b/sca-java-1.x/trunk/itest/wsdl/src/main/resources/imports/wsdl/helloworldws.composite
diff --git a/branches/sca-java-1.x/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl b/sca-java-1.x/trunk/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl
index 73f9ed4bfc..73f9ed4bfc 100644
--- a/branches/sca-java-1.x/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl
+++ b/sca-java-1.x/trunk/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl
diff --git a/branches/sca-java-1.x/itest/wsdl/src/main/resources/wsdl/Hello.xsd b/sca-java-1.x/trunk/itest/wsdl/src/main/resources/wsdl/Hello.xsd
index 108b1f393f..108b1f393f 100644
--- a/branches/sca-java-1.x/itest/wsdl/src/main/resources/wsdl/Hello.xsd
+++ b/sca-java-1.x/trunk/itest/wsdl/src/main/resources/wsdl/Hello.xsd
diff --git a/branches/sca-java-1.x/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/trunk/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
index 1966acc957..1966acc957 100644
--- a/branches/sca-java-1.x/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/trunk/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.x/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/HelloWorldClient.java b/sca-java-1.x/trunk/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/HelloWorldClient.java
index f4edf7bef0..f4edf7bef0 100644
--- a/branches/sca-java-1.x/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/HelloWorldClient.java
+++ b/sca-java-1.x/trunk/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/HelloWorldClient.java
diff --git a/branches/sca-java-1.x/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java b/sca-java-1.x/trunk/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
index 12441753fb..12441753fb 100644
--- a/branches/sca-java-1.x/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
+++ b/sca-java-1.x/trunk/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
diff --git a/branches/sca-java-1.x/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLImportsTestCase.java b/sca-java-1.x/trunk/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLImportsTestCase.java
index 8026f93b80..8026f93b80 100644
--- a/branches/sca-java-1.x/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLImportsTestCase.java
+++ b/sca-java-1.x/trunk/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLImportsTestCase.java
diff --git a/branches/sca-java-1.x/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java b/sca-java-1.x/trunk/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
index fd30d69c79..fd30d69c79 100644
--- a/branches/sca-java-1.x/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
+++ b/sca-java-1.x/trunk/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
diff --git a/branches/sca-java-1.x/itest/wsdl2java/pom.xml b/sca-java-1.x/trunk/itest/wsdl2java/pom.xml
index 7bc4a4688c..7bc4a4688c 100644
--- a/branches/sca-java-1.x/itest/wsdl2java/pom.xml
+++ b/sca-java-1.x/trunk/itest/wsdl2java/pom.xml
diff --git a/branches/sca-java-1.x/itest/wsdl2java/src/test/resources/AccountService.wsdl b/sca-java-1.x/trunk/itest/wsdl2java/src/test/resources/AccountService.wsdl
index 9e5650e7dd..9e5650e7dd 100644
--- a/branches/sca-java-1.x/itest/wsdl2java/src/test/resources/AccountService.wsdl
+++ b/sca-java-1.x/trunk/itest/wsdl2java/src/test/resources/AccountService.wsdl
diff --git a/branches/sca-java-1.x/itest/wsdl2java/src/test/resources/EchoService.wsdl b/sca-java-1.x/trunk/itest/wsdl2java/src/test/resources/EchoService.wsdl
index 50d580f299..50d580f299 100644
--- a/branches/sca-java-1.x/itest/wsdl2java/src/test/resources/EchoService.wsdl
+++ b/sca-java-1.x/trunk/itest/wsdl2java/src/test/resources/EchoService.wsdl
diff --git a/branches/sca-java-1.x/itest/wsdl2java/src/test/resources/EchoService.xsd b/sca-java-1.x/trunk/itest/wsdl2java/src/test/resources/EchoService.xsd
index 8069d4861f..8069d4861f 100644
--- a/branches/sca-java-1.x/itest/wsdl2java/src/test/resources/EchoService.xsd
+++ b/sca-java-1.x/trunk/itest/wsdl2java/src/test/resources/EchoService.xsd
diff --git a/branches/sca-java-1.x/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl b/sca-java-1.x/trunk/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
index c44229c162..c44229c162 100644
--- a/branches/sca-java-1.x/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
+++ b/sca-java-1.x/trunk/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
diff --git a/branches/sca-java-1.x/itest/wsdlgen/pom.xml b/sca-java-1.x/trunk/itest/wsdlgen/pom.xml
index cf06761947..cf06761947 100644
--- a/branches/sca-java-1.x/itest/wsdlgen/pom.xml
+++ b/sca-java-1.x/trunk/itest/wsdlgen/pom.xml
diff --git a/branches/sca-java-1.x/itest/wsdlgen/src/main/java/anotherpackage/BBean.java b/sca-java-1.x/trunk/itest/wsdlgen/src/main/java/anotherpackage/BBean.java
index f9578a5f92..f9578a5f92 100644
--- a/branches/sca-java-1.x/itest/wsdlgen/src/main/java/anotherpackage/BBean.java
+++ b/sca-java-1.x/trunk/itest/wsdlgen/src/main/java/anotherpackage/BBean.java
diff --git a/branches/sca-java-1.x/itest/wsdlgen/src/main/java/anotherpackage/CBean.java b/sca-java-1.x/trunk/itest/wsdlgen/src/main/java/anotherpackage/CBean.java
index b1b3801210..b1b3801210 100644
--- a/branches/sca-java-1.x/itest/wsdlgen/src/main/java/anotherpackage/CBean.java
+++ b/sca-java-1.x/trunk/itest/wsdlgen/src/main/java/anotherpackage/CBean.java
diff --git a/branches/sca-java-1.x/itest/wsdlgen/src/main/java/helloworld/ABean.java b/sca-java-1.x/trunk/itest/wsdlgen/src/main/java/helloworld/ABean.java
index bcfa0f8be7..bcfa0f8be7 100644
--- a/branches/sca-java-1.x/itest/wsdlgen/src/main/java/helloworld/ABean.java
+++ b/sca-java-1.x/trunk/itest/wsdlgen/src/main/java/helloworld/ABean.java
diff --git a/branches/sca-java-1.x/itest/wsdlgen/src/main/java/helloworld/HelloWorldClientImpl.java b/sca-java-1.x/trunk/itest/wsdlgen/src/main/java/helloworld/HelloWorldClientImpl.java
index 04fbe6934a..04fbe6934a 100644
--- a/branches/sca-java-1.x/itest/wsdlgen/src/main/java/helloworld/HelloWorldClientImpl.java
+++ b/sca-java-1.x/trunk/itest/wsdlgen/src/main/java/helloworld/HelloWorldClientImpl.java
diff --git a/branches/sca-java-1.x/itest/wsdlgen/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/trunk/itest/wsdlgen/src/main/java/helloworld/HelloWorldImpl.java
index a92a819aaf..a92a819aaf 100644
--- a/branches/sca-java-1.x/itest/wsdlgen/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/trunk/itest/wsdlgen/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.x/itest/wsdlgen/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/trunk/itest/wsdlgen/src/main/java/helloworld/HelloWorldService.java
index 6b0425d473..6b0425d473 100644
--- a/branches/sca-java-1.x/itest/wsdlgen/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/trunk/itest/wsdlgen/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.x/itest/wsdlgen/src/main/java/helloworld/package-info.java b/sca-java-1.x/trunk/itest/wsdlgen/src/main/java/helloworld/package-info.java
index 45bc473320..45bc473320 100644
--- a/branches/sca-java-1.x/itest/wsdlgen/src/main/java/helloworld/package-info.java
+++ b/sca-java-1.x/trunk/itest/wsdlgen/src/main/java/helloworld/package-info.java
diff --git a/branches/sca-java-1.x/itest/wsdlgen/src/main/java/yetanotherpackage/DBean.java b/sca-java-1.x/trunk/itest/wsdlgen/src/main/java/yetanotherpackage/DBean.java
index cee893d678..cee893d678 100644
--- a/branches/sca-java-1.x/itest/wsdlgen/src/main/java/yetanotherpackage/DBean.java
+++ b/sca-java-1.x/trunk/itest/wsdlgen/src/main/java/yetanotherpackage/DBean.java
diff --git a/branches/sca-java-1.x/itest/wsdlgen/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/itest/wsdlgen/src/main/resources/META-INF/sca-contribution.xml
index c7797931d2..c7797931d2 100644
--- a/branches/sca-java-1.x/itest/wsdlgen/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/trunk/itest/wsdlgen/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.x/itest/wsdlgen/src/main/resources/definitions.xml b/sca-java-1.x/trunk/itest/wsdlgen/src/main/resources/definitions.xml
index e1b316dcc6..e1b316dcc6 100644
--- a/branches/sca-java-1.x/itest/wsdlgen/src/main/resources/definitions.xml
+++ b/sca-java-1.x/trunk/itest/wsdlgen/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.x/itest/wsdlgen/src/main/resources/helloworld.composite b/sca-java-1.x/trunk/itest/wsdlgen/src/main/resources/helloworld.composite
index 2b5d51b71e..2b5d51b71e 100644
--- a/branches/sca-java-1.x/itest/wsdlgen/src/main/resources/helloworld.composite
+++ b/sca-java-1.x/trunk/itest/wsdlgen/src/main/resources/helloworld.composite
diff --git a/branches/sca-java-1.x/itest/wsdlgen/src/main/resources/helloworld1.composite b/sca-java-1.x/trunk/itest/wsdlgen/src/main/resources/helloworld1.composite
index 3bd84f34d9..3bd84f34d9 100644
--- a/branches/sca-java-1.x/itest/wsdlgen/src/main/resources/helloworld1.composite
+++ b/sca-java-1.x/trunk/itest/wsdlgen/src/main/resources/helloworld1.composite
diff --git a/branches/sca-java-1.x/itest/wsdlgen/src/main/resources/wsdl/HelloWorldService_TuscanyGen.wsdl b/sca-java-1.x/trunk/itest/wsdlgen/src/main/resources/wsdl/HelloWorldService_TuscanyGen.wsdl
index 185aa2c649..185aa2c649 100644
--- a/branches/sca-java-1.x/itest/wsdlgen/src/main/resources/wsdl/HelloWorldService_TuscanyGen.wsdl
+++ b/sca-java-1.x/trunk/itest/wsdlgen/src/main/resources/wsdl/HelloWorldService_TuscanyGen.wsdl
diff --git a/branches/sca-java-1.x/itest/wsdlgen/src/test/java/helloworld/HttpTransportTestCase.java b/sca-java-1.x/trunk/itest/wsdlgen/src/test/java/helloworld/HttpTransportTestCase.java
index 22f154fbf3..22f154fbf3 100644
--- a/branches/sca-java-1.x/itest/wsdlgen/src/test/java/helloworld/HttpTransportTestCase.java
+++ b/sca-java-1.x/trunk/itest/wsdlgen/src/test/java/helloworld/HttpTransportTestCase.java
diff --git a/branches/sca-java-1.x/itest/wsdlgen/src/test/java/helloworld/JmsTransportTestCase.java b/sca-java-1.x/trunk/itest/wsdlgen/src/test/java/helloworld/JmsTransportTestCase.java
index fe74ef1a3d..fe74ef1a3d 100644
--- a/branches/sca-java-1.x/itest/wsdlgen/src/test/java/helloworld/JmsTransportTestCase.java
+++ b/sca-java-1.x/trunk/itest/wsdlgen/src/test/java/helloworld/JmsTransportTestCase.java
diff --git a/branches/sca-java-1.x/itest/wsdlgen/src/test/resources/wsdl/HelloWorldImplService.wsdl b/sca-java-1.x/trunk/itest/wsdlgen/src/test/resources/wsdl/HelloWorldImplService.wsdl
index 5fa0d565b1..5fa0d565b1 100644
--- a/branches/sca-java-1.x/itest/wsdlgen/src/test/resources/wsdl/HelloWorldImplService.wsdl
+++ b/sca-java-1.x/trunk/itest/wsdlgen/src/test/resources/wsdl/HelloWorldImplService.wsdl
diff --git a/branches/sca-java-1.x/itest/wsdlgen/src/test/resources/wsdl/HelloWorldImplService_schema1.xsd b/sca-java-1.x/trunk/itest/wsdlgen/src/test/resources/wsdl/HelloWorldImplService_schema1.xsd
index 70de7a05ae..70de7a05ae 100644
--- a/branches/sca-java-1.x/itest/wsdlgen/src/test/resources/wsdl/HelloWorldImplService_schema1.xsd
+++ b/sca-java-1.x/trunk/itest/wsdlgen/src/test/resources/wsdl/HelloWorldImplService_schema1.xsd
diff --git a/branches/sca-java-1.x/itest/wsdlgen/src/test/resources/wsdl/HelloWorldImplService_schema2.xsd b/sca-java-1.x/trunk/itest/wsdlgen/src/test/resources/wsdl/HelloWorldImplService_schema2.xsd
index 446492c371..446492c371 100644
--- a/branches/sca-java-1.x/itest/wsdlgen/src/test/resources/wsdl/HelloWorldImplService_schema2.xsd
+++ b/sca-java-1.x/trunk/itest/wsdlgen/src/test/resources/wsdl/HelloWorldImplService_schema2.xsd
diff --git a/branches/sca-java-1.x/itest/wsdlgen/src/test/resources/wsdl/README b/sca-java-1.x/trunk/itest/wsdlgen/src/test/resources/wsdl/README
index f0092fbfb1..f0092fbfb1 100644
--- a/branches/sca-java-1.x/itest/wsdlgen/src/test/resources/wsdl/README
+++ b/sca-java-1.x/trunk/itest/wsdlgen/src/test/resources/wsdl/README
diff --git a/branches/sca-java-1.x/itest/wsdlless/pom.xml b/sca-java-1.x/trunk/itest/wsdlless/pom.xml
index ab0e767d9a..ab0e767d9a 100644
--- a/branches/sca-java-1.x/itest/wsdlless/pom.xml
+++ b/sca-java-1.x/trunk/itest/wsdlless/pom.xml
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
index 5886ebc6ff..5886ebc6ff 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
index df658428fd..df658428fd 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
index d39df8c00e..d39df8c00e 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
index d4a06780c3..d4a06780c3 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
index 6dc46c60b5..6dc46c60b5 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
index 8471000152..8471000152 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
index 859c61a724..859c61a724 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
index e747eb041f..e747eb041f 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java
index ca7c25f3fa..ca7c25f3fa 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java
index 8b234599aa..8b234599aa 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java
index 03984f7252..03984f7252 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
index 45bb697437..45bb697437 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
index 9342c8e6ee..9342c8e6ee 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
index 6c5ac96b67..6c5ac96b67 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
index ebaf33f568..ebaf33f568 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/main/java/service/AnObject.java b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/service/AnObject.java
index 65ba52f356..65ba52f356 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/main/java/service/AnObject.java
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/service/AnObject.java
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/main/java/service/MoreComplexObject.java b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/service/MoreComplexObject.java
index 69eba6701d..69eba6701d 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/main/java/service/MoreComplexObject.java
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/service/MoreComplexObject.java
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/main/java/service/SomeService.java b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/service/SomeService.java
index f6aaacb23a..f6aaacb23a 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/main/java/service/SomeService.java
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/service/SomeService.java
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/main/java/service/SomeServiceImpl.java b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/service/SomeServiceImpl.java
index 39a2131024..39a2131024 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/main/java/service/SomeServiceImpl.java
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/main/java/service/SomeServiceImpl.java
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/main/resources/SDOWSDLTest.composite b/sca-java-1.x/trunk/itest/wsdlless/src/main/resources/SDOWSDLTest.composite
index 16d3806318..16d3806318 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/main/resources/SDOWSDLTest.composite
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/main/resources/SDOWSDLTest.composite
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/main/resources/WSDLTest.composite b/sca-java-1.x/trunk/itest/wsdlless/src/main/resources/WSDLTest.composite
index e69cdbc282..e69cdbc282 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/main/resources/WSDLTest.composite
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/main/resources/WSDLTest.composite
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/main/resources/some.composite b/sca-java-1.x/trunk/itest/wsdlless/src/main/resources/some.composite
index 1b099239d1..1b099239d1 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/main/resources/some.composite
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/main/resources/some.composite
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl b/sca-java-1.x/trunk/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl
index 73f9ed4bfc..73f9ed4bfc 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/trunk/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl
index bc6fe0e89a..bc6fe0e89a 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java b/sca-java-1.x/trunk/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
index 33f541b21b..33f541b21b 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java b/sca-java-1.x/trunk/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
index 82bf7ce650..82bf7ce650 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/test/java/service/SomeComponentTestCase.java b/sca-java-1.x/trunk/itest/wsdlless/src/test/java/service/SomeComponentTestCase.java
index 95603ad0be..95603ad0be 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/test/java/service/SomeComponentTestCase.java
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/test/java/service/SomeComponentTestCase.java
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/test/java/service/generated/AnObject.java b/sca-java-1.x/trunk/itest/wsdlless/src/test/java/service/generated/AnObject.java
index effeb3c701..effeb3c701 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/test/java/service/generated/AnObject.java
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/test/java/service/generated/AnObject.java
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObject.java b/sca-java-1.x/trunk/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObject.java
index 284e961788..284e961788 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObject.java
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObject.java
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObjectResponse.java b/sca-java-1.x/trunk/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObjectResponse.java
index 4113aa1a0a..4113aa1a0a 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObjectResponse.java
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObjectResponse.java
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/test/java/service/generated/GetUsingString.java b/sca-java-1.x/trunk/itest/wsdlless/src/test/java/service/generated/GetUsingString.java
index 532b948b47..532b948b47 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/test/java/service/generated/GetUsingString.java
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/test/java/service/generated/GetUsingString.java
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/test/java/service/generated/GetUsingStringResponse.java b/sca-java-1.x/trunk/itest/wsdlless/src/test/java/service/generated/GetUsingStringResponse.java
index 82bfb2d2aa..82bfb2d2aa 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/test/java/service/generated/GetUsingStringResponse.java
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/test/java/service/generated/GetUsingStringResponse.java
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/test/java/service/generated/MoreComplexObject.java b/sca-java-1.x/trunk/itest/wsdlless/src/test/java/service/generated/MoreComplexObject.java
index 61c7c6cb19..61c7c6cb19 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/test/java/service/generated/MoreComplexObject.java
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/test/java/service/generated/MoreComplexObject.java
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/test/java/service/generated/ObjectFactory.java b/sca-java-1.x/trunk/itest/wsdlless/src/test/java/service/generated/ObjectFactory.java
index 1ba0c497d9..1ba0c497d9 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/test/java/service/generated/ObjectFactory.java
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/test/java/service/generated/ObjectFactory.java
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/test/java/service/generated/SomeService.java b/sca-java-1.x/trunk/itest/wsdlless/src/test/java/service/generated/SomeService.java
index 4a584a8da2..4a584a8da2 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/test/java/service/generated/SomeService.java
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/test/java/service/generated/SomeService.java
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/test/java/service/generated/SomeServiceService.java b/sca-java-1.x/trunk/itest/wsdlless/src/test/java/service/generated/SomeServiceService.java
index 44c2b67256..44c2b67256 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/test/java/service/generated/SomeServiceService.java
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/test/java/service/generated/SomeServiceService.java
diff --git a/branches/sca-java-1.x/itest/wsdlless/src/test/java/service/generated/package-info.java b/sca-java-1.x/trunk/itest/wsdlless/src/test/java/service/generated/package-info.java
index d7b3fef82e..d7b3fef82e 100644
--- a/branches/sca-java-1.x/itest/wsdlless/src/test/java/service/generated/package-info.java
+++ b/sca-java-1.x/trunk/itest/wsdlless/src/test/java/service/generated/package-info.java