You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sc...@apache.org on 2011/07/22 06:12:58 UTC

svn commit: r1149451 - in /tuscany/sca-java-2.x/trunk/modules: assembly/src/main/java/org/apache/tuscany/sca/interfacedef/ assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/ binding-corba-runtime/src/test/java/org/apache/tuscany/sca/bindi...

Author: scottkurz
Date: Fri Jul 22 04:12:56 2011
New Revision: 1149451

URL: http://svn.apache.org/viewvc?rev=1149451&view=rev
Log:
Fix spelling of method, changing to 'setNormalizedWSDLInterfaceContract'.

Modified:
    tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
    tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
    tuscany/sca-java-2.x/trunk/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java
    tuscany/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLContractBuilder.java
    tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
    tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/registry/hazelcast/MultiRegTestCase.java
    tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JAXWSProcessor.java
    tuscany/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
    tuscany/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
    tuscany/sca-java-2.x/trunk/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java

Modified: tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java?rev=1149451&r1=1149450&r2=1149451&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java Fri Jul 22 04:12:56 2011
@@ -95,6 +95,6 @@ public interface InterfaceContract exten
      * 
      * @param wsdlInterfaceContract
      */
-    void setNormailizedWSDLContract(InterfaceContract wsdlInterfaceContract);    
+    void setNormalizedWSDLContract(InterfaceContract wsdlInterfaceContract);    
 
 }

Modified: tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java?rev=1149451&r1=1149450&r2=1149451&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java Fri Jul 22 04:12:56 2011
@@ -126,15 +126,15 @@ public abstract class InterfaceContractI
         return true;
     }
     
-    // By default there is no normailized contract
+    // By default there is no normalized contract
     // as only Java needs it
     public InterfaceContract getNormalizedWSDLContract() {
         return null;
     }
     
-    // By default there is no normailized contract
+    // By default there is no normalized contract
     // as only Java needs it
-    public void setNormailizedWSDLContract(
+    public void setNormalizedWSDLContract(
             InterfaceContract wsdlInterfaceContract) {
         // do nothing
     }

Modified: tuscany/sca-java-2.x/trunk/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java?rev=1149451&r1=1149450&r2=1149451&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java Fri Jul 22 04:12:56 2011
@@ -55,15 +55,15 @@ public class TestInterfaceContract imple
         return null;
     }
     
-    // By default there is no normailized contract
+    // By default there is no normalized contract
     // as only Java needs it
     public InterfaceContract getNormalizedWSDLContract() {
         return null;
     }
     
-    // By default there is no normailized contract
+    // By default there is no normalized contract
     // as only Java needs it
-    public void setNormailizedWSDLContract(
+    public void setNormalizedWSDLContract(
             InterfaceContract wsdlInterfaceContract) {
         // do nothing
     }

Modified: tuscany/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLContractBuilder.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLContractBuilder.java?rev=1149451&r1=1149450&r2=1149451&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLContractBuilder.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLContractBuilder.java Fri Jul 22 04:12:56 2011
@@ -82,7 +82,7 @@ public class WSDLContractBuilder impleme
                                                              xsdFactory, 
                                                              documentBuilderFactory, 
                                                              null);
-        javaContract.setNormailizedWSDLContract(wsdlContract);
+        javaContract.setNormalizedWSDLContract(wsdlContract);
 //        BindingWSDLGenerator.printWSDL = false;
         return true;
     }

Modified: tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java?rev=1149451&r1=1149450&r2=1149451&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java Fri Jul 22 04:12:56 2011
@@ -939,7 +939,7 @@ public class RuntimeEndpointImpl extends
                     } // end if
                 } // end if
             } // end if
-            setNormailizedWSDLContract();
+            setNormalizedWSDLContract();
         } // end if
         super.resolve();
     } // end method resolve
@@ -1063,7 +1063,7 @@ public class RuntimeEndpointImpl extends
         return outStream.toString();
     }
 
-    private void setNormailizedWSDLContract() {
+    private void setNormalizedWSDLContract() {
         if (wsdl == null || wsdl.length() < 1) {
             return;
         }
@@ -1079,7 +1079,7 @@ public class RuntimeEndpointImpl extends
             wsdlDef.setDefinition(def);
             wsdlIface.setWsdlDefinition(wsdlDef);
             wsdlIC.setInterface(wsdlIface);
-            ic.setNormailizedWSDLContract(wsdlIC);
+            ic.setNormalizedWSDLContract(wsdlIC);
         } catch (WSDLException e) {
             throw new RuntimeException(e);
         }

Modified: tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/registry/hazelcast/MultiRegTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/registry/hazelcast/MultiRegTestCase.java?rev=1149451&r1=1149450&r2=1149451&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/registry/hazelcast/MultiRegTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/test/java/org/apache/tuscany/sca/registry/hazelcast/MultiRegTestCase.java Fri Jul 22 04:12:56 2011
@@ -208,7 +208,7 @@ public class MultiRegTestCase {
             }
 
             @Override
-            public void setNormailizedWSDLContract(InterfaceContract wsdlInterfaceContract) {
+            public void setNormalizedWSDLContract(InterfaceContract wsdlInterfaceContract) {
                 // TODO Auto-generated method stub
                 
             }};

Modified: tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JAXWSProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JAXWSProcessor.java?rev=1149451&r1=1149450&r2=1149451&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JAXWSProcessor.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JAXWSProcessor.java Fri Jul 22 04:12:56 2011
@@ -282,7 +282,7 @@ public class JAXWSProcessor extends Base
             WSDLInterfaceContract wsdlInterfaceContract = wsdlFactory.createWSDLInterfaceContract();
             wsdlInterfaceContract.setInterface(callInterface);
             wsdlInterfaceContract.setLocation(wsdlFileName);
-            javaInterfaceContract.setNormailizedWSDLContract(wsdlInterfaceContract);
+            javaInterfaceContract.setNormalizedWSDLContract(wsdlInterfaceContract);
         }  
         
         // add the service model into the implementation type

Modified: tuscany/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java?rev=1149451&r1=1149450&r2=1149451&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java Fri Jul 22 04:12:56 2011
@@ -31,7 +31,7 @@ public class JavaInterfaceContractImpl e
     
     // A cached WSDL version of the Java contract use during normalized
     // interface comparison
-    private InterfaceContract normailizedWSDLInterfaceContract; 
+    private InterfaceContract normalizedWSDLInterfaceContract; 
     
     protected JavaInterfaceContractImpl() {
     }
@@ -43,11 +43,11 @@ public class JavaInterfaceContractImpl e
 
     @Override
     public InterfaceContract getNormalizedWSDLContract() {
-        return normailizedWSDLInterfaceContract;
+        return normalizedWSDLInterfaceContract;
     }
     
     @Override
-    public void setNormailizedWSDLContract(InterfaceContract wsdlInterfaceContract) {
-        normailizedWSDLInterfaceContract = wsdlInterfaceContract;
+    public void setNormalizedWSDLContract(InterfaceContract wsdlInterfaceContract) {
+        normalizedWSDLInterfaceContract = wsdlInterfaceContract;
     }
 }

Modified: tuscany/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java?rev=1149451&r1=1149450&r2=1149451&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java Fri Jul 22 04:12:56 2011
@@ -419,7 +419,7 @@ public class JavaInterfaceProcessor impl
             WSDLInterfaceContract wsdlInterfaceContract = wsdlFactory.createWSDLInterfaceContract();
             wsdlInterfaceContract.setInterface(wsdlInterface);
             wsdlInterfaceContract.setLocation(javaInterface.getJAXWSWSDLLocation());
-            javaInterfaceContract.setNormailizedWSDLContract(wsdlInterfaceContract);
+            javaInterfaceContract.setNormalizedWSDLContract(wsdlInterfaceContract);
             
             ProcessorContext wsdlContext = new ProcessorContext(javaInterface.getContributionContainingClass(), 
                                                                 context.getMonitor());

Modified: tuscany/sca-java-2.x/trunk/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java?rev=1149451&r1=1149450&r2=1149451&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java Fri Jul 22 04:12:56 2011
@@ -51,7 +51,7 @@ public class WSDLInterfaceContractImpl e
         return this;
     }
     
-    public void setNormailizedWSDLContract(InterfaceContract wsdlInterfaceContract) {
+    public void setNormalizedWSDLContract(InterfaceContract wsdlInterfaceContract) {
         // do nothing as this already is a WSDL contract
     }