Author: rfeng
Date: Thu Sep 14 14:29:44 2006
New Revision: 443479
URL: http://svn.apache.org/viewvc?view=rev&rev=443479
Log:
Bring up the helloworldwsclient to work with AXIOM databinding
Added:
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/binding.axis2.scdl
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/databinding.axiom.scdl
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/databinding.scdl
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/databinding.sdo.scdl
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/interface.wsdl.scdl
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/webapp.scdl
incubator/tuscany/java/samples/sca/helloworldwsclient/src/test/resources/META-INF/tuscany/test-databinding-axiom.scdl
incubator/tuscany/java/samples/sca/helloworldwsclient/src/test/resources/META-INF/tuscany/test-databinding.scdl
incubator/tuscany/java/samples/sca/helloworldwsclient/src/test/resources/META-INF/tuscany/test-interface-wsdl.scdl
Modified:
incubator/tuscany/java/samples/sca/helloworldws/pom.xml
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/WEB-INF/web.xml
incubator/tuscany/java/samples/sca/helloworldwsclient/pom.xml
incubator/tuscany/java/samples/sca/helloworldwsclient/src/main/java/helloworld/HelloWorldService.java
incubator/tuscany/java/samples/sca/helloworldwsclient/src/main/resources/META-INF/sca/default.scdl
incubator/tuscany/java/samples/sca/helloworldwsclient/src/test/java/helloworld/HelloWorldWSClient.java
incubator/tuscany/java/samples/sca/pom.xml
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Reference.java
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceServlet.java
Modified: incubator/tuscany/java/samples/sca/helloworldws/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldws/pom.xml?view=diff&rev=443479&r1=443478&r2=443479
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldws/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/helloworldws/pom.xml Thu Sep 14 14:29:44
2006
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tuscany.samples.sca</groupId>
<artifactId>tuscany-samples-sca</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>sample-helloworldws</artifactId>
@@ -37,11 +37,11 @@
<dependency>
<groupId>org.osoa</groupId>
<artifactId>sca-api-r0.95</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany</groupId>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>core</artifactId>
<version>${pom.version}</version>
<scope>runtime</scope> <!-- runtime is need for webapp integration
to include jar -->
@@ -58,6 +58,12 @@
<scope>runtime</scope> <!-- runtime is need for webapp integration
to include jar -->
</dependency>
<dependency>
+ <groupId>org.apache.tuscany.databinding</groupId>
+ <artifactId>databinding-axiom</artifactId>
+ <version>${pom.version}</version>
+ <scope>runtime</scope> <!-- runtime is need for webapp integration
to include jar -->
+ </dependency>
+ <dependency>
<groupId>org.apache.tuscany.runtime</groupId>
<artifactId>webapp</artifactId>
<version>${pom.version}</version>
@@ -89,4 +95,23 @@
</dependency>
</dependencies>
+
+ <build>
+ <finalName>sample-helloworldws-1.0-SNAPSHOT</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.tuscany</groupId>
+ <artifactId>tuscany-war-plugin</artifactId>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>tuscany-war</id>
+ <goals>
+ <goal>tuscany-war</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Added:
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/binding.axis2.scdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/binding.axis2.scdl?view=auto&rev=443479
==============================================================================
---
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/binding.axis2.scdl
(added)
+++
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/binding.axis2.scdl
Thu Sep 14 14:29:44 2006
@@ -0,0 +1,44 @@
+<?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.
+-->
+<!-- Axis2 based WebService binding extension -->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
+ xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT";
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT";
+ name="org.apache.tuscany.binding.axis2">
+
+ <!-- [rfeng] Commented it out for now. When this SCDL is loaded, the
DependencyLoader component
+ has not been initiated yet. We may need to play with initLevel setting -->
+ <!--
+ <tuscany:dependency>
+ <group>axis2</group>
+ <artifact>axis2-core</artifact>
+ <version>SNAPSHOT</version>
+ </tuscany:dependency>
+ -->
+
+ <component name="webservice.bindingLoader">
+ <system:implementation.system
class="org.apache.tuscany.binding.axis2.WebServiceBindingLoader"/>
+ </component>
+
+ <component name="webservice.axis2.bindingBuilder">
+ <system:implementation.system
class="org.apache.tuscany.binding.axis2.Axis2BindingBuilder"/>
+ </component>
+
+</composite>
Added:
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/databinding.axiom.scdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/databinding.axiom.scdl?view=auto&rev=443479
==============================================================================
---
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/databinding.axiom.scdl
(added)
+++
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/databinding.axiom.scdl
Thu Sep 14 14:29:44 2006
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright (c) 2006 The Apache Software Foundation or its licensors, as
applicable.
+ *
+ * Licensed 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:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT";
+ name="org.apache.tuscany.databinding.Axiom">
+
+ <component name="databinding.axiom">
+ <system:implementation.system
class="org.apache.tuscany.databinding.axiom.AxiomDataBinding" />
+ </component>
+
+ <!-- Transformers -->
+ <component name="transformer.XMLStreamReader2OMElement">
+ <system:implementation.system
class="org.apache.tuscany.databinding.axiom.XMLStreamReader2OMElement" />
+ </component>
+
+ <component name="transformer.OMElement2XMLStreamReader">
+ <system:implementation.system
class="org.apache.tuscany.databinding.axiom.OMElement2XMLStreamReader" />
+ </component>
+
+ <component name="transformer.String2OMElement">
+ <system:implementation.system
class="org.apache.tuscany.databinding.axiom.String2OMElement" />
+ </component>
+
+ <component name="transformer.OMElement2String">
+ <system:implementation.system
class="org.apache.tuscany.databinding.axiom.OMElement2String" />
+ </component>
+</composite>
\ No newline at end of file
Added:
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/databinding.scdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/databinding.scdl?view=auto&rev=443479
==============================================================================
---
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/databinding.scdl
(added)
+++
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/databinding.scdl
Thu Sep 14 14:29:44 2006
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright (c) 2006 The Apache Software Foundation or its licensors, as
applicable.
+ *
+ * Licensed 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:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT";
+ name="org.apache.tuscany.databinding.Framework">
+
+ <include name="org.apache.tuscany.databinding.Axiom"
scdlLocation="databinding.axiom.scdl"/>
+ <include name="org.apache.tuscany.databinding.SDO"
scdlLocation="databinding.sdo.scdl"/>
+
+ <component name="databinding.wirePostProcessor">
+ <system:implementation.system
class="org.apache.tuscany.databinding.impl.DataBindingWirePostProcessor"/>
+ </component>
+
+ <component name="databinding.javaInterfaceProcessor">
+ <system:implementation.system
class="org.apache.tuscany.databinding.impl.DataBindingJavaInterfaceProcessor"/>
+ </component>
+
+ <!-- DataBinding registry -->
+ <component name="databinding.registry" initLevel="40">
+ <system:implementation.system
class="org.apache.tuscany.databinding.impl.DataBindingRegistryImpl" />
+ </component>
+
+ <!-- DataBinding registry -->
+ <component name="databinding.mediator" initLevel="40">
+ <system:implementation.system
class="org.apache.tuscany.databinding.impl.MediatorImpl" />
+ </component>
+
+ <!-- Transformer registry -->
+ <component name="databinding.transformerRegistry" initLevel="40">
+ <system:implementation.system
class="org.apache.tuscany.databinding.impl.TransformerRegistryImpl" />
+ </component>
+
+ <component name="dataType.loader">
+ <system:implementation.system
class="org.apache.tuscany.databinding.impl.DataTypeLoader" />
+ </component>
+
+ <!-- Simple databindings -->
+ <component name="databinding.dom">
+ <system:implementation.system
class="org.apache.tuscany.databinding.impl.SimpleDataBinding" />
+ <property name="className">org.w3c.dom.Node</property>
+ </component>
+
+ <!-- Transformers -->
+ <component name="transformer.Node2String">
+ <system:implementation.system
class="org.apache.tuscany.databinding.xml.Node2String" />
+ </component>
+
+ <component name="transformer.String2Node">
+ <system:implementation.system
class="org.apache.tuscany.databinding.xml.String2Node" />
+ </component>
+
+ <component name="transformer.Input2InputTransformer">
+ <system:implementation.system
class="org.apache.tuscany.databinding.idl.Input2InputTransformer" />
+ </component>
+
+ <component name="transformer.Output2OutputTransformer">
+ <system:implementation.system
class="org.apache.tuscany.databinding.idl.Output2OutputTransformer" />
+ </component>
+
+</composite>
\ No newline at end of file
Added:
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/databinding.sdo.scdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/databinding.sdo.scdl?view=auto&rev=443479
==============================================================================
---
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/databinding.sdo.scdl
(added)
+++
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/databinding.sdo.scdl
Thu Sep 14 14:29:44 2006
@@ -0,0 +1,34 @@
+<?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.
+-->
+<!--
+ import.sdo configuration
+
+ $Rev: 432832 $ $Date: 2006-08-19 05:37:17 -0700 (Sat, 19 Aug 2006) $
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
+ xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT";
+ name="org.apache.tuscany.databinding.sdo">
+
+ <!-- import.sdo element loader implementations -->
+ <component name="elementLoader.import.sdo">
+ <system:implementation.system
class="org.apache.tuscany.databinding.sdo.ImportSDOLoader"/>
+ </component>
+
+</composite>
Added:
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/interface.wsdl.scdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/interface.wsdl.scdl?view=auto&rev=443479
==============================================================================
---
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/interface.wsdl.scdl
(added)
+++
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/interface.wsdl.scdl
Thu Sep 14 14:29:44 2006
@@ -0,0 +1,44 @@
+<?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.
+-->
+<!--
+ Default system configuration for the launcher environment.
+
+ $Rev: 440894 $ $Date: 2006-09-06 15:52:01 -0700 (Wed, 06 Sep 2006) $
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT";
+ name="org.apache.tuscany.idl.WSDL">
+
+ <component name="interface.wsdl.Loader">
+ <system:implementation.system
class="org.apache.tuscany.idl.wsdl.InterfaceWSDLLoader" />
+ </component>
+
+ <component name="wsdl.Registry">
+ <system:implementation.system
class="org.apache.tuscany.idl.wsdl.WSDLDefinitionRegistryImpl" initLevel="40" />
+ </component>
+
+ <component name="xmlSchema.registry">
+ <system:implementation.system
class="org.apache.tuscany.idl.wsdl.XMLSchemaRegistryImpl" initLevel="35" />
+ </component>
+
+ <component name="interface.wsdl.Introspector">
+ <system:implementation.system
class="org.apache.tuscany.idl.wsdl.InterfaceWSDLIntrospectorImpl"
initLevel="40" />
+ </component>
+
+</composite>
\ No newline at end of file
Added:
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/webapp.scdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/webapp.scdl?view=auto&rev=443479
==============================================================================
---
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/webapp.scdl
(added)
+++
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/webapp.scdl
Thu Sep 14 14:29:44 2006
@@ -0,0 +1,140 @@
+<?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.
+-->
+<!--
+ Default system configuration for the launcher environment.
+
+ $Rev: 441816 $ $Date: 2006-09-09 09:43:24 -0700 (Sat, 09 Sep 2006) $
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
+ xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT";
+ name="org.apache.tuscany.runtime.webapp.System">
+
+ <!-- Component that provides the Deployer service -->
+ <component name="deployer">
+ <system:implementation.system
class="org.apache.tuscany.core.deployer.DeployerImpl"/>
+ </component>
+
+ <!-- Work management -->
+ <component name="workContext">
+ <system:implementation.system
class="org.apache.tuscany.core.component.WorkContextImpl"/>
+ </component>
+
+ <!-- Wire service -->
+ <component name="wireService">
+ <system:implementation.system
class="org.apache.tuscany.core.wire.jdk.JDKWireService"/>
+ </component>
+
+ <!-- Scope infrastructure -->
+ <component name="scopeRegistry">
+ <system:implementation.system
class="org.apache.tuscany.core.component.scope.ScopeRegistryImpl"/>
+ </component>
+
+ <!-- Builder and BuilderRegistry -->
+ <component name="builder">
+ <system:implementation.system
class="org.apache.tuscany.core.builder.BuilderRegistryImpl"/>
+ </component>
+
+ <!-- Loader and LoaderRegistry -->
+ <component name="loader">
+ <system:implementation.system
class="org.apache.tuscany.core.loader.LoaderRegistryImpl"/>
+ </component>
+
+ <!-- Introspector and IntrospectionRegistry -->
+ <component name="introspector">
+ <system:implementation.system
class="org.apache.tuscany.core.implementation.IntrospectionRegistryImpl"/>
+ </component>
+
+ <!-- Connector infrastructure -->
+ <component name="connector">
+ <system:implementation.system
class="org.apache.tuscany.core.builder.ConnectorImpl"/>
+ </component>
+
+ <component name="wirePostProcessorRegistry">
+ <system:implementation.system
class="org.apache.tuscany.core.builder.WirePostProcessorRegistryImpl"/>
+ </component>
+
+ <!-- Default scopes -->
+ <component name="scope.module">
+ <system:implementation.system
class="org.apache.tuscany.core.component.scope.ModuleScopeObjectFactory"/>
+ </component>
+ <component name="scope.stateless">
+ <system:implementation.system
class="org.apache.tuscany.core.component.scope.StatelessScopeObjectFactory"/>
+ </component>
+
+ <!-- include loader configuration -->
+ <include name="org.apache.tuscany.launcher.Loader"
scdlResource="org/apache/tuscany/core/loader.scdl"/>
+
+ <!-- include implementation processor configuration -->
+ <include name="org.apache.tuscany.launcher.Implementation"
scdlResource="org/apache/tuscany/core/implementation.scdl"/>
+
+ <!-- Java interface definition language -->
+ <include name="org.apache.tuscany.launcher.InterfaceJava"
scdlResource="org/apache/tuscany/core/interfaceJava.scdl"/>
+
+ <!-- include omposite implementation type -->
+ <include name="org.apache.tuscany.launcher.Composite"
scdlResource="org/apache/tuscany/core/composite.scdl"/>
+
+ <!-- System implementation type -->
+ <include name="org.apache.tuscany.launcher.SystemImplementation"
scdlResource="org/apache/tuscany/core/systemImplementation.scdl"/>
+
+ <!-- Java implementation type -->
+ <include name="org.apache.tuscany.launcher.JavaImplementation"
scdlResource="org/apache/tuscany/core/javaImplementation.scdl"/>
+
+ <!-- component that scans the extension directory -->
+ <component name="directoryScanExtender">
+ <system:implementation.system
class="org.apache.tuscany.core.services.extension.DirectoryScanExtender"/>
+ <property name="path">extension</property>
+ </component>
+
+ <!-- WorkScheduler service -->
+ <component name="workManager">
+ <system:implementation.system
+
class="org.apache.tuscany.core.services.work.jsr237.workmanager.ThreadPoolWorkManager"/>
+ <property name="poolSize">10</property>
+ </component>
+
+ <component name="workScheduler">
+ <system:implementation.system
class="org.apache.tuscany.core.services.work.jsr237.Jsr237WorkScheduler"/>
+ </component>
+
+ <!-- Web app ServletHost -->
+ <component name="servletHost">
+ <system:implementation.system
class="org.apache.tuscany.runtime.webapp.ServletHostImpl"/>
+ </component>
+
+ <component name="policyBuilderRegistry">
+ <system:implementation.system
class="org.apache.tuscany.core.policy.PolicyBuilderRegistryImpl"/>
+ </component>
+
+ <component name="propertyFactory">
+ <system:implementation.system
class="org.apache.tuscany.core.loader.StringParserPropertyFactory"/>
+ </component>
+
+ <component name="artifactRepository">
+ <system:implementation.system
class="org.apache.tuscany.core.services.artifact.LocalMavenRepository"/>
+ <!-- this value needs to change to a correct one -->
+ <property name = "repository">.</property>
+ </component>
+
+ <include name="databinding.framework" scdlLocation="databinding.scdl"/>
+ <include name="binding.axis2" scdlLocation="binding.axis2.scdl"/>
+ <include name="interface.wsdl" scdlLocation="interface.wsdl.scdl"/>
+
+
+</composite>
Modified:
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/WEB-INF/web.xml?view=diff&rev=443479&r1=443478&r2=443479
==============================================================================
---
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/WEB-INF/web.xml
(original)
+++
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/WEB-INF/web.xml
Thu Sep 14 14:29:44 2006
@@ -24,12 +24,12 @@
<display-name>Tuscany HelloWorld Web Service Sample</display-name>
<context-param>
- <param-name>systemScdlPath</param-name>
- <param-value>/META-INF/sca/webapp.system.scdl</param-value>
+ <param-name>tuscany.systemScdlPath</param-name>
+ <param-value>/META-INF/tuscany/webapp.scdl</param-value>
</context-param>
<context-param>
- <param-name>applicationScdlPath</param-name>
+ <param-name>tuscany.applicationScdlPath</param-name>
<param-value>/META-INF/sca/default.scdl</param-value>
</context-param>
Modified: incubator/tuscany/java/samples/sca/helloworldwsclient/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldwsclient/pom.xml?view=diff&rev=443479&r1=443478&r2=443479
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldwsclient/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/helloworldwsclient/pom.xml Thu Sep 14
14:29:44 2006
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tuscany.samples.sca</groupId>
<artifactId>tuscany-samples-sca</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>sample-helloworldwsclient</artifactId>
@@ -34,7 +34,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.tuscany</groupId>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>core</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
Modified:
incubator/tuscany/java/samples/sca/helloworldwsclient/src/main/java/helloworld/HelloWorldService.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldwsclient/src/main/java/helloworld/HelloWorldService.java?view=diff&rev=443479&r1=443478&r2=443479
==============================================================================
---
incubator/tuscany/java/samples/sca/helloworldwsclient/src/main/java/helloworld/HelloWorldService.java
(original)
+++
incubator/tuscany/java/samples/sca/helloworldwsclient/src/main/java/helloworld/HelloWorldService.java
Thu Sep 14 14:29:44 2006
@@ -18,9 +18,10 @@
*/
package helloworld;
+import org.osoa.sca.annotations.Remotable;
import org.osoa.sca.annotations.Service;
-
[EMAIL PROTECTED]
@Service
public interface HelloWorldService {
Modified:
incubator/tuscany/java/samples/sca/helloworldwsclient/src/main/resources/META-INF/sca/default.scdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldwsclient/src/main/resources/META-INF/sca/default.scdl?view=diff&rev=443479&r1=443478&r2=443479
==============================================================================
---
incubator/tuscany/java/samples/sca/helloworldwsclient/src/main/resources/META-INF/sca/default.scdl
(original)
+++
incubator/tuscany/java/samples/sca/helloworldwsclient/src/main/resources/META-INF/sca/default.scdl
Thu Sep 14 14:29:44 2006
@@ -29,7 +29,12 @@
</component>
<reference name="HelloWorldService">
+ <!--
<interface.java interface="helloworld.HelloWorldService"/>
+ -->
+ <interface.wsdl xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance";
+ interface="http://helloworld#wsdl.interface(HelloWorld)"
+ wsdli:wsdlLocation="http://helloworld wsdl/helloworld.wsdl" />
<binding.ws
endpoint="http://helloworld#wsdl.endpoint(HelloWorldService/HelloWorldSoapPort)"
location="wsdl/helloworld.wsdl" />
</reference>
Modified:
incubator/tuscany/java/samples/sca/helloworldwsclient/src/test/java/helloworld/HelloWorldWSClient.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldwsclient/src/test/java/helloworld/HelloWorldWSClient.java?view=diff&rev=443479&r1=443478&r2=443479
==============================================================================
---
incubator/tuscany/java/samples/sca/helloworldwsclient/src/test/java/helloworld/HelloWorldWSClient.java
(original)
+++
incubator/tuscany/java/samples/sca/helloworldwsclient/src/test/java/helloworld/HelloWorldWSClient.java
Thu Sep 14 14:29:44 2006
@@ -34,9 +34,12 @@
@Override
protected void setUp() throws Exception {
+ ClassLoader classLoader = getClass().getClassLoader();
+ addExtension("idl.wsdl",
classLoader.getResource("META-INF/tuscany/test-interface-wsdl.scdl"));
+ addExtension("databinding",
classLoader.getResource("META-INF/tuscany/test-databinding.scdl"));
// FIXME: Adding extensions programtically
- addExtension("org.apache.tuscany.binding.axis2.WebServiceBinding",
getClass().getClassLoader().getResource("META-INF/tuscany/binding.axis2.scdl"));
- addExtension("org.apache.tuscany.databinding.sdo",
getClass().getClassLoader().getResource("META-INF/tuscany/databinding.sdo.scdl"));
+ addExtension("org.apache.tuscany.binding.axis2.WebServiceBinding",
classLoader.getResource("META-INF/tuscany/binding.axis2.scdl"));
+ addExtension("org.apache.tuscany.databinding.sdo",
classLoader.getResource("META-INF/tuscany/databinding.sdo.scdl"));
super.setUp();
CompositeContext compositeContext =
CurrentCompositeContext.getContext();
helloWorldService =
compositeContext.locateService(HelloWorldService.class,
"HelloWorldServiceComponent");
Added:
incubator/tuscany/java/samples/sca/helloworldwsclient/src/test/resources/META-INF/tuscany/test-databinding-axiom.scdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldwsclient/src/test/resources/META-INF/tuscany/test-databinding-axiom.scdl?view=auto&rev=443479
==============================================================================
---
incubator/tuscany/java/samples/sca/helloworldwsclient/src/test/resources/META-INF/tuscany/test-databinding-axiom.scdl
(added)
+++
incubator/tuscany/java/samples/sca/helloworldwsclient/src/test/resources/META-INF/tuscany/test-databinding-axiom.scdl
Thu Sep 14 14:29:44 2006
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright (c) 2006 The Apache Software Foundation or its licensors, as
applicable.
+ *
+ * Licensed 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:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT";
+ name="org.apache.tuscany.databinding.Axiom">
+
+ <component name="databinding.axiom">
+ <system:implementation.system
class="org.apache.tuscany.databinding.axiom.AxiomDataBinding" />
+ </component>
+
+ <!-- Transformers -->
+ <component name="transformer.XMLStreamReader2OMElement">
+ <system:implementation.system
class="org.apache.tuscany.databinding.axiom.XMLStreamReader2OMElement" />
+ </component>
+
+ <component name="transformer.OMElement2XMLStreamReader">
+ <system:implementation.system
class="org.apache.tuscany.databinding.axiom.OMElement2XMLStreamReader" />
+ </component>
+
+ <component name="transformer.String2OMElement">
+ <system:implementation.system
class="org.apache.tuscany.databinding.axiom.String2OMElement" />
+ </component>
+
+ <component name="transformer.OMElement2String">
+ <system:implementation.system
class="org.apache.tuscany.databinding.axiom.OMElement2String" />
+ </component>
+</composite>
\ No newline at end of file
Added:
incubator/tuscany/java/samples/sca/helloworldwsclient/src/test/resources/META-INF/tuscany/test-databinding.scdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldwsclient/src/test/resources/META-INF/tuscany/test-databinding.scdl?view=auto&rev=443479
==============================================================================
---
incubator/tuscany/java/samples/sca/helloworldwsclient/src/test/resources/META-INF/tuscany/test-databinding.scdl
(added)
+++
incubator/tuscany/java/samples/sca/helloworldwsclient/src/test/resources/META-INF/tuscany/test-databinding.scdl
Thu Sep 14 14:29:44 2006
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright (c) 2006 The Apache Software Foundation or its licensors, as
applicable.
+ *
+ * Licensed 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:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT";
+ name="org.apache.tuscany.databinding.Framework">
+
+ <include name="org.apache.tuscany.databinding.Axiom"
scdlLocation="test-databinding-axiom.scdl"/>
+
+ <component name="databinding.wirePostProcessor">
+ <system:implementation.system
class="org.apache.tuscany.databinding.impl.DataBindingWirePostProcessor"/>
+ </component>
+
+ <component name="databinding.javaInterfaceProcessor">
+ <system:implementation.system
class="org.apache.tuscany.databinding.impl.DataBindingJavaInterfaceProcessor"/>
+ </component>
+
+ <!-- DataBinding registry -->
+ <component name="databinding.registry" initLevel="40">
+ <system:implementation.system
class="org.apache.tuscany.databinding.impl.DataBindingRegistryImpl" />
+ </component>
+
+ <!-- DataBinding registry -->
+ <component name="databinding.mediator" initLevel="40">
+ <system:implementation.system
class="org.apache.tuscany.databinding.impl.MediatorImpl" />
+ </component>
+
+ <!-- Transformer registry -->
+ <component name="databinding.transformerRegistry" initLevel="40">
+ <system:implementation.system
class="org.apache.tuscany.databinding.impl.TransformerRegistryImpl" />
+ </component>
+
+ <component name="dataType.loader">
+ <system:implementation.system
class="org.apache.tuscany.databinding.impl.DataTypeLoader" />
+ </component>
+
+ <!-- Simple databindings -->
+ <component name="databinding.dom">
+ <system:implementation.system
class="org.apache.tuscany.databinding.impl.SimpleDataBinding" />
+ <property name="className">org.w3c.dom.Node</property>
+ </component>
+
+ <!-- Transformers -->
+ <component name="transformer.Node2String">
+ <system:implementation.system
class="org.apache.tuscany.databinding.xml.Node2String" />
+ </component>
+
+ <component name="transformer.String2Node">
+ <system:implementation.system
class="org.apache.tuscany.databinding.xml.String2Node" />
+ </component>
+
+ <component name="transformer.Input2InputTransformer">
+ <system:implementation.system
class="org.apache.tuscany.databinding.idl.Input2InputTransformer" />
+ </component>
+
+ <component name="transformer.Output2OutputTransformer">
+ <system:implementation.system
class="org.apache.tuscany.databinding.idl.Output2OutputTransformer" />
+ </component>
+
+</composite>
\ No newline at end of file
Added:
incubator/tuscany/java/samples/sca/helloworldwsclient/src/test/resources/META-INF/tuscany/test-interface-wsdl.scdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldwsclient/src/test/resources/META-INF/tuscany/test-interface-wsdl.scdl?view=auto&rev=443479
==============================================================================
---
incubator/tuscany/java/samples/sca/helloworldwsclient/src/test/resources/META-INF/tuscany/test-interface-wsdl.scdl
(added)
+++
incubator/tuscany/java/samples/sca/helloworldwsclient/src/test/resources/META-INF/tuscany/test-interface-wsdl.scdl
Thu Sep 14 14:29:44 2006
@@ -0,0 +1,44 @@
+<?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.
+-->
+<!--
+ Default system configuration for the launcher environment.
+
+ $Rev: 440894 $ $Date: 2006-09-06 15:52:01 -0700 (Wed, 06 Sep 2006) $
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT";
+ name="org.apache.tuscany.idl.WSDL">
+
+ <component name="interface.wsdl.Loader">
+ <system:implementation.system
class="org.apache.tuscany.idl.wsdl.InterfaceWSDLLoader" />
+ </component>
+
+ <component name="wsdl.Registry">
+ <system:implementation.system
class="org.apache.tuscany.idl.wsdl.WSDLDefinitionRegistryImpl" initLevel="40" />
+ </component>
+
+ <component name="xmlSchema.registry">
+ <system:implementation.system
class="org.apache.tuscany.idl.wsdl.XMLSchemaRegistryImpl" initLevel="35" />
+ </component>
+
+ <component name="interface.wsdl.Introspector">
+ <system:implementation.system
class="org.apache.tuscany.idl.wsdl.InterfaceWSDLIntrospectorImpl"
initLevel="40" />
+ </component>
+
+</composite>
\ No newline at end of file
Modified: incubator/tuscany/java/samples/sca/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/pom.xml?view=diff&rev=443479&r1=443478&r2=443479
==============================================================================
--- incubator/tuscany/java/samples/sca/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/pom.xml Thu Sep 14 14:29:44 2006
@@ -41,11 +41,11 @@
<module>supplychain</module>
<module>bigbank</module>
<module>echo.binding</module>
- <module>echo.databinding</module>
<module>spring.simple</module>
- <module>helloworldwsclient</module>
- <module>helloworldws</module>
<module>helloworldws-celtix</module>
-->
+ <module>echo.databinding</module>
+ <module>helloworldwsclient</module>
+ <module>helloworldws</module>
</modules>
</project>
Modified:
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Reference.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Reference.java?view=diff&rev=443479&r1=443478&r2=443479
==============================================================================
---
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Reference.java
(original)
+++
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2Reference.java
Thu Sep 14 14:29:44 2006
@@ -35,6 +35,7 @@
import commonj.sdo.helper.TypeHelper;
import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
@@ -47,12 +48,14 @@
import org.apache.tuscany.binding.axis2.util.TuscanyAxisConfigurator;
import org.apache.tuscany.binding.axis2.util.WebServiceOperationMetaData;
import org.apache.tuscany.binding.axis2.util.WebServicePortMetaData;
+import org.apache.tuscany.idl.wsdl.WSDLOperation;
/**
* Axis2Reference uses Axis2 to invoke a remote web service
*/
public class Axis2Reference<T> extends ReferenceExtension {
+ private static final String OM_DATA_BINDING = OMElement.class.getName();
private WebServicePortMetaData wsPortMetaData;
private ServiceClient serviceClient;
@@ -86,6 +89,12 @@
try {
//FIXME: SDODataBinding needs to pass in TypeHelper and
classLoader as parameters.
invoker = createOperationInvoker(serviceClient, operation,
typeHelper, wsPortMetaData, false);
+ // HACK to set the databinding
+ operation.setDataBinding(OM_DATA_BINDING);
+ WSDLOperation op = (WSDLOperation)
operation.getMetaData().get(WSDLOperation.class.getName());
+ if (op != null) {
+ op.setDataBinding(OM_DATA_BINDING);
+ }
} catch (AxisFault e) {
e.printStackTrace();
throw new RuntimeException(e);
Modified:
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceServlet.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceServlet.java?view=diff&rev=443479&r1=443478&r2=443479
==============================================================================
---
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceServlet.java
(original)
+++
incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceServlet.java
Thu Sep 14 14:29:44 2006
@@ -18,6 +18,7 @@
*/
package org.apache.tuscany.binding.axis2;
+import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
@@ -30,6 +31,8 @@
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.transport.http.AxisServlet;
@@ -45,6 +48,8 @@
private static final long serialVersionUID = 1L;
private static final ServletConfig DUMMY_CONFIG =
createDummyServletConfig();
+
+ private boolean inited;
public void init(ConfigurationContext configContext) {
this.configContext = configContext;
@@ -179,6 +184,19 @@
}
};
return sc;
+ }
+
+ @Override
+ protected void service(HttpServletRequest request, HttpServletResponse
response)
+ throws ServletException, IOException {
+ // HACK: Get the correct context root which is not available during
init() call
+ if (!inited) {
+ synchronized (configContext) {
+ configContext.setContextRoot(request.getContextPath());
+ inited = true;
+ }
+ }
+ super.service(request, response);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
