Author: jkaputin
Date: Fri Sep 30 16:39:22 2005
New Revision: 292875

URL: http://svn.apache.org/viewcvs?rev=292875&view=rev
Log:
Refactored behaviour for <property> and <feature> into

the ConfigurableElement interface and for <documentation>

into the DocumentableElement interface.

Added:
    
incubator/woden/java/src/org/apache/woden/wsdl20/xml/ConfigurableElement.java
    
incubator/woden/java/src/org/apache/woden/wsdl20/xml/DocumentableElement.java
    incubator/woden/java/src/org/apache/woden/wsdl20/xml/FeatureElement.java
    incubator/woden/java/src/org/apache/woden/wsdl20/xml/PropertyElement.java
Modified:
    incubator/woden/java/src/org/apache/woden/wsdl20/xml/BindingElement.java
    incubator/woden/java/src/org/apache/woden/wsdl20/xml/DescriptionElement.java
    incubator/woden/java/src/org/apache/woden/wsdl20/xml/ImportElement.java
    incubator/woden/java/src/org/apache/woden/wsdl20/xml/IncludeElement.java
    incubator/woden/java/src/org/apache/woden/wsdl20/xml/ServiceElement.java
    incubator/woden/java/src/org/apache/woden/wsdl20/xml/TypesElement.java
    incubator/woden/java/src/org/apache/woden/wsdl20/xml/WSDL20Element.java

Modified: 
incubator/woden/java/src/org/apache/woden/wsdl20/xml/BindingElement.java
URL: 
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/wsdl20/xml/BindingElement.java?rev=292875&r1=292874&r2=292875&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/wsdl20/xml/BindingElement.java 
(original)
+++ incubator/woden/java/src/org/apache/woden/wsdl20/xml/BindingElement.java 
Fri Sep 30 16:39:22 2005
@@ -22,6 +22,8 @@
  * 

  * @author [EMAIL PROTECTED]

  */

-public interface BindingElement extends WSDL20Element {

-

+public interface BindingElement extends DocumentableElement,

+                                        ConfigurableElement

+{

+    //TODO

 }


Added: 
incubator/woden/java/src/org/apache/woden/wsdl20/xml/ConfigurableElement.java
URL: 
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/wsdl20/xml/ConfigurableElement.java?rev=292875&view=auto
==============================================================================
--- 
incubator/woden/java/src/org/apache/woden/wsdl20/xml/ConfigurableElement.java 
(added)
+++ 
incubator/woden/java/src/org/apache/woden/wsdl20/xml/ConfigurableElement.java 
Fri Sep 30 16:39:22 2005
@@ -0,0 +1,34 @@
+/**

+ * Copyright 2005 Apached Software Foundation 

+ *

+ * Licensed 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.wsdl20.xml;

+

+/**

+ * Interfaces for elements which can have &lt.feature&gt. and &lt.property&gt.

+ * child elements will extend this interface. That is, all WSDL elements

+ * except for &lt.description&gt., &lt.feature&gt., &lt.property&gt., 

+ * &lt.import&gt., &lt.include&gt.  and &lt.documentation&gt..

+ * 

+ * @author [EMAIL PROTECTED]

+ */

+public interface ConfigurableElement extends WSDL20Element {

+    

+    public void addFeatureElement(FeatureElement feature);

+    public FeatureElement[] getFeatureElements();

+    

+    public void addPropertyElement(PropertyElement property);

+    public PropertyElement[] getPropertyElements();

+

+}


Modified: 
incubator/woden/java/src/org/apache/woden/wsdl20/xml/DescriptionElement.java
URL: 
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/wsdl20/xml/DescriptionElement.java?rev=292875&r1=292874&r2=292875&view=diff
==============================================================================
--- 
incubator/woden/java/src/org/apache/woden/wsdl20/xml/DescriptionElement.java 
(original)
+++ 
incubator/woden/java/src/org/apache/woden/wsdl20/xml/DescriptionElement.java 
Fri Sep 30 16:39:22 2005
@@ -30,7 +30,7 @@
  * 

  * @author [EMAIL PROTECTED]

  */

-public interface DescriptionElement extends WSDL20Element 

+public interface DescriptionElement extends DocumentableElement 

 {

 

     /*

@@ -63,9 +63,6 @@
      * 

      */

     

-    public void setDocumentationElement(DocumentationElement docEl);

-    public DocumentationElement getDocumentationElement();

-    

     public void addImportElement(ImportElement importEl);

     public ImportElement[] getImports();

     

@@ -86,15 +83,10 @@
 

     //TODO extension elements

 

-    /*

-     * Component model methods

-     * TODO - where to put this functionality?

-     */

-    

     /* Initially, have added this method here to get the WSDL component

      * model from the xml instance (i.e. get a Description from this 

-     * instance of DescriptionElement). Still need to decide 

-     * where on the API to put this. Maybe in WSDLReader?

+     * instance of DescriptionElement). 

+     * TODO decide where on the API get the Component model. Maybe in 
WSDLReader?

      */ 

     public Description getDescriptionComponent();

     


Added: 
incubator/woden/java/src/org/apache/woden/wsdl20/xml/DocumentableElement.java
URL: 
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/wsdl20/xml/DocumentableElement.java?rev=292875&view=auto
==============================================================================
--- 
incubator/woden/java/src/org/apache/woden/wsdl20/xml/DocumentableElement.java 
(added)
+++ 
incubator/woden/java/src/org/apache/woden/wsdl20/xml/DocumentableElement.java 
Fri Sep 30 16:39:22 2005
@@ -0,0 +1,29 @@
+/**

+ * Copyright 2005 Apached Software Foundation 

+ *

+ * Licensed 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.wsdl20.xml;

+

+/**

+ * Interfaces for WSDL 2.0 elements which may have a &lt.documentation&gt. 

+ * child element will extend this interface. That is, all WSDL 2.0 elements

+ * except the &lt.documentation&gt. element itself.

+ * 

+ * @author [EMAIL PROTECTED]

+ */

+public interface DocumentableElement extends WSDL20Element 

+{

+    public void setDocumentationElement(DocumentationElement docEl);

+    public DocumentationElement getDocumentationElement();

+}


Added: incubator/woden/java/src/org/apache/woden/wsdl20/xml/FeatureElement.java
URL: 
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/wsdl20/xml/FeatureElement.java?rev=292875&view=auto
==============================================================================
--- incubator/woden/java/src/org/apache/woden/wsdl20/xml/FeatureElement.java 
(added)
+++ incubator/woden/java/src/org/apache/woden/wsdl20/xml/FeatureElement.java 
Fri Sep 30 16:39:22 2005
@@ -0,0 +1,27 @@
+/**

+ * Copyright 2005 Apached Software Foundation 

+ *

+ * Licensed 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.wsdl20.xml;

+

+/**

+ * Represents the &lt.feature&gt. element.

+ *  

+ * @author [EMAIL PROTECTED]

+ */

+public interface FeatureElement extends DocumentableElement 

+{

+    //TODO define the FeatureElement methods

+

+}


Modified: 
incubator/woden/java/src/org/apache/woden/wsdl20/xml/ImportElement.java
URL: 
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/wsdl20/xml/ImportElement.java?rev=292875&r1=292874&r2=292875&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/wsdl20/xml/ImportElement.java 
(original)
+++ incubator/woden/java/src/org/apache/woden/wsdl20/xml/ImportElement.java Fri 
Sep 30 16:39:22 2005
@@ -22,6 +22,7 @@
  * 

  * @author [EMAIL PROTECTED]

  */

-public interface ImportElement extends WSDL20Element {

-

+public interface ImportElement extends DocumentableElement 

+{

+    //TODO

 }


Modified: 
incubator/woden/java/src/org/apache/woden/wsdl20/xml/IncludeElement.java
URL: 
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/wsdl20/xml/IncludeElement.java?rev=292875&r1=292874&r2=292875&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/wsdl20/xml/IncludeElement.java 
(original)
+++ incubator/woden/java/src/org/apache/woden/wsdl20/xml/IncludeElement.java 
Fri Sep 30 16:39:22 2005
@@ -22,6 +22,7 @@
  * 

  * @author [EMAIL PROTECTED]

  */

-public interface IncludeElement extends WSDL20Element {

-

+public interface IncludeElement extends DocumentableElement 

+{

+    //TODO

 }


Added: incubator/woden/java/src/org/apache/woden/wsdl20/xml/PropertyElement.java
URL: 
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/wsdl20/xml/PropertyElement.java?rev=292875&view=auto
==============================================================================
--- incubator/woden/java/src/org/apache/woden/wsdl20/xml/PropertyElement.java 
(added)
+++ incubator/woden/java/src/org/apache/woden/wsdl20/xml/PropertyElement.java 
Fri Sep 30 16:39:22 2005
@@ -0,0 +1,26 @@
+/**

+ * Copyright 2005 Apached Software Foundation 

+ *

+ * Licensed 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.wsdl20.xml;

+

+/**

+ * Represents the &lt.property&gt. element.

+ *  

+ * @author [EMAIL PROTECTED]

+ */

+public interface PropertyElement extends DocumentableElement 

+{

+    //TODO define the PropertyElement methods

+}


Modified: 
incubator/woden/java/src/org/apache/woden/wsdl20/xml/ServiceElement.java
URL: 
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/wsdl20/xml/ServiceElement.java?rev=292875&r1=292874&r2=292875&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/wsdl20/xml/ServiceElement.java 
(original)
+++ incubator/woden/java/src/org/apache/woden/wsdl20/xml/ServiceElement.java 
Fri Sep 30 16:39:22 2005
@@ -22,6 +22,8 @@
  * 

  * @author [EMAIL PROTECTED]

  */

-public interface ServiceElement extends WSDL20Element {

-

+public interface ServiceElement extends DocumentableElement,

+                                        ConfigurableElement

+{

+    //TODO

 }


Modified: incubator/woden/java/src/org/apache/woden/wsdl20/xml/TypesElement.java
URL: 
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/wsdl20/xml/TypesElement.java?rev=292875&r1=292874&r2=292875&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/wsdl20/xml/TypesElement.java 
(original)
+++ incubator/woden/java/src/org/apache/woden/wsdl20/xml/TypesElement.java Fri 
Sep 30 16:39:22 2005
@@ -35,7 +35,7 @@
  * 

  * @author [EMAIL PROTECTED]

  */

-public interface TypesElement extends WSDL20Element 

+public interface TypesElement extends DocumentableElement

 {

     

     public void setDocumentationElement(DocumentationElement docEl);


Modified: 
incubator/woden/java/src/org/apache/woden/wsdl20/xml/WSDL20Element.java
URL: 
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/wsdl20/xml/WSDL20Element.java?rev=292875&r1=292874&r2=292875&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/wsdl20/xml/WSDL20Element.java 
(original)
+++ incubator/woden/java/src/org/apache/woden/wsdl20/xml/WSDL20Element.java Fri 
Sep 30 16:39:22 2005
@@ -21,6 +21,7 @@
  * 

  * @author [EMAIL PROTECTED]

  */

-public interface WSDL20Element {

-

+public interface WSDL20Element 

+{

+    //No methods defined.

 }




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to