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 2007/08/23 13:01:35 UTC

svn commit: r568932 [16/36] - in /incubator/woden/trunk/java/src/org/apache/woden: ./ ant/ internal/ internal/resolver/ internal/schema/ internal/util/ internal/util/dom/ internal/util/om/ internal/wsdl20/ internal/wsdl20/extensions/ internal/wsdl20/ex...

Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DescriptionImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DescriptionImpl.java?rev=568932&r1=568931&r2=568932&view=diff
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DescriptionImpl.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DescriptionImpl.java Thu Aug 23 04:01:23 2007
@@ -1,673 +1,673 @@
-/**
- * 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.
- */
-package org.apache.woden.internal.wsdl20;
-
-import java.net.URI;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-
-import org.apache.woden.WSDLException;
-import org.apache.woden.internal.MessageFormatter;
-import org.apache.woden.internal.WSDLContext;
-import org.apache.woden.wsdl20.Binding;
-import org.apache.woden.wsdl20.Description;
-import org.apache.woden.wsdl20.ElementDeclaration;
-import org.apache.woden.wsdl20.Interface;
-import org.apache.woden.wsdl20.Service;
-import org.apache.woden.wsdl20.TypeDefinition;
-import org.apache.woden.wsdl20.extensions.ExtensionRegistry;
-import org.apache.woden.wsdl20.fragids.DescriptionPart;
-import org.apache.woden.wsdl20.fragids.FragmentIdentifier;
-import org.apache.woden.wsdl20.xml.BindingElement;
-import org.apache.woden.wsdl20.xml.DescriptionElement;
-import org.apache.woden.wsdl20.xml.ImportElement;
-import org.apache.woden.wsdl20.xml.IncludeElement;
-import org.apache.woden.wsdl20.xml.InterfaceElement;
-import org.apache.woden.wsdl20.xml.NestedElement;
-import org.apache.woden.wsdl20.xml.ServiceElement;
-import org.apache.woden.wsdl20.xml.TypesElement;
-import org.apache.woden.wsdl20.xml.WSDLElement;
-
-/**
- * This class provides the implementation for a Description component from 
- * the WSDL Component Model, as described in the WSDL 2.0 specification.  
- * <p>
- * Note: this class is different to the other WSDL implementation classes, 
- * which all implement two Java interfaces; a component model interface and the 
- * interface for the corresponding WSDL element. Different implementations
- * are used for the Description component and for the &lt;wsdl:description&gt; 
- * element because the latter exposes the composite structure of imported and 
- * included WSDL documents, while the Description component 'flattens' this
- * structure into an abstract view of the WSDL. A separate implementation
- * class, <code>DescriptionElementImpl</code>, exists to represent
- * the &lt;wsdl:description&gt; element.
- * 
- * @author jkaputin@apache.org
- */
-public class DescriptionImpl extends WSDLComponentImpl
-                             implements Description, DescriptionElement 
-{
-    /*
-     * WSDL Component model data (flattened properties of Description Component)
-     * TODO cache top-level components here with a flush-on-update mechanism
-     */
-    private List fAllElementDeclarations = new Vector();
-    private List fAllTypeDefinitions = new Vector();
-    
-    /*
-     * WSDL Element model data
-     */
-    private URI fDocumentBaseURI = null;
-
-    //<description> attributes
-    private URI fTargetNamespace = null;
-    private Map fNamespaces = new HashMap();
-
-    //<description> child elements
-    private List fImportElements = new Vector();
-    private List fIncludeElements = new Vector();
-    private TypesImpl fTypesElement = null;
-    private List fInterfaceElements = new Vector();
-    private List fBindingElements = new Vector();
-    private List fServiceElements = new Vector();
-    
-    /*
-     * Woden-specific instance variables
-     */
-    
-    private boolean fComponentsInitialized = false;
-    private WSDLContext fWsdlContext;
-    
-    /*
-     * Constructors
-     */
-    private DescriptionImpl() {};
-    
-    public DescriptionImpl(WSDLContext wsdlContext) {
-        fWsdlContext = wsdlContext;
-    }
-    
-    /* ************************************************************
-     *  Description interface methods (the WSDL Component model)
-     * ************************************************************/
-    
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.Description#getInterfaces()
-     * 
-     * TODO performance to be addressed in this method. Suggest caching with
-     * some sort of notification-on-update to flush the cash and let lazy init
-     * reset it. But best to deal with performance after wsdl create/update has 
-     * been implemented, as we can then baseline the existing dynamic approach
-     * to test for correct behaviour after performance mods have been made. 
-     * (but see to do comment in getNestedDescriptions method too)
-     */
-    public Interface[] getInterfaces() 
-    {
-        List allInterfaces = new Vector();
-        
-        //declared interfaces
-        for(Iterator i=fInterfaceElements.iterator(); i.hasNext(); )
-        {
-            Interface intface = (Interface)i.next();
-            if(!containsComponent(intface, allInterfaces)) {
-                ((InterfaceImpl)intface).setDescriptionComponent(this);
-                allInterfaces.add(intface);
-            }
-        }
-        
-        //nested interfaces
-        List nestedDescs = new Vector(getNestedDescriptions());
-        for(Iterator i=nestedDescs.iterator(); i.hasNext(); )
-        {
-            DescriptionElement desc = (DescriptionElement)i.next();
-            InterfaceElement[] interfaces = desc.getInterfaceElements();
-            for(int j=0; j<interfaces.length; j++)
-            {
-                Interface intface = (Interface)interfaces[j];
-                if(!containsComponent(intface, allInterfaces)) {
-                    ((InterfaceImpl)intface).setDescriptionComponent(this);
-                    allInterfaces.add(intface);
-                }
-            }
-        }
-        
-        Interface[] array = new Interface[allInterfaces.size()];
-        allInterfaces.toArray(array);
-        return array;
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.Description#getInterface(javax.xml.namespace.QName)
-     */
-    public Interface getInterface(QName name) 
-    {
-        Interface intface = null;
-        
-        if(name != null) 
-        {
-            Interface[] interfaces = getInterfaces();
-            
-            for(int i=0; i<interfaces.length; i++)
-            {
-                if(name.equals(interfaces[i].getName()))
-                {
-                    intface = interfaces[i];
-                    break;
-                }
-            }
-        }
-        
-        return intface;
-    }
-    
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.Description#getBindings()
-     * 
-     * TODO performance to be addressed in this method - see ToDo in getInterface()
-     */
-    public Binding[] getBindings() 
-    {
-        List allBindings = new Vector();
-        
-        //declared bindings
-        for(Iterator i=fBindingElements.iterator(); i.hasNext(); )
-        {
-            Binding binding = (Binding)i.next();
-            if(!containsComponent(binding, allBindings)) {
-                ((BindingImpl)binding).setDescriptionComponent(this);
-                allBindings.add(binding);
-            }
-        }
-        
-        //nested bindings
-        List nestedDescs = new Vector(getNestedDescriptions());
-        for(Iterator i=nestedDescs.iterator(); i.hasNext(); )
-        {
-            DescriptionElement desc = (DescriptionElement)i.next();
-            BindingElement[] bindings = desc.getBindingElements();
-            for(int j=0; j<bindings.length; j++)
-            {
-                Binding binding = (Binding)bindings[j];
-                if(!containsComponent(binding, allBindings)) {
-                    ((BindingImpl)binding).setDescriptionComponent(this);
-                    allBindings.add(binding);
-                }
-            }
-        }
-        
-        Binding[] array = new Binding[allBindings.size()];
-        allBindings.toArray(array);
-        return array;
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.Description#getBinding(javax.xml.namespace.QName)
-     */
-    public Binding getBinding(QName name) 
-    {
-        Binding binding = null;
-        
-        if(name != null) 
-        {
-            Binding[] bindings = getBindings();
-            
-            for(int i=0; i<bindings.length; i++)
-            {
-                if(name.equals(bindings[i].getName()))
-                {
-                    binding = bindings[i];
-                    break;
-                }
-            }
-        }
-        
-        return binding;
-    }
-    
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.Description#getServices()
-     * 
-     * TODO performance to be addressed in this method - see ToDo in getInterface()
-     */
-    public Service[] getServices() 
-    {
-        List allServices = new Vector();
-        
-        //declared services
-        for(Iterator i=fServiceElements.iterator(); i.hasNext(); )
-        {
-            Service service = (Service)i.next();
-            if(!containsComponent(service, allServices)) {
-                ((ServiceImpl)service).setDescriptionComponent(this);
-                allServices.add(service);
-            }
-        }
-        
-        //nested services
-        List nestedDescs = new Vector(getNestedDescriptions());
-        for(Iterator i=nestedDescs.iterator(); i.hasNext(); )
-        {
-            DescriptionElement desc = (DescriptionElement)i.next();
-            ServiceElement[] services = desc.getServiceElements();
-            for(int j=0; j<services.length; j++)
-            {
-                Service service = (Service)services[j];
-                if(!containsComponent(service, allServices)) {
-                    ((ServiceImpl)service).setDescriptionComponent(this);
-                    allServices.add(service);
-                }
-            }
-        }
-        
-        Service[] array = new Service[allServices.size()];
-        allServices.toArray(array);
-        return array;
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.Description#getService(javax.xml.namespace.QName)
-     */
-    public Service getService(QName name) 
-    {
-        Service service = null;
-        
-        if(name != null) 
-        {
-            Service[] services = getServices();
-            
-            for(int i=0; i<services.length; i++)
-            {
-                if(name.equals(services[i].getName()))
-                {
-                    service = services[i];
-                    break;
-                }
-            }
-        }
-        
-        return service;
-    }
-    
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.Description#getElementDeclarations()
-     */
-    public ElementDeclaration[] getElementDeclarations() 
-    {
-        if(!fComponentsInitialized) initComponents();
-        ElementDeclaration[] array = new ElementDeclaration[fAllElementDeclarations.size()];
-        fAllElementDeclarations.toArray(array);
-        return array;
-    }
-    
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.Description#getElementDeclaration(javax.xml.namespace.QName)
-     */
-    public ElementDeclaration getElementDeclaration(QName qname)
-    {
-        if(!fComponentsInitialized) initComponents();
-        ElementDeclaration elDec = null;
-        if(qname != null)
-        {
-            Iterator i = fAllElementDeclarations.iterator();
-            while(i.hasNext())
-            {
-                ElementDeclaration ed = (ElementDeclaration)i.next();
-                if(qname.equals(ed.getName())) 
-                {
-                    elDec = ed;
-                    break;
-                }
-            }
-        }
-        return elDec;
-    }
-    
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.Description#getTypeDefinitions()
-     */
-    public TypeDefinition[] getTypeDefinitions() 
-    {
-        if(!fComponentsInitialized) initComponents();
-        TypeDefinition[] array = new TypeDefinition[fAllTypeDefinitions.size()];
-        fAllTypeDefinitions.toArray(array);
-        return array;
-    }
-    
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.Description#getTypeDefinition(javax.xml.namespace.QName)
-     * TODO consider using Map instead of List
-     */
-    public TypeDefinition getTypeDefinition(QName qname)
-    {
-        if(!fComponentsInitialized) initComponents();
-        TypeDefinition typeDef = null;
-        if(qname != null)
-        {
-            Iterator i = fAllTypeDefinitions.iterator();
-            while(i.hasNext())
-            {
-                TypeDefinition td = (TypeDefinition)i.next();
-                if(qname.equals(td.getName())) 
-                {
-                    typeDef = td;
-                    break;
-                }
-            }
-        }
-        return typeDef;
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.Description#toElement()
-     */
-    public DescriptionElement toElement()
-    {
-        return this; 
-    }
-    
-    /* ************************************************************
-     *  DescriptionElement interface methods (the XML Element model)
-     * ************************************************************/
-    
-    public void setDocumentBaseURI(URI documentBaseURI) {
-        fDocumentBaseURI = documentBaseURI;
-    }
-    
-    public URI getDocumentBaseURI() {
-        return fDocumentBaseURI;
-    }
-    
-    public void setTargetNamespace(URI namespace) {
-        fTargetNamespace = namespace;    
-    }
-    
-    public URI getTargetNamespace() {
-        return fTargetNamespace;    
-    }
-
-    public void addNamespace(String prefix, URI namespace) 
-    {
-        String pfx = (prefix != null) ? prefix : "";
-        if (namespace != null) {
-            fNamespaces.put(pfx,namespace);
-        } else {
-            removeNamespace(pfx);
-        }
-    }
-    
-    public void removeNamespace(String prefix) 
-    {
-        String pfx = (prefix != null) ? prefix : "";
-        fNamespaces.remove(pfx);
-    }
-    
-    public URI getNamespace(String prefix) 
-    {
-        String pfx = (prefix != null) ? prefix : "";
-        return (URI) fNamespaces.get(pfx);
-    }
-    
-    public Map getNamespaces() 
-    {
-        return fNamespaces;
-    }
-
-    public ImportElement[] getImportElements()
-    {
-        ImportElement[] array = new ImportElement[fImportElements.size()];
-        fImportElements.toArray(array);
-        return array;
-    }
-    
-    public IncludeElement[] getIncludeElements()
-    {
-        IncludeElement[] array = new IncludeElement[fIncludeElements.size()];
-        fIncludeElements.toArray(array);
-        return array;
-    }
-
-    public TypesElement getTypesElement() 
-    {
-        return fTypesElement;    
-    }
-    
-    public TypesElement addTypesElement() throws WSDLException {
-        if (fTypesElement == null) {
-            fTypesElement = new TypesImpl();
-            fTypesElement.setParentElement(this);
-            return fTypesElement;
-        } else {
-            String msg = fWsdlContext.errorReporter.getFormattedMessage( 
-                    "WSDL523",
-                    new Object[] {});
-            throw new WSDLException(WSDLException.OTHER_ERROR, msg);
-        }
-    }
-    
-    public InterfaceElement[] getInterfaceElements() 
-    {
-        InterfaceElement[] array = new InterfaceElement[fInterfaceElements.size()];
-        fInterfaceElements.toArray(array);
-        return array;
-    }
-    
-    public BindingElement[] getBindingElements() 
-    {
-        BindingElement[] array = new BindingElement[fBindingElements.size()];
-        fBindingElements.toArray(array);
-        return array;
-    }
-    
-    public ServiceElement[] getServiceElements() 
-    {
-        ServiceElement[] array = new ServiceElement[fServiceElements.size()];
-        fServiceElements.toArray(array);
-        return array;
-    }
-    
-    //creator methods
-    
-    public ImportElement addImportElement() {
-        ImportImpl importEl = new ImportImpl();
-        fImportElements.add(importEl);
-        importEl.setParentElement(this);
-        return importEl;
-    }
-    
-    public IncludeElement addIncludeElement() {
-        IncludeImpl include = new IncludeImpl();
-        fIncludeElements.add(include);
-        include.setParentElement(this);
-        return include;
-    }
-    
-    public InterfaceElement addInterfaceElement() {
-        InterfaceImpl intface = new InterfaceImpl();
-        fInterfaceElements.add(intface);
-        intface.setParentElement(this);
-        return intface; 
-    }
-    
-    public BindingElement addBindingElement() {
-        BindingImpl binding = new BindingImpl();
-        fBindingElements.add(binding);
-        binding.setParentElement(this);
-        return binding;
-    }
-    
-    public ServiceElement addServiceElement() {
-        ServiceImpl service = new ServiceImpl();
-        fServiceElements.add(service);
-        service.setParentElement(this);
-        return service;
-    }
-    
-    /*JKctx
-    public void setExtensionRegistry(ExtensionRegistry extReg)
-    {
-        //method has been deprecated, to be removed pre or post M8 
-        fExtReg = extReg;
-    }
-    
-    public ExtensionRegistry getExtensionRegistry()
-    {
-        //method has been deprecated, to be removed pre or post M8
-        return fExtReg;
-    }
-    */
-    
-    /*
-     * @see org.apache.woden.wsdl20.xml.DescriptionElement#toComponent()
-     */
-    public Description toComponent()
-    {
-        //TODO synchronizing the Component data when Element model is modified
-        if(!fComponentsInitialized) {
-            initComponents();
-        }
-        return this;
-    }
-    
-    /* ************************************************************
-     *  Non-API implementation methods
-     * ************************************************************/
-
-    //package private, only needed by impl classes in this package
-    WSDLContext getWsdlContext() {
-        return fWsdlContext;
-    }
-    
-    //TODO make this package private (several tests use it, these must chg to correct API pgm model)
-    public void addElementDeclaration(ElementDeclaration elDec) 
-    {
-        if(elDec != null) {
-            fAllElementDeclarations.add(elDec);
-        }
-    }
-
-    //TODO make this package private (one test uses it, this must chg to correct API pgm model)
-    public void addTypeDefinition(TypeDefinition typeDef) 
-    {
-        if(typeDef != null) {
-            fAllTypeDefinitions.add(typeDef);
-        }
-    }
-    
-    private void initComponents() 
-    {
-        //TODO consider moving the builder logic inside this class, maybe as an inner class.
-        fComponentsInitialized = true;
-        new ComponentModelBuilder(this);
-    }
-    
-    /*
-     * This method returns the descriptions included by this description (using transitive closure)
-     * and the descriptions for any namespaces imported directly by this description (i.e. not transitive).
-     * It is a helper method for other methods that need to walk the wsdl tree to access the
-     * flattened collection of wsdl components available to this description.
-     * 
-     * TODO imports should be pervasive, components not limited to a single location attribute.
-     * TODO consider performance here (e.g. caching with flush-on-update notification) because this method
-     * will be used by getters for the top-level components (interfaces, bindings, services). 
-     */
-    private List getNestedDescriptions()
-    {
-        List descs = new Vector();
-        
-        //includes are transitive, so navigate the include tree
-        collectIncludedDescriptions(descs, this); 
-        
-        //imports are non-transitive, so just get the directly imported descriptions
-        //and any includes within them.
-        ImportElement[] imports = getImportElements();
-        for(int i = 0; i < imports.length; i++)
-        {
-            DescriptionElement desc = imports[i].getDescriptionElement();
-            if(desc != null) {
-                descs.add(desc);
-                collectIncludedDescriptions(descs, desc);
-            }
-        }
-        
-        return descs;
-    }
-    
-    private void collectIncludedDescriptions(List descs, DescriptionElement desc)
-    {
-        IncludeElement[] includes = desc.getIncludeElements();
-        for(int i = 0; i < includes.length; i++)
-        {
-            DescriptionElement includedDesc = includes[i].getDescriptionElement();
-            if(includedDesc != null && !descs.contains(includedDesc)) 
-            {
-                descs.add(includedDesc);
-            }
-            collectIncludedDescriptions(descs, includedDesc);
-        }
-    }
-    
-    /*
-     * (non-Javadoc)
-     * @see org.apache.woden.wsdl20.WSDLComponent#getFragmentIdentifier()
-     */
-    public FragmentIdentifier getFragmentIdentifier() { 
-        return  new FragmentIdentifier(new DescriptionPart());
-    }
-    
-    /**
-     * Nested elements within a <code>&lt;description&gt;</code> have attributes of type
-     * <i>xs:NCName</i>. The setter method for the attribute will take an NCName object as
-     * the input parameter. However, to be useful, the getter method returns a QName. The
-     * namespace within the QName has to be the targetNamespace of the <code>&lt;description&gt;</code>
-     * element. This method provides a way to retrieve the targetNamespace and any NS prefix
-     * of the enclosing <code>&lt;description&gt;</code> element.
-     * @param  wElem instance of WSDLElement for which the targetNamespace is required 
-     * @return a String array containing the targetNamespace and prefix of the DescriptionElement
-     *         that is the root element of wElem
-     */
-    static String[] getTargetNamespaceAndPrefix(WSDLElement wElem) {
-        if (wElem instanceof NestedElement) {
-            WSDLElement parent = ((NestedElement) wElem).getParentElement();
-            return getTargetNamespaceAndPrefix(parent);
-        }
-        
-        //we have a description element
-        String[] namespace = new String[] {"",""};
-        URI tns = ((DescriptionElement) wElem).getTargetNamespace();
-        if (tns != null) {
-            namespace[0] = tns.toString();
-            Set nsDecls = ((DescriptionElement) wElem).getNamespaces().entrySet();
-            if(nsDecls != null) {
-                Iterator i = nsDecls.iterator();
-                while(i.hasNext()) {
-                    Map.Entry entry = (Map.Entry)i.next();
-                    if(tns.equals(entry.getValue())) {
-                        namespace[1] = (String)entry.getKey();
-                    }
-                }
-            }
-        }
-        return namespace;
-    }
-
-}
+/**
+ * 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.
+ */
+package org.apache.woden.internal.wsdl20;
+
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Vector;
+
+import javax.xml.namespace.QName;
+
+import org.apache.woden.WSDLException;
+import org.apache.woden.internal.MessageFormatter;
+import org.apache.woden.internal.WSDLContext;
+import org.apache.woden.wsdl20.Binding;
+import org.apache.woden.wsdl20.Description;
+import org.apache.woden.wsdl20.ElementDeclaration;
+import org.apache.woden.wsdl20.Interface;
+import org.apache.woden.wsdl20.Service;
+import org.apache.woden.wsdl20.TypeDefinition;
+import org.apache.woden.wsdl20.extensions.ExtensionRegistry;
+import org.apache.woden.wsdl20.fragids.DescriptionPart;
+import org.apache.woden.wsdl20.fragids.FragmentIdentifier;
+import org.apache.woden.wsdl20.xml.BindingElement;
+import org.apache.woden.wsdl20.xml.DescriptionElement;
+import org.apache.woden.wsdl20.xml.ImportElement;
+import org.apache.woden.wsdl20.xml.IncludeElement;
+import org.apache.woden.wsdl20.xml.InterfaceElement;
+import org.apache.woden.wsdl20.xml.NestedElement;
+import org.apache.woden.wsdl20.xml.ServiceElement;
+import org.apache.woden.wsdl20.xml.TypesElement;
+import org.apache.woden.wsdl20.xml.WSDLElement;
+
+/**
+ * This class provides the implementation for a Description component from 
+ * the WSDL Component Model, as described in the WSDL 2.0 specification.  
+ * <p>
+ * Note: this class is different to the other WSDL implementation classes, 
+ * which all implement two Java interfaces; a component model interface and the 
+ * interface for the corresponding WSDL element. Different implementations
+ * are used for the Description component and for the &lt;wsdl:description&gt; 
+ * element because the latter exposes the composite structure of imported and 
+ * included WSDL documents, while the Description component 'flattens' this
+ * structure into an abstract view of the WSDL. A separate implementation
+ * class, <code>DescriptionElementImpl</code>, exists to represent
+ * the &lt;wsdl:description&gt; element.
+ * 
+ * @author jkaputin@apache.org
+ */
+public class DescriptionImpl extends WSDLComponentImpl
+                             implements Description, DescriptionElement 
+{
+    /*
+     * WSDL Component model data (flattened properties of Description Component)
+     * TODO cache top-level components here with a flush-on-update mechanism
+     */
+    private List fAllElementDeclarations = new Vector();
+    private List fAllTypeDefinitions = new Vector();
+    
+    /*
+     * WSDL Element model data
+     */
+    private URI fDocumentBaseURI = null;
+
+    //<description> attributes
+    private URI fTargetNamespace = null;
+    private Map fNamespaces = new HashMap();
+
+    //<description> child elements
+    private List fImportElements = new Vector();
+    private List fIncludeElements = new Vector();
+    private TypesImpl fTypesElement = null;
+    private List fInterfaceElements = new Vector();
+    private List fBindingElements = new Vector();
+    private List fServiceElements = new Vector();
+    
+    /*
+     * Woden-specific instance variables
+     */
+    
+    private boolean fComponentsInitialized = false;
+    private WSDLContext fWsdlContext;
+    
+    /*
+     * Constructors
+     */
+    private DescriptionImpl() {};
+    
+    public DescriptionImpl(WSDLContext wsdlContext) {
+        fWsdlContext = wsdlContext;
+    }
+    
+    /* ************************************************************
+     *  Description interface methods (the WSDL Component model)
+     * ************************************************************/
+    
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.Description#getInterfaces()
+     * 
+     * TODO performance to be addressed in this method. Suggest caching with
+     * some sort of notification-on-update to flush the cash and let lazy init
+     * reset it. But best to deal with performance after wsdl create/update has 
+     * been implemented, as we can then baseline the existing dynamic approach
+     * to test for correct behaviour after performance mods have been made. 
+     * (but see to do comment in getNestedDescriptions method too)
+     */
+    public Interface[] getInterfaces() 
+    {
+        List allInterfaces = new Vector();
+        
+        //declared interfaces
+        for(Iterator i=fInterfaceElements.iterator(); i.hasNext(); )
+        {
+            Interface intface = (Interface)i.next();
+            if(!containsComponent(intface, allInterfaces)) {
+                ((InterfaceImpl)intface).setDescriptionComponent(this);
+                allInterfaces.add(intface);
+            }
+        }
+        
+        //nested interfaces
+        List nestedDescs = new Vector(getNestedDescriptions());
+        for(Iterator i=nestedDescs.iterator(); i.hasNext(); )
+        {
+            DescriptionElement desc = (DescriptionElement)i.next();
+            InterfaceElement[] interfaces = desc.getInterfaceElements();
+            for(int j=0; j<interfaces.length; j++)
+            {
+                Interface intface = (Interface)interfaces[j];
+                if(!containsComponent(intface, allInterfaces)) {
+                    ((InterfaceImpl)intface).setDescriptionComponent(this);
+                    allInterfaces.add(intface);
+                }
+            }
+        }
+        
+        Interface[] array = new Interface[allInterfaces.size()];
+        allInterfaces.toArray(array);
+        return array;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.Description#getInterface(javax.xml.namespace.QName)
+     */
+    public Interface getInterface(QName name) 
+    {
+        Interface intface = null;
+        
+        if(name != null) 
+        {
+            Interface[] interfaces = getInterfaces();
+            
+            for(int i=0; i<interfaces.length; i++)
+            {
+                if(name.equals(interfaces[i].getName()))
+                {
+                    intface = interfaces[i];
+                    break;
+                }
+            }
+        }
+        
+        return intface;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.Description#getBindings()
+     * 
+     * TODO performance to be addressed in this method - see ToDo in getInterface()
+     */
+    public Binding[] getBindings() 
+    {
+        List allBindings = new Vector();
+        
+        //declared bindings
+        for(Iterator i=fBindingElements.iterator(); i.hasNext(); )
+        {
+            Binding binding = (Binding)i.next();
+            if(!containsComponent(binding, allBindings)) {
+                ((BindingImpl)binding).setDescriptionComponent(this);
+                allBindings.add(binding);
+            }
+        }
+        
+        //nested bindings
+        List nestedDescs = new Vector(getNestedDescriptions());
+        for(Iterator i=nestedDescs.iterator(); i.hasNext(); )
+        {
+            DescriptionElement desc = (DescriptionElement)i.next();
+            BindingElement[] bindings = desc.getBindingElements();
+            for(int j=0; j<bindings.length; j++)
+            {
+                Binding binding = (Binding)bindings[j];
+                if(!containsComponent(binding, allBindings)) {
+                    ((BindingImpl)binding).setDescriptionComponent(this);
+                    allBindings.add(binding);
+                }
+            }
+        }
+        
+        Binding[] array = new Binding[allBindings.size()];
+        allBindings.toArray(array);
+        return array;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.Description#getBinding(javax.xml.namespace.QName)
+     */
+    public Binding getBinding(QName name) 
+    {
+        Binding binding = null;
+        
+        if(name != null) 
+        {
+            Binding[] bindings = getBindings();
+            
+            for(int i=0; i<bindings.length; i++)
+            {
+                if(name.equals(bindings[i].getName()))
+                {
+                    binding = bindings[i];
+                    break;
+                }
+            }
+        }
+        
+        return binding;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.Description#getServices()
+     * 
+     * TODO performance to be addressed in this method - see ToDo in getInterface()
+     */
+    public Service[] getServices() 
+    {
+        List allServices = new Vector();
+        
+        //declared services
+        for(Iterator i=fServiceElements.iterator(); i.hasNext(); )
+        {
+            Service service = (Service)i.next();
+            if(!containsComponent(service, allServices)) {
+                ((ServiceImpl)service).setDescriptionComponent(this);
+                allServices.add(service);
+            }
+        }
+        
+        //nested services
+        List nestedDescs = new Vector(getNestedDescriptions());
+        for(Iterator i=nestedDescs.iterator(); i.hasNext(); )
+        {
+            DescriptionElement desc = (DescriptionElement)i.next();
+            ServiceElement[] services = desc.getServiceElements();
+            for(int j=0; j<services.length; j++)
+            {
+                Service service = (Service)services[j];
+                if(!containsComponent(service, allServices)) {
+                    ((ServiceImpl)service).setDescriptionComponent(this);
+                    allServices.add(service);
+                }
+            }
+        }
+        
+        Service[] array = new Service[allServices.size()];
+        allServices.toArray(array);
+        return array;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.Description#getService(javax.xml.namespace.QName)
+     */
+    public Service getService(QName name) 
+    {
+        Service service = null;
+        
+        if(name != null) 
+        {
+            Service[] services = getServices();
+            
+            for(int i=0; i<services.length; i++)
+            {
+                if(name.equals(services[i].getName()))
+                {
+                    service = services[i];
+                    break;
+                }
+            }
+        }
+        
+        return service;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.Description#getElementDeclarations()
+     */
+    public ElementDeclaration[] getElementDeclarations() 
+    {
+        if(!fComponentsInitialized) initComponents();
+        ElementDeclaration[] array = new ElementDeclaration[fAllElementDeclarations.size()];
+        fAllElementDeclarations.toArray(array);
+        return array;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.Description#getElementDeclaration(javax.xml.namespace.QName)
+     */
+    public ElementDeclaration getElementDeclaration(QName qname)
+    {
+        if(!fComponentsInitialized) initComponents();
+        ElementDeclaration elDec = null;
+        if(qname != null)
+        {
+            Iterator i = fAllElementDeclarations.iterator();
+            while(i.hasNext())
+            {
+                ElementDeclaration ed = (ElementDeclaration)i.next();
+                if(qname.equals(ed.getName())) 
+                {
+                    elDec = ed;
+                    break;
+                }
+            }
+        }
+        return elDec;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.Description#getTypeDefinitions()
+     */
+    public TypeDefinition[] getTypeDefinitions() 
+    {
+        if(!fComponentsInitialized) initComponents();
+        TypeDefinition[] array = new TypeDefinition[fAllTypeDefinitions.size()];
+        fAllTypeDefinitions.toArray(array);
+        return array;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.Description#getTypeDefinition(javax.xml.namespace.QName)
+     * TODO consider using Map instead of List
+     */
+    public TypeDefinition getTypeDefinition(QName qname)
+    {
+        if(!fComponentsInitialized) initComponents();
+        TypeDefinition typeDef = null;
+        if(qname != null)
+        {
+            Iterator i = fAllTypeDefinitions.iterator();
+            while(i.hasNext())
+            {
+                TypeDefinition td = (TypeDefinition)i.next();
+                if(qname.equals(td.getName())) 
+                {
+                    typeDef = td;
+                    break;
+                }
+            }
+        }
+        return typeDef;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.Description#toElement()
+     */
+    public DescriptionElement toElement()
+    {
+        return this; 
+    }
+    
+    /* ************************************************************
+     *  DescriptionElement interface methods (the XML Element model)
+     * ************************************************************/
+    
+    public void setDocumentBaseURI(URI documentBaseURI) {
+        fDocumentBaseURI = documentBaseURI;
+    }
+    
+    public URI getDocumentBaseURI() {
+        return fDocumentBaseURI;
+    }
+    
+    public void setTargetNamespace(URI namespace) {
+        fTargetNamespace = namespace;    
+    }
+    
+    public URI getTargetNamespace() {
+        return fTargetNamespace;    
+    }
+
+    public void addNamespace(String prefix, URI namespace) 
+    {
+        String pfx = (prefix != null) ? prefix : "";
+        if (namespace != null) {
+            fNamespaces.put(pfx,namespace);
+        } else {
+            removeNamespace(pfx);
+        }
+    }
+    
+    public void removeNamespace(String prefix) 
+    {
+        String pfx = (prefix != null) ? prefix : "";
+        fNamespaces.remove(pfx);
+    }
+    
+    public URI getNamespace(String prefix) 
+    {
+        String pfx = (prefix != null) ? prefix : "";
+        return (URI) fNamespaces.get(pfx);
+    }
+    
+    public Map getNamespaces() 
+    {
+        return fNamespaces;
+    }
+
+    public ImportElement[] getImportElements()
+    {
+        ImportElement[] array = new ImportElement[fImportElements.size()];
+        fImportElements.toArray(array);
+        return array;
+    }
+    
+    public IncludeElement[] getIncludeElements()
+    {
+        IncludeElement[] array = new IncludeElement[fIncludeElements.size()];
+        fIncludeElements.toArray(array);
+        return array;
+    }
+
+    public TypesElement getTypesElement() 
+    {
+        return fTypesElement;    
+    }
+    
+    public TypesElement addTypesElement() throws WSDLException {
+        if (fTypesElement == null) {
+            fTypesElement = new TypesImpl();
+            fTypesElement.setParentElement(this);
+            return fTypesElement;
+        } else {
+            String msg = fWsdlContext.errorReporter.getFormattedMessage( 
+                    "WSDL523",
+                    new Object[] {});
+            throw new WSDLException(WSDLException.OTHER_ERROR, msg);
+        }
+    }
+    
+    public InterfaceElement[] getInterfaceElements() 
+    {
+        InterfaceElement[] array = new InterfaceElement[fInterfaceElements.size()];
+        fInterfaceElements.toArray(array);
+        return array;
+    }
+    
+    public BindingElement[] getBindingElements() 
+    {
+        BindingElement[] array = new BindingElement[fBindingElements.size()];
+        fBindingElements.toArray(array);
+        return array;
+    }
+    
+    public ServiceElement[] getServiceElements() 
+    {
+        ServiceElement[] array = new ServiceElement[fServiceElements.size()];
+        fServiceElements.toArray(array);
+        return array;
+    }
+    
+    //creator methods
+    
+    public ImportElement addImportElement() {
+        ImportImpl importEl = new ImportImpl();
+        fImportElements.add(importEl);
+        importEl.setParentElement(this);
+        return importEl;
+    }
+    
+    public IncludeElement addIncludeElement() {
+        IncludeImpl include = new IncludeImpl();
+        fIncludeElements.add(include);
+        include.setParentElement(this);
+        return include;
+    }
+    
+    public InterfaceElement addInterfaceElement() {
+        InterfaceImpl intface = new InterfaceImpl();
+        fInterfaceElements.add(intface);
+        intface.setParentElement(this);
+        return intface; 
+    }
+    
+    public BindingElement addBindingElement() {
+        BindingImpl binding = new BindingImpl();
+        fBindingElements.add(binding);
+        binding.setParentElement(this);
+        return binding;
+    }
+    
+    public ServiceElement addServiceElement() {
+        ServiceImpl service = new ServiceImpl();
+        fServiceElements.add(service);
+        service.setParentElement(this);
+        return service;
+    }
+    
+    /*JKctx
+    public void setExtensionRegistry(ExtensionRegistry extReg)
+    {
+        //method has been deprecated, to be removed pre or post M8 
+        fExtReg = extReg;
+    }
+    
+    public ExtensionRegistry getExtensionRegistry()
+    {
+        //method has been deprecated, to be removed pre or post M8
+        return fExtReg;
+    }
+    */
+    
+    /*
+     * @see org.apache.woden.wsdl20.xml.DescriptionElement#toComponent()
+     */
+    public Description toComponent()
+    {
+        //TODO synchronizing the Component data when Element model is modified
+        if(!fComponentsInitialized) {
+            initComponents();
+        }
+        return this;
+    }
+    
+    /* ************************************************************
+     *  Non-API implementation methods
+     * ************************************************************/
+
+    //package private, only needed by impl classes in this package
+    WSDLContext getWsdlContext() {
+        return fWsdlContext;
+    }
+    
+    //TODO make this package private (several tests use it, these must chg to correct API pgm model)
+    public void addElementDeclaration(ElementDeclaration elDec) 
+    {
+        if(elDec != null) {
+            fAllElementDeclarations.add(elDec);
+        }
+    }
+
+    //TODO make this package private (one test uses it, this must chg to correct API pgm model)
+    public void addTypeDefinition(TypeDefinition typeDef) 
+    {
+        if(typeDef != null) {
+            fAllTypeDefinitions.add(typeDef);
+        }
+    }
+    
+    private void initComponents() 
+    {
+        //TODO consider moving the builder logic inside this class, maybe as an inner class.
+        fComponentsInitialized = true;
+        new ComponentModelBuilder(this);
+    }
+    
+    /*
+     * This method returns the descriptions included by this description (using transitive closure)
+     * and the descriptions for any namespaces imported directly by this description (i.e. not transitive).
+     * It is a helper method for other methods that need to walk the wsdl tree to access the
+     * flattened collection of wsdl components available to this description.
+     * 
+     * TODO imports should be pervasive, components not limited to a single location attribute.
+     * TODO consider performance here (e.g. caching with flush-on-update notification) because this method
+     * will be used by getters for the top-level components (interfaces, bindings, services). 
+     */
+    private List getNestedDescriptions()
+    {
+        List descs = new Vector();
+        
+        //includes are transitive, so navigate the include tree
+        collectIncludedDescriptions(descs, this); 
+        
+        //imports are non-transitive, so just get the directly imported descriptions
+        //and any includes within them.
+        ImportElement[] imports = getImportElements();
+        for(int i = 0; i < imports.length; i++)
+        {
+            DescriptionElement desc = imports[i].getDescriptionElement();
+            if(desc != null) {
+                descs.add(desc);
+                collectIncludedDescriptions(descs, desc);
+            }
+        }
+        
+        return descs;
+    }
+    
+    private void collectIncludedDescriptions(List descs, DescriptionElement desc)
+    {
+        IncludeElement[] includes = desc.getIncludeElements();
+        for(int i = 0; i < includes.length; i++)
+        {
+            DescriptionElement includedDesc = includes[i].getDescriptionElement();
+            if(includedDesc != null && !descs.contains(includedDesc)) 
+            {
+                descs.add(includedDesc);
+            }
+            collectIncludedDescriptions(descs, includedDesc);
+        }
+    }
+    
+    /*
+     * (non-Javadoc)
+     * @see org.apache.woden.wsdl20.WSDLComponent#getFragmentIdentifier()
+     */
+    public FragmentIdentifier getFragmentIdentifier() { 
+        return  new FragmentIdentifier(new DescriptionPart());
+    }
+    
+    /**
+     * Nested elements within a <code>&lt;description&gt;</code> have attributes of type
+     * <i>xs:NCName</i>. The setter method for the attribute will take an NCName object as
+     * the input parameter. However, to be useful, the getter method returns a QName. The
+     * namespace within the QName has to be the targetNamespace of the <code>&lt;description&gt;</code>
+     * element. This method provides a way to retrieve the targetNamespace and any NS prefix
+     * of the enclosing <code>&lt;description&gt;</code> element.
+     * @param  wElem instance of WSDLElement for which the targetNamespace is required 
+     * @return a String array containing the targetNamespace and prefix of the DescriptionElement
+     *         that is the root element of wElem
+     */
+    static String[] getTargetNamespaceAndPrefix(WSDLElement wElem) {
+        if (wElem instanceof NestedElement) {
+            WSDLElement parent = ((NestedElement) wElem).getParentElement();
+            return getTargetNamespaceAndPrefix(parent);
+        }
+        
+        //we have a description element
+        String[] namespace = new String[] {"",""};
+        URI tns = ((DescriptionElement) wElem).getTargetNamespace();
+        if (tns != null) {
+            namespace[0] = tns.toString();
+            Set nsDecls = ((DescriptionElement) wElem).getNamespaces().entrySet();
+            if(nsDecls != null) {
+                Iterator i = nsDecls.iterator();
+                while(i.hasNext()) {
+                    Map.Entry entry = (Map.Entry)i.next();
+                    if(tns.equals(entry.getValue())) {
+                        namespace[1] = (String)entry.getKey();
+                    }
+                }
+            }
+        }
+        return namespace;
+    }
+
+}

Propchange: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DescriptionImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DocumentableImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DocumentableImpl.java?rev=568932&r1=568931&r2=568932&view=diff
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DocumentableImpl.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DocumentableImpl.java Thu Aug 23 04:01:23 2007
@@ -1,57 +1,57 @@
-/**
+/**
  * 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.
- */
-package org.apache.woden.internal.wsdl20;
-
-import java.util.List;
-import java.util.Vector;
-
-import org.apache.woden.wsdl20.xml.DocumentableElement;
-import org.apache.woden.wsdl20.xml.DocumentationElement;
-
-/**
- * An abstract superclass for WSDL 2.0 elements which can have &lt;documentation&gt; 
- * child elements. That is, all WSDL 2.0 elements except the &lt;documentation&gt; 
- * element itself. Defines accessor methods for manipulating DocumentationElements.
- * 
- * @author jkaputin@apache.org
- */
-public abstract class DocumentableImpl extends WSDLElementImpl
-                                       implements DocumentableElement 
-{
-    private List fDocumentationElements = new Vector();
-    
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.xml.DocumentationElement org.apache.woden.wsdl20.xml.DocumentableElement#addDocumentationElement()
-     */
-    public DocumentationElement addDocumentationElement() 
-    {
-        DocumentationImpl docEl = new DocumentationImpl();
-        fDocumentationElements.add(docEl);
-        docEl.setParentElement(this);
-        return docEl;
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.xml.DocumentableElement#getDocumentationElements()
-     */
-    public DocumentationElement[] getDocumentationElements() {
-        DocumentationElement[] array = new DocumentationElement[fDocumentationElements.size()];
-        fDocumentationElements.toArray(array);
-        return array;
-    }
-
-}
+ * 
+ *     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.
+ */
+package org.apache.woden.internal.wsdl20;
+
+import java.util.List;
+import java.util.Vector;
+
+import org.apache.woden.wsdl20.xml.DocumentableElement;
+import org.apache.woden.wsdl20.xml.DocumentationElement;
+
+/**
+ * An abstract superclass for WSDL 2.0 elements which can have &lt;documentation&gt; 
+ * child elements. That is, all WSDL 2.0 elements except the &lt;documentation&gt; 
+ * element itself. Defines accessor methods for manipulating DocumentationElements.
+ * 
+ * @author jkaputin@apache.org
+ */
+public abstract class DocumentableImpl extends WSDLElementImpl
+                                       implements DocumentableElement 
+{
+    private List fDocumentationElements = new Vector();
+    
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.xml.DocumentationElement org.apache.woden.wsdl20.xml.DocumentableElement#addDocumentationElement()
+     */
+    public DocumentationElement addDocumentationElement() 
+    {
+        DocumentationImpl docEl = new DocumentationImpl();
+        fDocumentationElements.add(docEl);
+        docEl.setParentElement(this);
+        return docEl;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.xml.DocumentableElement#getDocumentationElements()
+     */
+    public DocumentationElement[] getDocumentationElements() {
+        DocumentationElement[] array = new DocumentationElement[fDocumentationElements.size()];
+        fDocumentationElements.toArray(array);
+        return array;
+    }
+
+}

Propchange: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DocumentableImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DocumentationImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DocumentationImpl.java?rev=568932&r1=568931&r2=568932&view=diff
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DocumentationImpl.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DocumentationImpl.java Thu Aug 23 04:01:23 2007
@@ -1,69 +1,69 @@
-/**
+/**
  * 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.
- */
-package org.apache.woden.internal.wsdl20;
-
-import org.apache.woden.wsdl20.xml.DocumentationElement;
-import org.apache.woden.wsdl20.xml.WSDLElement;
-import org.apache.woden.XMLElement;
-
-/**
- * This class implements support for parsing, creating and manipulating a
- * WSDL 2.0 &lt;wsdl:documentation&gt; XML element.
- * The &lt;wsdl:documentation&gt; element may contain mixed content, but this 
- * class does not attempt to understand that content. Instead it just wraps
- * the &lt;wsdl:documentation&gt; element's content model as a java.lang.Object. 
- * 
- * TODO chg inheritance hierachy so this too extends WSDL20ObjectImpl? 
- * (i.e. move documentation methods from WSDL20ObjectImpl to a DocumentableImpl class)
- * Currently, this class is a WSDL20Element (interface) but it is not a subclass of
- * WSDL20ObjectImpl.
- * 
- * @author jkaputin@apache.org
- */
-public class DocumentationImpl extends WSDLElementImpl implements DocumentationElement 
-{
-    private XMLElement fContent;
-    private WSDLElement fParentElem = null;
-    
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.xml.DocumentationElement#setContentModel(java.lang.Object)
-     */
-    public void setContent(XMLElement docEl) {
-        fContent = docEl;
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.xml.DocumentationElement#getContentModel()
-     */
-    public XMLElement getContent() {
-        return fContent;
-    }
-
-    /* 
-     * package private, used only by factory methods in this package
-     */
-    void setParentElement(WSDLElement parent) {
-        fParentElem = parent;
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.xml.NestedElement#getParentElement()
-     */
-    public WSDLElement getParentElement() {
-        return fParentElem;
-    }
-}
+ * 
+ *     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.
+ */
+package org.apache.woden.internal.wsdl20;
+
+import org.apache.woden.wsdl20.xml.DocumentationElement;
+import org.apache.woden.wsdl20.xml.WSDLElement;
+import org.apache.woden.XMLElement;
+
+/**
+ * This class implements support for parsing, creating and manipulating a
+ * WSDL 2.0 &lt;wsdl:documentation&gt; XML element.
+ * The &lt;wsdl:documentation&gt; element may contain mixed content, but this 
+ * class does not attempt to understand that content. Instead it just wraps
+ * the &lt;wsdl:documentation&gt; element's content model as a java.lang.Object. 
+ * 
+ * TODO chg inheritance hierachy so this too extends WSDL20ObjectImpl? 
+ * (i.e. move documentation methods from WSDL20ObjectImpl to a DocumentableImpl class)
+ * Currently, this class is a WSDL20Element (interface) but it is not a subclass of
+ * WSDL20ObjectImpl.
+ * 
+ * @author jkaputin@apache.org
+ */
+public class DocumentationImpl extends WSDLElementImpl implements DocumentationElement 
+{
+    private XMLElement fContent;
+    private WSDLElement fParentElem = null;
+    
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.xml.DocumentationElement#setContentModel(java.lang.Object)
+     */
+    public void setContent(XMLElement docEl) {
+        fContent = docEl;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.xml.DocumentationElement#getContentModel()
+     */
+    public XMLElement getContent() {
+        return fContent;
+    }
+
+    /* 
+     * package private, used only by factory methods in this package
+     */
+    void setParentElement(WSDLElement parent) {
+        fParentElem = parent;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.xml.NestedElement#getParentElement()
+     */
+    public WSDLElement getParentElement() {
+        return fParentElem;
+    }
+}

Propchange: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DocumentationImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/ElementDeclarationImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/ElementDeclarationImpl.java?rev=568932&r1=568931&r2=568932&view=diff
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/ElementDeclarationImpl.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/ElementDeclarationImpl.java Thu Aug 23 04:01:23 2007
@@ -1,120 +1,120 @@
-/**
+/**
  * 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.
- */
-package org.apache.woden.internal.wsdl20;
-
-import java.net.URI;
-
-import javax.xml.namespace.QName;
-
-import org.apache.woden.WSDLReader;
-
-import org.apache.woden.types.NCName;
-import org.apache.woden.wsdl20.ElementDeclaration;
-
-import org.apache.woden.wsdl20.fragids.FragmentIdentifier;
-import org.apache.woden.wsdl20.fragids.ElementDeclarationPart;
-
-/**
- * This class represents an ElementDeclaration property of the Description component.
- * It refers to a global element declaration provided by the underlying type
- * system (e.g. XML Schema) 
- * 
- * @author jkaputin@apache.org
- */
-public class ElementDeclarationImpl implements ElementDeclaration {
-    
-    private QName  fName = null;
-    private URI fSystem = null;
-    private String fContentModel = null;
-    private Object fContent = null;
-
-    /* ************************************************************
-     *  ElementDeclaration interface methods (the WSDL Component model)
-     * ************************************************************/
-    
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.ElementDeclaration#getName()
-     */
-    public QName getName() 
-    {
-        return fName;
-    }
-    
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.ElementDeclaration#getSystem()
-     */
-    public URI getSystem() 
-    {
-        return fSystem;
-    }
-    
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.ElementDeclaration#getContentModel()
-     */
-    public String getContentModel() 
-    {
-        return fContentModel;
-    }
-    
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.ElementDeclaration#getContent()
-     */
-    public Object getContent() 
-    {
-        return fContent;
-    }
-    
-    /* ************************************************************
-     *  Non-API implementation methods
-     * ************************************************************/
-
-    public void setName(QName name)
-    {
-        fName = name;
-    }
-
-    public void setSystem(URI typeSystemURI)
-    {
-        fSystem = typeSystemURI;
-    }
-    
-    public void setContentModel(String contentModel)
-    {
-        fContentModel = contentModel;
-    }
-
-    public void setContent(Object elementContent)
-    {
-        fContent = elementContent;
-    }
-    
-    /*
-     * (non-Javadoc)
-     * @see org.apache.woden.wsdl20.WSDLComponent#getFragmentIdentifier()
-     */
-    public FragmentIdentifier getFragmentIdentifier() {        
-        if (fSystem == null | fSystem.toString().equals(WSDLReader.TYPE_XSD_2001)) {
-            return new FragmentIdentifier(new ElementDeclarationPart(fName));
-        } else {
-            return new FragmentIdentifier(new ElementDeclarationPart(fName, fSystem));
-        }
-    }
-
-    public String toString() {
-        return getFragmentIdentifier().toString();
-    }
-}
+ * 
+ *     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.
+ */
+package org.apache.woden.internal.wsdl20;
+
+import java.net.URI;
+
+import javax.xml.namespace.QName;
+
+import org.apache.woden.WSDLReader;
+
+import org.apache.woden.types.NCName;
+import org.apache.woden.wsdl20.ElementDeclaration;
+
+import org.apache.woden.wsdl20.fragids.FragmentIdentifier;
+import org.apache.woden.wsdl20.fragids.ElementDeclarationPart;
+
+/**
+ * This class represents an ElementDeclaration property of the Description component.
+ * It refers to a global element declaration provided by the underlying type
+ * system (e.g. XML Schema) 
+ * 
+ * @author jkaputin@apache.org
+ */
+public class ElementDeclarationImpl implements ElementDeclaration {
+    
+    private QName  fName = null;
+    private URI fSystem = null;
+    private String fContentModel = null;
+    private Object fContent = null;
+
+    /* ************************************************************
+     *  ElementDeclaration interface methods (the WSDL Component model)
+     * ************************************************************/
+    
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.ElementDeclaration#getName()
+     */
+    public QName getName() 
+    {
+        return fName;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.ElementDeclaration#getSystem()
+     */
+    public URI getSystem() 
+    {
+        return fSystem;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.ElementDeclaration#getContentModel()
+     */
+    public String getContentModel() 
+    {
+        return fContentModel;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.ElementDeclaration#getContent()
+     */
+    public Object getContent() 
+    {
+        return fContent;
+    }
+    
+    /* ************************************************************
+     *  Non-API implementation methods
+     * ************************************************************/
+
+    public void setName(QName name)
+    {
+        fName = name;
+    }
+
+    public void setSystem(URI typeSystemURI)
+    {
+        fSystem = typeSystemURI;
+    }
+    
+    public void setContentModel(String contentModel)
+    {
+        fContentModel = contentModel;
+    }
+
+    public void setContent(Object elementContent)
+    {
+        fContent = elementContent;
+    }
+    
+    /*
+     * (non-Javadoc)
+     * @see org.apache.woden.wsdl20.WSDLComponent#getFragmentIdentifier()
+     */
+    public FragmentIdentifier getFragmentIdentifier() {        
+        if (fSystem == null | fSystem.toString().equals(WSDLReader.TYPE_XSD_2001)) {
+            return new FragmentIdentifier(new ElementDeclarationPart(fName));
+        } else {
+            return new FragmentIdentifier(new ElementDeclarationPart(fName, fSystem));
+        }
+    }
+
+    public String toString() {
+        return getFragmentIdentifier().toString();
+    }
+}

Propchange: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/ElementDeclarationImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/EndpointImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/EndpointImpl.java?rev=568932&r1=568931&r2=568932&view=diff
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/EndpointImpl.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/EndpointImpl.java Thu Aug 23 04:01:23 2007
@@ -1,149 +1,149 @@
-/**
+/**
  * 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.
- */
-package org.apache.woden.internal.wsdl20;
-
-import java.net.URI;
-
-import javax.xml.namespace.QName;
-
-import org.apache.woden.types.NCName;
-import org.apache.woden.wsdl20.Binding;
-import org.apache.woden.wsdl20.Description;
-import org.apache.woden.wsdl20.Endpoint;
-import org.apache.woden.wsdl20.Service;
-import org.apache.woden.wsdl20.xml.BindingElement;
-import org.apache.woden.wsdl20.xml.EndpointElement;
-
-import org.apache.woden.wsdl20.fragids.FragmentIdentifier;
-import org.apache.woden.wsdl20.fragids.EndpointPart;
-
-
-/**
- * This class represents the Endpoint component and the &lt;endpoint&gt; element.
- * 
- * @author John Kaputin (jkaputin@apache.org)
- */
-public class EndpointImpl extends NestedImpl 
-                          implements Endpoint,
-                                     EndpointElement 
-{
-    private NCName fName = null;
-    private QName fBindingName = null;
-    private URI fAddress = null;
-
-    /* ************************************************************
-     *  Endpoint interface methods (the WSDL Component model)
-     * ************************************************************/
-    
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.xml.Endpoint#getName()
-     * @see org.apache.woden.wsdl20.xml.EndpointElement#getName()
-     */
-    public NCName getName() {
-        return fName;
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.Endpoint#getBinding()
-     */
-    public Binding getBinding() 
-    {
-        ServiceImpl service = (ServiceImpl)getParent();
-        Description desc = service.getDescriptionComponent();
-        Binding binding = desc.getBinding(fBindingName);
-        return binding;
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.xml.Endpoint#getAddress()
-     * @see org.apache.woden.wsdl20.xml.EndpointElement#getAddress()
-     */
-    public URI getAddress() {
-        return fAddress;
-    }
-
-    /*
-     * @see org.apache.woden.wsdl20.Endpoint#toElement()
-     */
-    public EndpointElement toElement() {
-        return this;
-    }
-    
-    /* ************************************************************
-     *  EndpointElement interface methods (the XML Element model)
-     * ************************************************************/
-    
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.xml.EndpointElement#setName(org.apache.woden.types.NCName)
-     */
-    public void setName(NCName name) {
-        fName = name;
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.xml.EndpointElement#setBindingName(javax.xml.namespace.QName)
-     */
-    public void setBindingName(QName qname) {
-        fBindingName = qname;
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.xml.EndpointElement#getBindingName()
-     */
-    public QName getBindingName() {
-        return fBindingName;
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.xml.EndpointElement#getBindingElement()
-     */
-    public BindingElement getBindingElement() 
-    {
-        ServiceImpl service = (ServiceImpl)getParentElement();
-        
-        //Cast the containing description element to a description component to re-use its
-        //logic for navigating a composite wsdl to retrieve the in-scope top-level components.
-        Description desc = (Description)service.getParentElement();
-        
-        BindingElement binding = (BindingElement)desc.getBinding(fBindingName);
-        return binding;
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.xml.EndpointElement#setAddress(java.net.URI)
-     */
-    public void setAddress(URI uri) {
-        fAddress = uri;
-    }
-    
-    /*
-     * (non-Javadoc)
-     * @see org.apache.woden.wsdl20.WSDLComponent#getFragmentIdentifier()
-     */
-    public FragmentIdentifier getFragmentIdentifier() {
-        Service serviceComp = (Service)getParent();
-        
-        NCName service = new NCName(serviceComp.getName().getLocalPart());
-        
-        return new FragmentIdentifier(new EndpointPart(service ,fName));
-    }
-
-    /* ************************************************************
-     *  Non-API implementation methods
-     * ************************************************************/
-    
-}
+ * 
+ *     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.
+ */
+package org.apache.woden.internal.wsdl20;
+
+import java.net.URI;
+
+import javax.xml.namespace.QName;
+
+import org.apache.woden.types.NCName;
+import org.apache.woden.wsdl20.Binding;
+import org.apache.woden.wsdl20.Description;
+import org.apache.woden.wsdl20.Endpoint;
+import org.apache.woden.wsdl20.Service;
+import org.apache.woden.wsdl20.xml.BindingElement;
+import org.apache.woden.wsdl20.xml.EndpointElement;
+
+import org.apache.woden.wsdl20.fragids.FragmentIdentifier;
+import org.apache.woden.wsdl20.fragids.EndpointPart;
+
+
+/**
+ * This class represents the Endpoint component and the &lt;endpoint&gt; element.
+ * 
+ * @author John Kaputin (jkaputin@apache.org)
+ */
+public class EndpointImpl extends NestedImpl 
+                          implements Endpoint,
+                                     EndpointElement 
+{
+    private NCName fName = null;
+    private QName fBindingName = null;
+    private URI fAddress = null;
+
+    /* ************************************************************
+     *  Endpoint interface methods (the WSDL Component model)
+     * ************************************************************/
+    
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.xml.Endpoint#getName()
+     * @see org.apache.woden.wsdl20.xml.EndpointElement#getName()
+     */
+    public NCName getName() {
+        return fName;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.Endpoint#getBinding()
+     */
+    public Binding getBinding() 
+    {
+        ServiceImpl service = (ServiceImpl)getParent();
+        Description desc = service.getDescriptionComponent();
+        Binding binding = desc.getBinding(fBindingName);
+        return binding;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.xml.Endpoint#getAddress()
+     * @see org.apache.woden.wsdl20.xml.EndpointElement#getAddress()
+     */
+    public URI getAddress() {
+        return fAddress;
+    }
+
+    /*
+     * @see org.apache.woden.wsdl20.Endpoint#toElement()
+     */
+    public EndpointElement toElement() {
+        return this;
+    }
+    
+    /* ************************************************************
+     *  EndpointElement interface methods (the XML Element model)
+     * ************************************************************/
+    
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.xml.EndpointElement#setName(org.apache.woden.types.NCName)
+     */
+    public void setName(NCName name) {
+        fName = name;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.xml.EndpointElement#setBindingName(javax.xml.namespace.QName)
+     */
+    public void setBindingName(QName qname) {
+        fBindingName = qname;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.xml.EndpointElement#getBindingName()
+     */
+    public QName getBindingName() {
+        return fBindingName;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.xml.EndpointElement#getBindingElement()
+     */
+    public BindingElement getBindingElement() 
+    {
+        ServiceImpl service = (ServiceImpl)getParentElement();
+        
+        //Cast the containing description element to a description component to re-use its
+        //logic for navigating a composite wsdl to retrieve the in-scope top-level components.
+        Description desc = (Description)service.getParentElement();
+        
+        BindingElement binding = (BindingElement)desc.getBinding(fBindingName);
+        return binding;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.xml.EndpointElement#setAddress(java.net.URI)
+     */
+    public void setAddress(URI uri) {
+        fAddress = uri;
+    }
+    
+    /*
+     * (non-Javadoc)
+     * @see org.apache.woden.wsdl20.WSDLComponent#getFragmentIdentifier()
+     */
+    public FragmentIdentifier getFragmentIdentifier() {
+        Service serviceComp = (Service)getParent();
+        
+        NCName service = new NCName(serviceComp.getName().getLocalPart());
+        
+        return new FragmentIdentifier(new EndpointPart(service ,fName));
+    }
+
+    /* ************************************************************
+     *  Non-API implementation methods
+     * ************************************************************/
+    
+}

Propchange: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/EndpointImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/ImportImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/ImportImpl.java?rev=568932&r1=568931&r2=568932&view=diff
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/ImportImpl.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/ImportImpl.java Thu Aug 23 04:01:23 2007
@@ -1,48 +1,48 @@
-/**
+/**
  * 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.
- */
-package org.apache.woden.internal.wsdl20;
-
-import java.net.URI;
-
-import org.apache.woden.wsdl20.xml.ImportElement;
-
-/**
- * This class implements the &lt;wsdl:import&gt; element. 
- * 
- * @author jkaputin@apache.org
- */
-public class ImportImpl extends WSDLReferenceImpl implements ImportElement 
-{
-    private URI fNamespace = null;
-    
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.xml.ImportElement#setNamespace(java.net.URI)
-     */
-    public void setNamespace(URI nsURI) 
-    {
-        fNamespace = nsURI;
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.woden.wsdl20.xml.ImportElement#getNamespace()
-     */
-    public URI getNamespace() 
-    {
-        return fNamespace;
-    }
-
-}
+ * 
+ *     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.
+ */
+package org.apache.woden.internal.wsdl20;
+
+import java.net.URI;
+
+import org.apache.woden.wsdl20.xml.ImportElement;
+
+/**
+ * This class implements the &lt;wsdl:import&gt; element. 
+ * 
+ * @author jkaputin@apache.org
+ */
+public class ImportImpl extends WSDLReferenceImpl implements ImportElement 
+{
+    private URI fNamespace = null;
+    
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.xml.ImportElement#setNamespace(java.net.URI)
+     */
+    public void setNamespace(URI nsURI) 
+    {
+        fNamespace = nsURI;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.woden.wsdl20.xml.ImportElement#getNamespace()
+     */
+    public URI getNamespace() 
+    {
+        return fNamespace;
+    }
+
+}

Propchange: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/ImportImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/IncludeImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/IncludeImpl.java?rev=568932&r1=568931&r2=568932&view=diff
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/IncludeImpl.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/IncludeImpl.java Thu Aug 23 04:01:23 2007
@@ -1,32 +1,32 @@
-/**
+/**
  * 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.
- */
-package org.apache.woden.internal.wsdl20;
-
-import org.apache.woden.wsdl20.xml.IncludeElement;
-
-/**
- * This class implements the &lt;wsdl:include&gt; element. 
- * 
- * @author jkaputin@apache.org
- */
-public class IncludeImpl extends WSDLReferenceImpl implements IncludeElement 
-{
-    /* No additional definitions required. This class inherits all of its behaviour 
-     * from WSDLReferenceImpl. We just need this subclass so we can create an
-     * object representing IncludeElement, which maps to <wsdl:include>.
-     */
-}
+ * 
+ *     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.
+ */
+package org.apache.woden.internal.wsdl20;
+
+import org.apache.woden.wsdl20.xml.IncludeElement;
+
+/**
+ * This class implements the &lt;wsdl:include&gt; element. 
+ * 
+ * @author jkaputin@apache.org
+ */
+public class IncludeImpl extends WSDLReferenceImpl implements IncludeElement 
+{
+    /* No additional definitions required. This class inherits all of its behaviour 
+     * from WSDLReferenceImpl. We just need this subclass so we can create an
+     * object representing IncludeElement, which maps to <wsdl:include>.
+     */
+}

Propchange: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/IncludeImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native



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