You are viewing a plain text version of this content. The canonical link for it is here.
Posted to woden-dev@ws.apache.org by jk...@apache.org on 2008/02/08 10:50:05 UTC

svn commit: r619814 - in /webservices/woden/branches/woden47: src/org/apache/woden/ant/ src/org/apache/woden/internal/wsdl20/ src/org/apache/woden/internal/wsdl20/extensions/ src/org/apache/woden/internal/wsdl20/extensions/soap/ src/org/apache/woden/ws...

Author: jkaputin
Date: Fri Feb  8 01:50:01 2008
New Revision: 619814

URL: http://svn.apache.org/viewvc?rev=619814&view=rev
Log:
Deleted ComponentExtensions interface and its
removed its dependencies from woden47 branch.

Removed:
    webservices/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/ComponentExtensionsImpl.java
    webservices/woden/branches/woden47/src/org/apache/woden/wsdl20/extensions/ComponentExtensions.java
Modified:
    webservices/woden/branches/woden47/src/org/apache/woden/ant/CmWriter.java
    webservices/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/WSDLComponentImpl.java
    webservices/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/PopulatedExtensionRegistry.java
    webservices/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingFaultExtensionsImpl.java
    webservices/woden/branches/woden47/src/org/apache/woden/wsdl20/WSDLComponent.java
    webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingExtensionsTest.java
    webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingFaultExtensionsTest.java
    webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensionsTest.java
    webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingOperationExtensionsTest.java
    webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPEndpointExtensionsTest.java
    webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingExtensionsTest.java
    webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultExtensionsTest.java
    webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultReferenceExtensionsTest.java
    webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsTest.java
    webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingOperationExtensionsTest.java

Modified: webservices/woden/branches/woden47/src/org/apache/woden/ant/CmWriter.java
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden47/src/org/apache/woden/ant/CmWriter.java?rev=619814&r1=619813&r2=619814&view=diff
==============================================================================
--- webservices/woden/branches/woden47/src/org/apache/woden/ant/CmWriter.java (original)
+++ webservices/woden/branches/woden47/src/org/apache/woden/ant/CmWriter.java Fri Feb  8 01:50:01 2008
@@ -39,7 +39,6 @@
 import org.apache.woden.wsdl20.InterfaceOperation;
 import org.apache.woden.wsdl20.Service;
 import org.apache.woden.wsdl20.TypeDefinition;
-import org.apache.woden.wsdl20.extensions.ComponentExtensions;
 import org.apache.woden.wsdl20.extensions.WSDLExtensionConstants;
 import org.apache.woden.wsdl20.extensions.InterfaceOperationExtensions;
 import org.apache.woden.wsdl20.extensions.http.HTTPBindingExtensions;

Modified: webservices/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/WSDLComponentImpl.java
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/WSDLComponentImpl.java?rev=619814&r1=619813&r2=619814&view=diff
==============================================================================
--- webservices/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/WSDLComponentImpl.java (original)
+++ webservices/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/WSDLComponentImpl.java Fri Feb  8 01:50:01 2008
@@ -27,7 +27,6 @@
 import org.apache.woden.wsdl20.WSDLComponent;
 import org.apache.woden.wsdl20.extensions.BaseComponentExtensionContext;
 import org.apache.woden.wsdl20.extensions.ComponentExtensionContext;
-import org.apache.woden.wsdl20.extensions.ComponentExtensions;
 import org.apache.woden.wsdl20.extensions.ExtensionProperty;
 
 /**
@@ -44,9 +43,6 @@
 public abstract class WSDLComponentImpl extends DocumentableImpl
                                      implements WSDLComponent
 {
-    //deprecated in M8, replaced with fCompExtensionsContexts
-    private Map fCompExtensions = new HashMap(); //map of ComponentExtensions keyed by namespace
-    
     private Map fCompExtensionContexts = new HashMap(); //key=extNS, value=ComponentExtensionsContext
     
     /* ************************************************************
@@ -64,15 +60,6 @@
         return super.equals(comp);
     }
     
-    /**
-     * @see org.apache.woden.wsdl20.WSDLComponent#getWSDLExtensionsForNamespace(java.net.URI)
-     * @deprecated in Milestone 8, replaced with getComponentExtensionsContext
-     */
-    public ComponentExtensions getComponentExtensionsForNamespace(URI namespace)
-    {
-        return (ComponentExtensions)fCompExtensions.get(namespace);
-    }
-    
     /* (non-Javadoc)
      * @see org.apache.woden.wsdl20.WSDLComponent#setComponentExtensionContext(java.net.URI, org.apache.woden.wsdl20.extensions.ComponentExtensionsContext)
      */
@@ -175,27 +162,6 @@
         return false;
     }
     
-    
-    /**
-     * Store the extensions in a map using the namespace string as the key.
-     * If the extensions value is null, delete any existing entry in the map
-     * for this namespace. If the namespace string is null, do nothing.
-     * TODO check if still needed after compbuilder refactored.
-     * 
-     * @deprecated in Milestone 8, replaced with setComponentExtensionsContext
-     */
-    public void setComponentExtensions(URI namespace, ComponentExtensions extensions)
-    {
-        if(namespace != null)
-        {
-            if(extensions != null) {
-                fCompExtensions.put(namespace, extensions);
-            } else {
-                fCompExtensions.remove(namespace);
-            }
-        }
-    }
-
     public String toString() {
         return getFragmentIdentifier().toString();
     }

Modified: webservices/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/PopulatedExtensionRegistry.java
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/PopulatedExtensionRegistry.java?rev=619814&r1=619813&r2=619814&view=diff
==============================================================================
--- webservices/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/PopulatedExtensionRegistry.java (original)
+++ webservices/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/PopulatedExtensionRegistry.java Fri Feb  8 01:50:01 2008
@@ -55,7 +55,6 @@
 import org.apache.woden.wsdl20.BindingOperation;
 import org.apache.woden.wsdl20.Endpoint;
 import org.apache.woden.wsdl20.InterfaceOperation;
-import org.apache.woden.wsdl20.extensions.ComponentExtensions;
 import org.apache.woden.wsdl20.extensions.WSDLExtensionConstants;
 import org.apache.woden.wsdl20.extensions.ExtensionRegistrar;
 import org.apache.woden.wsdl20.extensions.ExtensionRegistry;

Modified: webservices/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingFaultExtensionsImpl.java
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingFaultExtensionsImpl.java?rev=619814&r1=619813&r2=619814&view=diff
==============================================================================
--- webservices/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingFaultExtensionsImpl.java (original)
+++ webservices/woden/branches/woden47/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPBindingFaultExtensionsImpl.java Fri Feb  8 01:50:01 2008
@@ -25,7 +25,6 @@
 import org.apache.woden.wsdl20.NestedComponent;
 import org.apache.woden.wsdl20.WSDLComponent;
 import org.apache.woden.wsdl20.extensions.BaseComponentExtensionContext;
-import org.apache.woden.wsdl20.extensions.ComponentExtensions;
 import org.apache.woden.wsdl20.extensions.ExtensionElement;
 import org.apache.woden.wsdl20.extensions.ExtensionProperty;
 import org.apache.woden.wsdl20.extensions.http.HTTPConstants;

Modified: webservices/woden/branches/woden47/src/org/apache/woden/wsdl20/WSDLComponent.java
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden47/src/org/apache/woden/wsdl20/WSDLComponent.java?rev=619814&r1=619813&r2=619814&view=diff
==============================================================================
--- webservices/woden/branches/woden47/src/org/apache/woden/wsdl20/WSDLComponent.java (original)
+++ webservices/woden/branches/woden47/src/org/apache/woden/wsdl20/WSDLComponent.java Fri Feb  8 01:50:01 2008
@@ -19,7 +19,6 @@
 import java.net.URI;
 
 import org.apache.woden.wsdl20.extensions.ComponentExtensionContext;
-import org.apache.woden.wsdl20.extensions.ComponentExtensions;
 import org.apache.woden.wsdl20.extensions.PropertyExtensible;
 import org.apache.woden.wsdl20.fragids.FragmentIdentifier;
 
@@ -43,17 +42,6 @@
      * @return true if the components are logically equivalent
      */
     public boolean equals(WSDLComponent comp);
-    
-    /**
-     * Gets the group of extension properties, belonging to the specified non-WSDL
-     * namespace, that extend this WSDL component.
-     * 
-     * @param namespace a namespace URI different to the WSDL 2.0 namespace.
-     * @return the <code>ComponentExtensions</code> with the specified namespace.
-     * 
-     * @deprecated in Milestone 8, replaced by getComponentExtensionContext(URI)
-     */
-    public ComponentExtensions getComponentExtensionsForNamespace(URI namespace);
     
     /**
      * Stores the ComponentExtensionContext object that provides access to this WSDL component's

Modified: webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingExtensionsTest.java
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingExtensionsTest.java?rev=619814&r1=619813&r2=619814&view=diff
==============================================================================
--- webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingExtensionsTest.java (original)
+++ webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingExtensionsTest.java Fri Feb  8 01:50:01 2008
@@ -28,7 +28,6 @@
 import org.apache.woden.tests.TestErrorHandler;
 import org.apache.woden.wsdl20.Binding;
 import org.apache.woden.wsdl20.Description;
-import org.apache.woden.wsdl20.extensions.ComponentExtensions;
 
 /**
  * Functional verification test of HTTPBindingExtensions.

Modified: webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingFaultExtensionsTest.java
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingFaultExtensionsTest.java?rev=619814&r1=619813&r2=619814&view=diff
==============================================================================
--- webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingFaultExtensionsTest.java (original)
+++ webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingFaultExtensionsTest.java Fri Feb  8 01:50:01 2008
@@ -29,7 +29,6 @@
 import org.apache.woden.wsdl20.Binding;
 import org.apache.woden.wsdl20.BindingFault;
 import org.apache.woden.wsdl20.Description;
-import org.apache.woden.wsdl20.extensions.ComponentExtensions;
 
 /**
  * Functional verification test of HTTPBindingFaultExtensions.

Modified: webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensionsTest.java
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensionsTest.java?rev=619814&r1=619813&r2=619814&view=diff
==============================================================================
--- webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensionsTest.java (original)
+++ webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensionsTest.java Fri Feb  8 01:50:01 2008
@@ -30,7 +30,6 @@
 import org.apache.woden.wsdl20.BindingMessageReference;
 import org.apache.woden.wsdl20.BindingOperation;
 import org.apache.woden.wsdl20.Description;
-import org.apache.woden.wsdl20.extensions.ComponentExtensions;
 
 /**
  * Functional verification test of HTTPBindingMessageReferenceExtensions.

Modified: webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingOperationExtensionsTest.java
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingOperationExtensionsTest.java?rev=619814&r1=619813&r2=619814&view=diff
==============================================================================
--- webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingOperationExtensionsTest.java (original)
+++ webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingOperationExtensionsTest.java Fri Feb  8 01:50:01 2008
@@ -29,7 +29,6 @@
 import org.apache.woden.wsdl20.Binding;
 import org.apache.woden.wsdl20.BindingOperation;
 import org.apache.woden.wsdl20.Description;
-import org.apache.woden.wsdl20.extensions.ComponentExtensions;
 
 /**
  * Functional verification test of HTTPBindingOperationExtensions.

Modified: webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPEndpointExtensionsTest.java
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPEndpointExtensionsTest.java?rev=619814&r1=619813&r2=619814&view=diff
==============================================================================
--- webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPEndpointExtensionsTest.java (original)
+++ webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/http/HTTPEndpointExtensionsTest.java Fri Feb  8 01:50:01 2008
@@ -29,7 +29,6 @@
 import org.apache.woden.wsdl20.Description;
 import org.apache.woden.wsdl20.Endpoint;
 import org.apache.woden.wsdl20.Service;
-import org.apache.woden.wsdl20.extensions.ComponentExtensions;
 
 /**
  * Functional verification test of HTTPEndpointExtensions.

Modified: webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingExtensionsTest.java
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingExtensionsTest.java?rev=619814&r1=619813&r2=619814&view=diff
==============================================================================
--- webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingExtensionsTest.java (original)
+++ webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingExtensionsTest.java Fri Feb  8 01:50:01 2008
@@ -29,7 +29,6 @@
 import org.apache.woden.tests.TestErrorHandler;
 import org.apache.woden.wsdl20.Binding;
 import org.apache.woden.wsdl20.Description;
-import org.apache.woden.wsdl20.extensions.ComponentExtensions;
 
 /**
  * Functional verification test of SoapBindingExtensions.

Modified: webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultExtensionsTest.java
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultExtensionsTest.java?rev=619814&r1=619813&r2=619814&view=diff
==============================================================================
--- webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultExtensionsTest.java (original)
+++ webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultExtensionsTest.java Fri Feb  8 01:50:01 2008
@@ -32,7 +32,6 @@
 import org.apache.woden.wsdl20.Binding;
 import org.apache.woden.wsdl20.BindingFault;
 import org.apache.woden.wsdl20.Description;
-import org.apache.woden.wsdl20.extensions.ComponentExtensions;
 
 /**
  * Functional verification test of SoapBindingFaultExtensions.

Modified: webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultReferenceExtensionsTest.java
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultReferenceExtensionsTest.java?rev=619814&r1=619813&r2=619814&view=diff
==============================================================================
--- webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultReferenceExtensionsTest.java (original)
+++ webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultReferenceExtensionsTest.java Fri Feb  8 01:50:01 2008
@@ -32,7 +32,6 @@
 import org.apache.woden.wsdl20.Description;
 import org.apache.woden.wsdl20.InterfaceFaultReference;
 import org.apache.woden.wsdl20.enumeration.Direction;
-import org.apache.woden.wsdl20.extensions.ComponentExtensions;
 
 /**
  * Functional verification test of SoapBindingFaultReferenceExtensions.

Modified: webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsTest.java
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsTest.java?rev=619814&r1=619813&r2=619814&view=diff
==============================================================================
--- webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsTest.java (original)
+++ webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsTest.java Fri Feb  8 01:50:01 2008
@@ -31,7 +31,6 @@
 import org.apache.woden.wsdl20.BindingOperation;
 import org.apache.woden.wsdl20.Description;
 import org.apache.woden.wsdl20.enumeration.Direction;
-import org.apache.woden.wsdl20.extensions.ComponentExtensions;
 import org.apache.woden.wsdl20.xml.BindingMessageReferenceElement;
 
 /**

Modified: webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingOperationExtensionsTest.java
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingOperationExtensionsTest.java?rev=619814&r1=619813&r2=619814&view=diff
==============================================================================
--- webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingOperationExtensionsTest.java (original)
+++ webservices/woden/branches/woden47/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingOperationExtensionsTest.java Fri Feb  8 01:50:01 2008
@@ -30,7 +30,6 @@
 import org.apache.woden.wsdl20.Binding;
 import org.apache.woden.wsdl20.BindingOperation;
 import org.apache.woden.wsdl20.Description;
-import org.apache.woden.wsdl20.extensions.ComponentExtensions;
 
 /**
  * Functional verification test of SoapBindingOperationExtensions.



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