tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmar...@apache.org
Subject svn commit: r411330 - in /incubator/tuscany/sandbox/jboynes/sca: bindings/ core2/src/main/java/org/apache/tuscany/core/host/ core2/src/main/java/org/apache/tuscany/core/loader/ core2/src/main/java/org/apache/tuscany/core/services/wsdl/ spi/ spi/src/mai...
Date Fri, 02 Jun 2006 23:18:18 GMT
Author: jmarino
Date: Fri Jun  2 16:18:17 2006
New Revision: 411330

URL: http://svn.apache.org/viewvc?rev=411330&view=rev
Log:
package refactors; reintro of ServletHost

Added:
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/host/
      - copied from r410990, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/host/
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/host/ServletHost.java
      - copied, changed from r411328, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/host/ServletHost.java
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/services/
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/services/wsdl/
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/services/wsdl/WSDLDefinitionRegistry.java
  (contents, props changed)
      - copied, changed from r410989, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/services/wsdl/WSDLDefinitionRegistry.java
Removed:
    incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/host/
    incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/services/wsdl/WSDLDefinitionRegistry.java
Modified:
    incubator/tuscany/sandbox/jboynes/sca/bindings/pom.xml
    incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/InterfaceWSDLLoader.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/services/wsdl/WSDLDefinitionRegistryImpl.java
    incubator/tuscany/sandbox/jboynes/sca/spi/pom.xml
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java
    incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentBuilderExtension.java

Modified: incubator/tuscany/sandbox/jboynes/sca/bindings/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/bindings/pom.xml?rev=411330&r1=411329&r2=411330&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/bindings/pom.xml (original)
+++ incubator/tuscany/sandbox/jboynes/sca/bindings/pom.xml Fri Jun  2 16:18:17 2006
@@ -30,8 +30,11 @@
     <version>SNAPSHOT</version>
 
     <modules>
-        <!--<module>binding.axis2</module>
-        <module>binding.jsonrpc</module>-->
+        <!-- temporary project to download and install the celtix required sun jars. 
 The jars
+        are all CDDL so will be available on ibiblio when Sun releases them.   This is just
temporary.
+         
+        <module>sunjars</module>
+        <module>binding.celtix</module>-->
     </modules>
 
 </project>

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/InterfaceWSDLLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/InterfaceWSDLLoader.java?rev=411330&r1=411329&r2=411330&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/InterfaceWSDLLoader.java
(original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/InterfaceWSDLLoader.java
Fri Jun  2 16:18:17 2006
@@ -23,7 +23,7 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import org.apache.tuscany.core.services.wsdl.WSDLDefinitionRegistry;
+import org.apache.tuscany.spi.services.wsdl.WSDLDefinitionRegistry;
 import org.apache.tuscany.spi.model.WSDLServiceContract;
 import org.apache.tuscany.spi.annotation.Autowire;
 import org.apache.tuscany.spi.deployer.DeploymentContext;

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/services/wsdl/WSDLDefinitionRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/services/wsdl/WSDLDefinitionRegistryImpl.java?rev=411330&r1=411329&r2=411330&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/services/wsdl/WSDLDefinitionRegistryImpl.java
(original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/services/wsdl/WSDLDefinitionRegistryImpl.java
Fri Jun  2 16:18:17 2006
@@ -33,6 +33,8 @@
 import javax.wsdl.xml.WSDLReader;
 import javax.xml.namespace.QName;
 
+import org.apache.tuscany.spi.services.wsdl.WSDLDefinitionRegistry;
+
 /**
  * @version $Rev$ $Date$
  */

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/pom.xml?rev=411330&r1=411329&r2=411330&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/pom.xml (original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/pom.xml Fri Jun  2 16:18:17 2006
@@ -47,6 +47,12 @@
             <version>1.5.2</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>tomcat</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>5.0.18</version>
+            <scope>provided</scope>
+        </dependency>
 
         <dependency>
             <groupId>junit</groupId>

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java?rev=411330&r1=411329&r2=411330&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java
(original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java
Fri Jun  2 16:18:17 2006
@@ -9,7 +9,6 @@
 import org.apache.tuscany.spi.model.Binding;
 import org.apache.tuscany.spi.model.BoundReference;
 import org.apache.tuscany.spi.model.BoundService;
-import org.apache.tuscany.spi.policy.PolicyBuilderRegistry;
 import org.apache.tuscany.spi.wire.WireService;
 import org.osoa.sca.annotations.Init;
 
@@ -23,17 +22,11 @@
 public abstract class BindingBuilderExtension<B extends Binding> implements BindingBuilder<B>
{
 
     protected BuilderRegistry builderRegistry;
-    protected PolicyBuilderRegistry policyBuilderRegistry;
     protected WireService wireService;
 
     @Autowire
     public void setBuilderRegistry(BuilderRegistry registry) {
         this.builderRegistry = registry;
-    }
-
-    @Autowire
-    public void setPolicyBuilderRegistry(PolicyBuilderRegistry registry) {
-        this.policyBuilderRegistry = registry;
     }
 
     @Autowire

Modified: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentBuilderExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentBuilderExtension.java?rev=411330&r1=411329&r2=411330&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentBuilderExtension.java
(original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ComponentBuilderExtension.java
Fri Jun  2 16:18:17 2006
@@ -1,15 +1,12 @@
 package org.apache.tuscany.spi.extension;
 
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-
 import org.apache.tuscany.spi.annotation.Autowire;
 import org.apache.tuscany.spi.builder.BuilderRegistry;
 import org.apache.tuscany.spi.builder.ComponentBuilder;
 import org.apache.tuscany.spi.context.ScopeRegistry;
 import org.apache.tuscany.spi.model.Implementation;
-import org.apache.tuscany.spi.policy.PolicyBuilderRegistry;
 import org.apache.tuscany.spi.wire.WireService;
+import org.osoa.sca.annotations.Init;
 
 /**
  * An extension point for component builders. When adding support for new component types,
implementations may
@@ -19,20 +16,9 @@
  */
 @org.osoa.sca.annotations.Scope("MODULE")
 public abstract class ComponentBuilderExtension<I extends Implementation<?>>
implements ComponentBuilder<I> {
-    /**
-     * The builder registry that this builder should register with; usually set by injection.
-     */
-    protected BuilderRegistry builderRegistry;
 
-    /**
-     * The scope registry that this builder should use; usually set by injection.
-     */
+    protected BuilderRegistry builderRegistry;
     protected ScopeRegistry scopeRegistry;
-
-    /**
-     * The policy builder that this builder should use; usually set by injection.
-     */
-    protected PolicyBuilderRegistry policyBuilderRegistry;
     protected WireService wireService;
 
     @Autowire
@@ -46,11 +32,6 @@
     }
 
     @Autowire
-    public void setPolicyBuilderRegistry(PolicyBuilderRegistry registry) {
-        this.policyBuilderRegistry = registry;
-    }
-
-    @Autowire
     public void setWireService(WireService wireService) {
         this.wireService = wireService;
     }
@@ -60,14 +41,5 @@
         builderRegistry.register(getImplementationType(), this);
     }
 
-    @Destroy
-    public void destroy() {
-        builderRegistry.unregister(getImplementationType());
-    }
-
-    /**
-     * Returns the Class of the implementation that this builder can handle.
-     * @return the type of implementation that this builder can handle
-     */
     protected abstract Class<I> getImplementationType();
 }

Copied: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/host/ServletHost.java
(from r411328, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/host/ServletHost.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/host/ServletHost.java?p2=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/host/ServletHost.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/host/ServletHost.java&r1=411328&r2=411330&rev=411330&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/host/ServletHost.java
(original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/host/ServletHost.java
Fri Jun  2 16:18:17 2006
@@ -1,4 +1,4 @@
-package org.apache.tuscany.core.host;
+package org.apache.tuscany.spi.host;
 
 import javax.servlet.Servlet;
 

Copied: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/services/wsdl/WSDLDefinitionRegistry.java
(from r410989, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/services/wsdl/WSDLDefinitionRegistry.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/services/wsdl/WSDLDefinitionRegistry.java?p2=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/services/wsdl/WSDLDefinitionRegistry.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/services/wsdl/WSDLDefinitionRegistry.java&r1=410989&r2=411330&rev=411330&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/services/wsdl/WSDLDefinitionRegistry.java
(original)
+++ incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/services/wsdl/WSDLDefinitionRegistry.java
Fri Jun  2 16:18:17 2006
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.tuscany.core.services.wsdl;
+package org.apache.tuscany.spi.services.wsdl;
 
 import java.net.URL;
 import java.io.IOException;

Propchange: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/services/wsdl/WSDLDefinitionRegistry.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/services/wsdl/WSDLDefinitionRegistry.java
------------------------------------------------------------------------------
    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