tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsdelf...@apache.org
Subject svn commit: r510187 - in /incubator/tuscany/branches/sca-java-integration/sca: extensions/axis2/samples/helloworldws/src/main/resources/META-INF/tuscany/ extensions/axis2/samples/helloworldwsOM/ extensions/axis2/samples/helloworldwsclientOM/ kernel/api...
Date Wed, 21 Feb 2007 20:25:11 GMT
Author: jsdelfino
Date: Wed Feb 21 12:25:10 2007
New Revision: 510187

URL: http://svn.apache.org/viewvc?view=rev&rev=510187
Log:
Preparing for bring-up of the bindingsTest integration test cases. Allow a application to
contribute system configuration for the particular transports deployed with it.

Added:
    incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/src/main/resources/META-INF/tuscany/
    incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/src/main/resources/META-INF/tuscany/system.composite
  (with props)
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/resources/META-INF/tuscany/default-system.composite
  (with props)
Removed:
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/resources/META-INF/tuscany/system.composite
Modified:
    incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsOM/pom.xml
    incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclientOM/pom.xml
    incubator/tuscany/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/SCAContainer.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultSCAContainer.java

Added: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/src/main/resources/META-INF/tuscany/system.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/src/main/resources/META-INF/tuscany/system.composite?view=auto&rev=510187
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/src/main/resources/META-INF/tuscany/system.composite
(added)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/src/main/resources/META-INF/tuscany/system.composite
Wed Feb 21 12:25:10 2007
@@ -0,0 +1,36 @@
+<?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.    
+-->
+<!--
+    Tuscany system configuration.
+    
+    $Rev$ $Date$
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:t="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
+    name="system">
+
+    <include name="default-system"
+        scdlResource="META-INF/tuscany/default-system.composite" />
+
+    <component name="httpserver">
+        <t:implementation.system class="org.apache.tuscany.service.jetty.JettyServiceImpl"
/>
+        <property name="httpPort">8080</property>
+    </component>
+
+</composite>

Propchange: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldws/src/main/resources/META-INF/tuscany/system.composite
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsOM/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsOM/pom.xml?view=diff&rev=510187&r1=510186&r2=510187
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsOM/pom.xml
(original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsOM/pom.xml
Wed Feb 21 12:25:10 2007
@@ -26,7 +26,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>sample-helloworldwsOM</artifactId>
+    <artifactId>tuscany-sample-helloworldwsOM</artifactId>
     <packaging>jar</packaging>
     <name>Tuscany HelloWorld Web Service Sample OM</name>
     <description>A sample HelloWorld Web Service OM.</description>
@@ -36,16 +36,6 @@
         <dependency>
             <groupId>org.apache.ws.commons.axiom</groupId>
             <artifactId>axiom-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-impl</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
         </dependency>
 
     </dependencies>

Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclientOM/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclientOM/pom.xml?view=diff&rev=510187&r1=510186&r2=510187
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclientOM/pom.xml
(original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworldwsclientOM/pom.xml
Wed Feb 21 12:25:10 2007
@@ -26,7 +26,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>sample-helloworldwsclientOM</artifactId>
+    <artifactId>tuscany-sample-helloworldwsclientOM</artifactId>
     <packaging>jar</packaging>
     <name>Tuscany HelloWorld Web Service Client Sample OM</name>
     <description>A sample client for a HelloWorld Web Service OM.</description>
@@ -38,8 +38,10 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-impl</artifactId>
+            <groupId>org.apache.tuscany.sca.extensions.axis2.samples</groupId>
+            <artifactId>tuscany-sample-helloworldwsOM</artifactId>
+            <scope>test</scope>
+            <version>0.1-integration-incubating-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
@@ -53,8 +55,6 @@
                     <archive>
                         <manifest>
                             <mainClass>helloworldOM.HelloWorldClient</mainClass>
-                            <addClasspath>true</addClasspath>
-                            <classpathPrefix>../lib/</classpathPrefix>
                         </manifest>
                     </archive>
                 </configuration>

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/SCAContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/SCAContainer.java?view=diff&rev=510187&r1=510186&r2=510187
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/SCAContainer.java
(original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/SCAContainer.java
Wed Feb 21 12:25:10 2007
@@ -33,6 +33,7 @@
  * The Tuscany container
  */
 public abstract class SCAContainer {
+    public static final String DEFAULT_SYSTEM_SCDL = "META-INF/tuscany/default-system.composite";
     public static final String SYSTEM_SCDL = "META-INF/tuscany/system.composite";
     public static final String EXTENSION_SCDL = "META-INF/sca/extension.composite";
     public static final String SERVICE_SCDL = "META-INF/sca/service.composite";

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultSCAContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultSCAContainer.java?view=diff&rev=510187&r1=510186&r2=510187
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultSCAContainer.java
(original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultSCAContainer.java
Wed Feb 21 12:25:10 2007
@@ -70,6 +70,9 @@
 
         if (system == null) {
             system = cl.getResource(SCAContainer.SYSTEM_SCDL);
+            if (system == null) {
+            	system = cl.getResource(SCAContainer.DEFAULT_SYSTEM_SCDL);
+            }
         }
 
         try {

Added: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/resources/META-INF/tuscany/default-system.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/resources/META-INF/tuscany/default-system.composite?view=auto&rev=510187
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/resources/META-INF/tuscany/default-system.composite
(added)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/resources/META-INF/tuscany/default-system.composite
Wed Feb 21 12:25:10 2007
@@ -0,0 +1,163 @@
+<?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$ $Date$
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
+    name="default-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>
+
+    <!-- Store infrastructure -->
+    <component name="store">
+        <system:implementation.system class="org.apache.tuscany.core.services.store.memory.MemoryStore"
/>
+    </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="interfaceProcessorRegistry">
+        <system:implementation.system class="org.apache.tuscany.core.implementation.IntrospectionRegistryImpl"
/>
+    </component>
+
+    <!-- Resource host registry -->
+    <component name="resourceHostRegistry">
+        <system:implementation.system class="org.apache.tuscany.core.services.host.DelegatingResourceHostRegistry"
/>
+    </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.CompositeScopeObjectFactory"
/>
+    </component>
+    <component name="scope.stateless">
+        <system:implementation.system class="org.apache.tuscany.core.component.scope.StatelessScopeObjectFactory"
/>
+    </component>
+    <component name="scope.request">
+        <system:implementation.system class="org.apache.tuscany.core.component.scope.RequestScopeObjectFactory"
/>
+    </component>
+
+    <component name="scope.conversational">
+        <system:implementation.system class="org.apache.tuscany.core.component.scope.ConversationalScopeObjectFactory"
/>
+    </component>
+
+    <!-- service for resolving artifacts against the user's local Maven repository -->
+    <component name="artifactRepository">
+        <system:implementation.system class="org.apache.tuscany.core.services.artifact.LocalMavenRepository"
/>
+        <property name="repository">.m2/repository</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>
+
+    <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.property.PropertyObjectFactoryImpl"
/>
+    </component>
+
+    <component name="wireLoader">
+        <system:implementation.system class="org.apache.tuscany.core.loader.WireLoader"
/>
+    </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" />
+
+    <!-- Data Binding -->
+    <include name="org.apache.tuscany.launcher.DataBinding" scdlResource="org/apache/tuscany/core/databinding.scdl"
/>
+
+    <!-- Logging formatters -->
+    <include name="org.apache.tuscany.launcher.Formatters" scdlResource="org/apache/tuscany/core/formatters.scdl"
/>
+
+    <!-- Deployment -->
+    <include name="org.apache.tuscany.launcher.Deployment" scdlResource="org/apache/tuscany/core/deployment.scdl"
/>
+
+    <!-- the local binding -->
+    <component name="localBindingLoader">
+        <system:implementation.system class="org.apache.tuscany.core.binding.local.LocalBindingLoader"
/>
+    </component>
+
+    <component name="localBindingBuilder">
+        <system:implementation.system class="org.apache.tuscany.core.binding.local.LocalBindingBuilder"
/>
+    </component>
+
+</composite>

Propchange: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/resources/META-INF/tuscany/default-system.composite
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/resources/META-INF/tuscany/default-system.composite
------------------------------------------------------------------------------
    svn:keywords = Rev Date



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org


Mime
View raw message