Moving 1.x branches

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835127 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 0 insertions, 483 deletions

diff --git a/branches/sca-java-1.3/itest/databindings/jaxbgen/pom.xml b/branches/sca-java-1.3/itest/databindings/jaxbgen/pom.xml
deleted file mode 100644
index 2422187398..0000000000
--- a/branches/sca-java-1.3/itest/databindings/jaxbgen/pom.xml
+++ /dev/null
@@ -1,262 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<project>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>itest-databindings</artifactId>
-        <version>1.3-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>itest-databindings-jaxb</artifactId>
-    <version>1.3-SNAPSHOT</version>
-    <packaging>jar</packaging>
-    <name>Apache Tuscany SCA JAXB Databinding Integration Tests</name>
-
-    <repositories>
-        <repository>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>java.net</id>
-            <name>java.net Maven 1.x Repository</name>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository>
-        <repository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>${pom.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
-            <version>${pom.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>itest-databindings-common</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.3-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
-            <scope>compile</scope>
-        </dependency>
- 
-        <dependency>
-            <groupId>com.sun.xml.ws</groupId>
-            <artifactId>jaxws-rt</artifactId>
-            <version>2.1.3</version>
-        </dependency>
-        <!-- Added by Simon Nash    -->
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>3.1</version>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.12</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- End of addition   -->
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <argLine>-Djava.endorsed.dirs=target/endorsed</argLine>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.tuscany.sca</groupId>
-                                    <artifactId>itest-databindings-common</artifactId>
-                                    <version>${project.version}</version>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>javax.xml.ws</groupId>
-                                    <artifactId>jaxws-api</artifactId>
-                                    <version>2.1</version>
-                                    <type>jar</type>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>javax.xml.bind</groupId>
-                                    <artifactId>jaxb-api</artifactId>
-                                    <version>2.1</version>
-                                    <type>jar</type>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>true</overWriteSnapshots>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-test-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/jaxws-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-test-source</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>java</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <mainClass>org.apache.tuscany.sca.itest.generate.Generate</mainClass>
-                    <arguments>
-                        <argument>${project.build.directory}</argument>
-                    </arguments>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.9</version>
-                <executions>
-                    <execution>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <packageName>org.apache.tuscany.sca.itest.jaxbdatabinding.generated</packageName>
-                    <wsdlDirectory>${project.build.directory}/classes/wsdl</wsdlDirectory>
-                    <wsdlFiles>
-                        <wsdlFile>Greeter.wsdl</wsdlFile>
-                    </wsdlFiles>
-                    <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                    <verbose>false</verbose>
-                    <xnocompile>true</xnocompile>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/branches/sca-java-1.3/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml b/branches/sca-java-1.3/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
deleted file mode 100644
index 8381a164ea..0000000000
--- a/branches/sca-java-1.3/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<tns:Generate xmlns:tns="http://www.apache.org/tuscany/generate" 
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-              xsi:schemaLocation="http://www.example.org/generate generate.xsd ">
-             
-               
-  <Template>
-    <TemplateName>GreeterService.java.vm</TemplateName>
-    <TemplateTargetDir>../src/main/java/org/apache/tuscany/sca/itest/jaxbdatabinding</TemplateTargetDir>
-    <JavaPackage>org.apache.tuscany.sca.itest.jaxbdatabinding</JavaPackage>
-  </Template>                  
-  <Template>
-    <TemplateName>GreeterServiceImpl.java.vm</TemplateName>
-    <TemplateTargetDir>../src/main/java/org/apache/tuscany/sca/itest/jaxbdatabinding</TemplateTargetDir>
-    <JavaPackage>org.apache.tuscany.sca.itest.jaxbdatabinding</JavaPackage>
-  </Template>                  
-  <Template>
-    <TemplateName>GreeterServiceClient.java.vm</TemplateName>
-    <TemplateTargetDir>../src/main/java/org/apache/tuscany/sca/itest/jaxbdatabinding</TemplateTargetDir>
-    <JavaPackage>org.apache.tuscany.sca.itest.jaxbdatabinding</JavaPackage>
-  </Template>                  
-  <Template>
-    <TemplateName>GreeterServiceClientImpl.java.vm</TemplateName>
-    <TemplateTargetDir>../src/main/java/org/apache/tuscany/sca/itest/jaxbdatabinding</TemplateTargetDir>
-    <JavaPackage>org.apache.tuscany.sca.itest.jaxbdatabinding</JavaPackage>
-  </Template>                  
-  <Template>
-    <TemplateName>DatabindingTestCase.java.vm</TemplateName>
-    <TemplateTargetDir>../src/test/java/org/apache/tuscany/sca/itest/jaxbdatabinding</TemplateTargetDir>
-    <JavaPackage>org.apache.tuscany.sca.itest.jaxbdatabinding</JavaPackage>
-  </Template> 
-  <Template>
-    <TemplateName>Greeter.wsdl.vm</TemplateName>
-    <TemplateTargetDir>classes/wsdl</TemplateTargetDir>
-  </Template> 
-  <InputFile>
-    <FileName>Person.xsd</FileName>
-    <FilePath>xsd</FilePath>
-    <JavaPackage>org.apache.tuscany.sca.itest.jaxbdatabinding.generated</JavaPackage>
-    <Factory>ObjectFactory</Factory> 
-    <Namespace>http://apache.org/tuscany/sca/itest/databinding/types</Namespace>  
-    <Prefix>p</Prefix> 
-    <Type>
-      <TypeName>PersonType</TypeName>
-      <CreateTypeCode>
-        ObjectFactory factory = new ObjectFactory();
-        param = factory.createPersonType();
-        param.setFirstName("George");
-        param.setLastName("Doors");
-      </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setGreeting("Hello");
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertNotSame("greetedPerson.getGreeting() not set", "", result.getGreeting());
-      </ResultComparison>      
-    </Type>
-  </InputFile>
-  <InputFile>
-    <FileName>Interop.xsd</FileName>
-    <FilePath>xsd</FilePath>
-    <JavaPackage>org.apache.tuscany.sca.itest.jaxbdatabinding.generated</JavaPackage>  
-    <Factory>ObjectFactory</Factory>
-    <Namespace>http://www.apache.org/tuscany/interop</Namespace>  
-    <Prefix>i</Prefix>   
-    <!-- Type>
-      <TypeName>AnnotationComplexType</TypeName>
-      <CreateTypeCode>
-        ObjectFactory factory = new ObjectFactory();
-        param = factory.createAnnotationComplexType();
-        param.setSimpleTypeWithNameElement("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setSimpleTypeWithNameElement("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithNameElement());
-      </ResultComparison>      
-    </Type-->  
-    <Type>
-      <TypeName>AttributeComplexType</TypeName>
-      <CreateTypeCode>
-        ObjectFactory factory = new ObjectFactory();
-        org.apache.tuscany.sca.itest.jaxbdatabinding.generated.AttributeType attrib = factory.createAttributeType();
-        attrib.setAttribute("SomeText");
-        param = factory.createAttributeComplexType();
-        param.setAttributeElement(attrib);
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.getAttributeElement().setAttribute("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getAttributeElement().getAttribute());
-      </ResultComparison>      
-    </Type> 
-    <Type>
-      <TypeName>AttributeReferenceComplexType</TypeName>
-      <CreateTypeCode>
-        ObjectFactory factory = new ObjectFactory();
-        param = factory.createAttributeReferenceComplexType();
-        
-        param.setReferencedAttribute("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setReferencedAttribute("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getReferencedAttribute());
-      </ResultComparison>      
-    </Type>     
-    <Type>
-      <TypeName>SimpleTypeWithAbstractComplexType</TypeName>
-      <CreateTypeCode>
-        ObjectFactory factory = new ObjectFactory();
-        param = factory.createSimpleTypeWithAbstractComplexType();
-        param.setSimpleTypeWithAbstractExtensionElement("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setSimpleTypeWithAbstractExtensionElement("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithAbstractExtensionElement());
-      </ResultComparison>      
-    </Type>         
-    <Type>
-      <TypeName>SimpleTypeWithNameComplexType</TypeName>
-      <CreateTypeCode>
-        ObjectFactory factory = new ObjectFactory();
-        param = factory.createSimpleTypeWithNameComplexType();
-        param.setSimpleTypeWithNameElement("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setSimpleTypeWithNameElement("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithNameElement());
-      </ResultComparison>      
-    </Type> 
-    <Type>
-      <TypeName>ComplexTypeWithContentType</TypeName>
-      <CreateTypeCode>
-        ObjectFactory factory = new ObjectFactory();
-        param = factory.createComplexTypeWithContentType();
-        param.setSimpleTypeWithName("SomeText");
-       </CreateTypeCode>
-      <ModifyTypeCode>
-        param.setSimpleTypeWithName("SomeChangedText");;
-      </ModifyTypeCode>
-      <ResultComparison>
-        assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithName());
-      </ResultComparison>      
-    </Type> 
-  </InputFile>  
-</tns:Generate>
diff --git a/branches/sca-java-1.3/itest/databindings/jaxbgen/src/main/resources/greeter.composite b/branches/sca-java-1.3/itest/databindings/jaxbgen/src/main/resources/greeter.composite
deleted file mode 100644
index ae0740e6fe..0000000000
--- a/branches/sca-java-1.3/itest/databindings/jaxbgen/src/main/resources/greeter.composite
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    *

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    *

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.

--->

-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 

-           xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"

-           name="JAXBGreeterService">

-           

-    <!-- Clients to test the services -->

-    <component name="DefaultGreeterServiceClient">

-        <implementation.java class="org.apache.tuscany.sca.itest.jaxbdatabinding.GreeterServiceClientImpl" />

-        <reference name="greeterService" target="JAXBGreeterServiceComponent"/>

-    </component>

-

-    <component name="WSGreeterServiceClient">

-        <implementation.java class="org.apache.tuscany.sca.itest.jaxbdatabinding.GreeterServiceClientImpl" />

-    </component>

-

-    <reference name="JAXBGreeterServiceWSReference" promote="WSGreeterServiceClient/greeterService">

-        <interface.wsdl interface="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.interface(GreeterPortType)"/>

-        <binding.ws wsdlElement="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.port(GreeterService/GreeterPort)"/>

-    </reference>           

-

-    <!-- The greeter service -->

-    <service name="JAXBGreeterService" promote="JAXBGreeterServiceComponent">

-        <interface.wsdl interface="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.interface(GreeterPortType)"/>

-        <binding.ws wsdlElement="http://apache.org/tuscany/sca/itest/databinding/services#wsdl.port(GreeterService/GreeterPort)"/>

-    </service>

-

-    <!-- Components used to implement the services -->

-    <component name="JAXBGreeterServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.jaxbdatabinding.GreeterServiceImpl" />

-    </component>

-</composite>