You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2012/12/06 19:03:46 UTC

svn commit: r1418018 [1/2] - in /axis/axis1/java/branches/EMF/axis-model: model/ src/main/java/org/apache/axis/model/wsdd/ src/main/java/org/apache/axis/model/wsdd/impl/ src/test/wsdd/

Author: veithen
Date: Thu Dec  6 18:03:41 2012
New Revision: 1418018

URL: http://svn.apache.org/viewvc?rev=1418018&view=rev
Log:
Further refined the WSDD model.

Added:
    axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Flow.java   (with props)
    axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/GlobalConfiguration.java   (with props)
    axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Handler.java   (with props)
    axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Parameterizable.java   (with props)
    axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Transport.java   (with props)
    axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/FlowImpl.java   (with props)
    axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/GlobalConfigurationImpl.java   (with props)
    axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/HandlerImpl.java   (with props)
    axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ParameterizableImpl.java   (with props)
    axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/TransportImpl.java   (with props)
    axis/axis1/java/branches/EMF/axis-model/src/test/wsdd/client-config.wsdd
    axis/axis1/java/branches/EMF/axis-model/src/test/wsdd/server-config.wsdd
Modified:
    axis/axis1/java/branches/EMF/axis-model/model/wsdd.ecore
    axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/DeployableItem.java
    axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Deployment.java
    axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Service.java
    axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDFactory.java
    axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeployableItemImpl.java
    axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeploymentImpl.java
    axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ServiceImpl.java
    axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDFactoryImpl.java
    axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDPackageImpl.java

Modified: axis/axis1/java/branches/EMF/axis-model/model/wsdd.ecore
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/model/wsdd.ecore?rev=1418018&r1=1418017&r2=1418018&view=diff
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/model/wsdd.ecore (original)
+++ axis/axis1/java/branches/EMF/axis-model/model/wsdd.ecore Thu Dec  6 18:03:41 2012
@@ -77,17 +77,11 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DeployableItem" abstract="true">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Service" eSuperTypes="#//DeployableItem">
+  <eClassifiers xsi:type="ecore:EClass" name="Parameterizable">
     <eOperations name="setParameter">
       <eParameters name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
       <eParameters name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="provider" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//QName"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="use" eType="#//Use"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="style" eType="#//Style"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1"
         eType="#//Parameter" containment="true">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
@@ -96,6 +90,43 @@
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Handler" eSuperTypes="#//Parameterizable">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//QName"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Flow">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="handlers" upperBound="-1"
+        eType="#//Handler">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="name" value="handler"/>
+        <details key="kind" value="element"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="DeployableItem" abstract="true" eSuperTypes="#//Parameterizable">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="requestFlow" eType="#//Flow"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="responseFlow" eType="#//Flow"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="GlobalConfiguration" eSuperTypes="#//DeployableItem"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Transport" eSuperTypes="#//DeployableItem">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="pivot" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//QName"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Service" eSuperTypes="#//DeployableItem">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="provider" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//QName"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="use" eType="#//Use"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="style" eType="#//Style"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="namespaces" upperBound="-1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="namespace"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="operations" upperBound="-1"
         eType="#//Operation" containment="true">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
@@ -134,6 +165,25 @@
       <details key="name" value="deployment"/>
       <details key="kind" value="element"/>
     </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="globalConfiguration" eType="#//GlobalConfiguration"
+        containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="handlers" upperBound="-1"
+        eType="#//Handler">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="name" value="handler"/>
+        <details key="kind" value="element"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="transports" upperBound="-1"
+        eType="#//Transport">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="name" value="transport"/>
+        <details key="kind" value="element"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="services" upperBound="-1"
         eType="#//Service" containment="true">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">

Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/DeployableItem.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/DeployableItem.java?rev=1418018&r1=1418017&r2=1418018&view=diff
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/DeployableItem.java (original)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/DeployableItem.java Thu Dec  6 18:03:41 2012
@@ -14,37 +14,63 @@ package org.apache.axis.model.wsdd;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.apache.axis.model.wsdd.DeployableItem#getName <em>Name</em>}</li>
+ *   <li>{@link org.apache.axis.model.wsdd.DeployableItem#getRequestFlow <em>Request Flow</em>}</li>
+ *   <li>{@link org.apache.axis.model.wsdd.DeployableItem#getResponseFlow <em>Response Flow</em>}</li>
  * </ul>
  * </p>
  *
  * @model abstract="true"
  * @generated
  */
-public interface DeployableItem {
+public interface DeployableItem extends Parameterizable {
     /**
-     * Returns the value of the '<em><b>Name</b></em>' attribute.
+     * Returns the value of the '<em><b>Request Flow</b></em>' reference.
      * <!-- begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Name</em>' attribute isn't clear,
+     * If the meaning of the '<em>Request Flow</em>' reference isn't clear,
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * @return the value of the '<em>Name</em>' attribute.
-     * @see #setName(String)
+     * @return the value of the '<em>Request Flow</em>' reference.
+     * @see #setRequestFlow(Flow)
      * @model
      * @generated
      */
-    String getName();
+    Flow getRequestFlow();
 
     /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.DeployableItem#getName <em>Name</em>}' attribute.
+     * Sets the value of the '{@link org.apache.axis.model.wsdd.DeployableItem#getRequestFlow <em>Request Flow</em>}' reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Name</em>' attribute.
-     * @see #getName()
+     * @param value the new value of the '<em>Request Flow</em>' reference.
+     * @see #getRequestFlow()
      * @generated
      */
-    void setName(String value);
+    void setRequestFlow(Flow value);
+
+    /**
+     * Returns the value of the '<em><b>Response Flow</b></em>' reference.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Response Flow</em>' reference isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Response Flow</em>' reference.
+     * @see #setResponseFlow(Flow)
+     * @model
+     * @generated
+     */
+    Flow getResponseFlow();
+
+    /**
+     * Sets the value of the '{@link org.apache.axis.model.wsdd.DeployableItem#getResponseFlow <em>Response Flow</em>}' reference.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Response Flow</em>' reference.
+     * @see #getResponseFlow()
+     * @generated
+     */
+    void setResponseFlow(Flow value);
 
 } // DeployableItem

Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Deployment.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Deployment.java?rev=1418018&r1=1418017&r2=1418018&view=diff
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Deployment.java (original)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Deployment.java Thu Dec  6 18:03:41 2012
@@ -16,6 +16,10 @@ import java.util.List;
  * <p>
  * The following features are supported:
  * <ul>
+ *   <li>{@link org.apache.axis.model.wsdd.Deployment#getName <em>Name</em>}</li>
+ *   <li>{@link org.apache.axis.model.wsdd.Deployment#getGlobalConfiguration <em>Global Configuration</em>}</li>
+ *   <li>{@link org.apache.axis.model.wsdd.Deployment#getHandlers <em>Handlers</em>}</li>
+ *   <li>{@link org.apache.axis.model.wsdd.Deployment#getTransports <em>Transports</em>}</li>
  *   <li>{@link org.apache.axis.model.wsdd.Deployment#getServices <em>Services</em>}</li>
  * </ul>
  * </p>
@@ -25,6 +29,88 @@ import java.util.List;
  */
 public interface Deployment {
     /**
+     * Returns the value of the '<em><b>Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Name</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Name</em>' attribute.
+     * @see #setName(String)
+     * @model
+     * @generated
+     */
+    String getName();
+
+    /**
+     * Sets the value of the '{@link org.apache.axis.model.wsdd.Deployment#getName <em>Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Name</em>' attribute.
+     * @see #getName()
+     * @generated
+     */
+    void setName(String value);
+
+    /**
+     * Returns the value of the '<em><b>Global Configuration</b></em>' containment reference.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Global Configuration</em>' containment reference isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Global Configuration</em>' containment reference.
+     * @see #setGlobalConfiguration(GlobalConfiguration)
+     * @model containment="true"
+     * @generated
+     */
+    GlobalConfiguration getGlobalConfiguration();
+
+    /**
+     * Sets the value of the '{@link org.apache.axis.model.wsdd.Deployment#getGlobalConfiguration <em>Global Configuration</em>}' containment reference.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Global Configuration</em>' containment reference.
+     * @see #getGlobalConfiguration()
+     * @generated
+     */
+    void setGlobalConfiguration(GlobalConfiguration value);
+
+    /**
+     * Returns the value of the '<em><b>Handlers</b></em>' reference list.
+     * The list contents are of type {@link org.apache.axis.model.wsdd.Handler}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Handlers</em>' reference list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Handlers</em>' reference list.
+     * @model type="org.apache.axis.model.wsdd.Handler"
+     *        extendedMetaData="name='handler' kind='element' namespace='##targetNamespace'"
+     * @generated
+     */
+    List getHandlers();
+
+    /**
+     * Returns the value of the '<em><b>Transports</b></em>' reference list.
+     * The list contents are of type {@link org.apache.axis.model.wsdd.Transport}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Transports</em>' reference list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Transports</em>' reference list.
+     * @model type="org.apache.axis.model.wsdd.Transport"
+     *        extendedMetaData="name='transport' kind='element' namespace='##targetNamespace'"
+     * @generated
+     */
+    List getTransports();
+
+    /**
      * Returns the value of the '<em><b>Services</b></em>' containment reference list.
      * The list contents are of type {@link org.apache.axis.model.wsdd.Service}.
      * <!-- begin-user-doc -->

Added: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Flow.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Flow.java?rev=1418018&view=auto
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Flow.java (added)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Flow.java Thu Dec  6 18:03:41 2012
@@ -0,0 +1,44 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.apache.axis.model.wsdd;
+
+import java.util.List;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Flow</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.apache.axis.model.wsdd.Flow#getHandlers <em>Handlers</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @model
+ * @generated
+ */
+public interface Flow {
+
+    /**
+     * Returns the value of the '<em><b>Handlers</b></em>' reference list.
+     * The list contents are of type {@link org.apache.axis.model.wsdd.Handler}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Handlers</em>' reference list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Handlers</em>' reference list.
+     * @model type="org.apache.axis.model.wsdd.Handler"
+     *        extendedMetaData="name='handler' kind='element' namespace='##targetNamespace'"
+     * @generated
+     */
+    List getHandlers();
+} // Flow

Propchange: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Flow.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/GlobalConfiguration.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/GlobalConfiguration.java?rev=1418018&view=auto
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/GlobalConfiguration.java (added)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/GlobalConfiguration.java Thu Dec  6 18:03:41 2012
@@ -0,0 +1,20 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.apache.axis.model.wsdd;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Global Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @model
+ * @generated
+ */
+public interface GlobalConfiguration extends DeployableItem {
+} // GlobalConfiguration

Propchange: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/GlobalConfiguration.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Handler.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Handler.java?rev=1418018&view=auto
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Handler.java (added)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Handler.java Thu Dec  6 18:03:41 2012
@@ -0,0 +1,77 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.apache.axis.model.wsdd;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Handler</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.apache.axis.model.wsdd.Handler#getName <em>Name</em>}</li>
+ *   <li>{@link org.apache.axis.model.wsdd.Handler#getType <em>Type</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @model
+ * @generated
+ */
+public interface Handler extends Parameterizable {
+
+    /**
+     * Returns the value of the '<em><b>Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Name</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Name</em>' attribute.
+     * @see #setName(String)
+     * @model
+     * @generated
+     */
+    String getName();
+
+    /**
+     * Sets the value of the '{@link org.apache.axis.model.wsdd.Handler#getName <em>Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Name</em>' attribute.
+     * @see #getName()
+     * @generated
+     */
+    void setName(String value);
+
+    /**
+     * Returns the value of the '<em><b>Type</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Type</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Type</em>' attribute.
+     * @see #setType(Object)
+     * @model dataType="org.eclipse.emf.ecore.xml.type.QName"
+     * @generated
+     */
+    Object getType();
+
+    /**
+     * Sets the value of the '{@link org.apache.axis.model.wsdd.Handler#getType <em>Type</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Type</em>' attribute.
+     * @see #getType()
+     * @generated
+     */
+    void setType(Object value);
+} // Handler

Propchange: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Handler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Parameterizable.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Parameterizable.java?rev=1418018&view=auto
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Parameterizable.java (added)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Parameterizable.java Thu Dec  6 18:03:41 2012
@@ -0,0 +1,51 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.apache.axis.model.wsdd;
+
+import java.util.List;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Parameterizable</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.apache.axis.model.wsdd.Parameterizable#getParameters <em>Parameters</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @model
+ * @generated
+ */
+public interface Parameterizable {
+    /**
+     * Returns the value of the '<em><b>Parameters</b></em>' containment reference list.
+     * The list contents are of type {@link org.apache.axis.model.wsdd.Parameter}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Parameters</em>' containment reference list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Parameters</em>' containment reference list.
+     * @model type="org.apache.axis.model.wsdd.Parameter" containment="true"
+     *        extendedMetaData="kind='element' name='parameter' namespace='##targetNamespace'"
+     * @generated
+     */
+    List getParameters();
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @model nameRequired="true" valueRequired="true"
+     * @generated
+     */
+    void setParameter(String name, String value);
+
+} // Parameterizable

Propchange: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Parameterizable.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Service.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Service.java?rev=1418018&r1=1418017&r2=1418018&view=diff
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Service.java (original)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Service.java Thu Dec  6 18:03:41 2012
@@ -16,10 +16,11 @@ import java.util.List;
  * <p>
  * The following features are supported:
  * <ul>
+ *   <li>{@link org.apache.axis.model.wsdd.Service#getName <em>Name</em>}</li>
  *   <li>{@link org.apache.axis.model.wsdd.Service#getProvider <em>Provider</em>}</li>
  *   <li>{@link org.apache.axis.model.wsdd.Service#getUse <em>Use</em>}</li>
  *   <li>{@link org.apache.axis.model.wsdd.Service#getStyle <em>Style</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.Service#getParameters <em>Parameters</em>}</li>
+ *   <li>{@link org.apache.axis.model.wsdd.Service#getNamespaces <em>Namespaces</em>}</li>
  *   <li>{@link org.apache.axis.model.wsdd.Service#getOperations <em>Operations</em>}</li>
  *   <li>{@link org.apache.axis.model.wsdd.Service#getTypeMappings <em>Type Mappings</em>}</li>
  *   <li>{@link org.apache.axis.model.wsdd.Service#getBeanMappings <em>Bean Mappings</em>}</li>
@@ -32,6 +33,31 @@ import java.util.List;
  */
 public interface Service extends DeployableItem {
     /**
+     * Returns the value of the '<em><b>Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Name</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Name</em>' attribute.
+     * @see #setName(String)
+     * @model
+     * @generated
+     */
+    String getName();
+
+    /**
+     * Sets the value of the '{@link org.apache.axis.model.wsdd.Service#getName <em>Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Name</em>' attribute.
+     * @see #getName()
+     * @generated
+     */
+    void setName(String value);
+
+    /**
      * Returns the value of the '<em><b>Provider</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <p>
@@ -113,20 +139,19 @@ public interface Service extends Deploya
     void setStyle(Style value);
 
     /**
-     * Returns the value of the '<em><b>Parameters</b></em>' containment reference list.
-     * The list contents are of type {@link org.apache.axis.model.wsdd.Parameter}.
+     * Returns the value of the '<em><b>Namespaces</b></em>' attribute list.
+     * The list contents are of type {@link java.lang.String}.
      * <!-- begin-user-doc -->
      * <p>
-     * If the meaning of the '<em>Parameters</em>' containment reference list isn't clear,
+     * If the meaning of the '<em>Namespaces</em>' attribute list isn't clear,
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     * @return the value of the '<em>Parameters</em>' containment reference list.
-     * @model type="org.apache.axis.model.wsdd.Parameter" containment="true"
-     *        extendedMetaData="kind='element' name='parameter' namespace='##targetNamespace'"
+     * @return the value of the '<em>Namespaces</em>' attribute list.
+     * @model extendedMetaData="kind='element' name='namespace' namespace='##targetNamespace'"
      * @generated
      */
-    List getParameters();
+    List getNamespaces();
 
     /**
      * Returns the value of the '<em><b>Operations</b></em>' containment reference list.
@@ -192,12 +217,4 @@ public interface Service extends Deploya
      */
     List getArrayMappings();
 
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @model nameRequired="true" valueRequired="true"
-     * @generated
-     */
-    void setParameter(String name, String value);
-
 } // Service

Added: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Transport.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Transport.java?rev=1418018&view=auto
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Transport.java (added)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Transport.java Thu Dec  6 18:03:41 2012
@@ -0,0 +1,77 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.apache.axis.model.wsdd;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Transport</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.apache.axis.model.wsdd.Transport#getName <em>Name</em>}</li>
+ *   <li>{@link org.apache.axis.model.wsdd.Transport#getPivot <em>Pivot</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @model
+ * @generated
+ */
+public interface Transport extends DeployableItem {
+    /**
+     * Returns the value of the '<em><b>Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Name</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Name</em>' attribute.
+     * @see #setName(String)
+     * @model
+     * @generated
+     */
+    String getName();
+
+    /**
+     * Sets the value of the '{@link org.apache.axis.model.wsdd.Transport#getName <em>Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Name</em>' attribute.
+     * @see #getName()
+     * @generated
+     */
+    void setName(String value);
+
+    /**
+     * Returns the value of the '<em><b>Pivot</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Pivot</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Pivot</em>' attribute.
+     * @see #setPivot(Object)
+     * @model dataType="org.eclipse.emf.ecore.xml.type.QName"
+     * @generated
+     */
+    Object getPivot();
+
+    /**
+     * Sets the value of the '{@link org.apache.axis.model.wsdd.Transport#getPivot <em>Pivot</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Pivot</em>' attribute.
+     * @see #getPivot()
+     * @generated
+     */
+    void setPivot(Object value);
+
+} // Transport

Propchange: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Transport.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDFactory.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDFactory.java?rev=1418018&r1=1418017&r2=1418018&view=diff
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDFactory.java (original)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDFactory.java Thu Dec  6 18:03:41 2012
@@ -31,6 +31,15 @@ public interface WSDDFactory {
     Parameter createParameter();
 
     /**
+     * Returns a new object of class '<em>Flow</em>'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return a new object of class '<em>Flow</em>'.
+     * @generated
+     */
+    Flow createFlow();
+
+    /**
      * Returns a new object of class '<em>Type Mapping</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -85,6 +94,42 @@ public interface WSDDFactory {
     Operation createOperation();
 
     /**
+     * Returns a new object of class '<em>Parameterizable</em>'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return a new object of class '<em>Parameterizable</em>'.
+     * @generated
+     */
+    Parameterizable createParameterizable();
+
+    /**
+     * Returns a new object of class '<em>Handler</em>'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return a new object of class '<em>Handler</em>'.
+     * @generated
+     */
+    Handler createHandler();
+
+    /**
+     * Returns a new object of class '<em>Global Configuration</em>'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return a new object of class '<em>Global Configuration</em>'.
+     * @generated
+     */
+    GlobalConfiguration createGlobalConfiguration();
+
+    /**
+     * Returns a new object of class '<em>Transport</em>'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return a new object of class '<em>Transport</em>'.
+     * @generated
+     */
+    Transport createTransport();
+
+    /**
      * Returns a new object of class '<em>Service</em>'.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->

Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeployableItemImpl.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeployableItemImpl.java?rev=1418018&r1=1418017&r2=1418018&view=diff
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeployableItemImpl.java (original)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeployableItemImpl.java Thu Dec  6 18:03:41 2012
@@ -8,9 +8,11 @@ package org.apache.axis.model.wsdd.impl;
 
 import org.apache.axis.model.wsdd.DeployableItem;
 
+import org.apache.axis.model.wsdd.Flow;
 import org.eclipse.emf.ecore.EClass;
 
-import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.InternalEObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -19,32 +21,32 @@ import org.eclipse.emf.ecore.impl.EObjec
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.apache.axis.model.wsdd.impl.DeployableItemImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.apache.axis.model.wsdd.impl.DeployableItemImpl#getRequestFlow <em>Request Flow</em>}</li>
+ *   <li>{@link org.apache.axis.model.wsdd.impl.DeployableItemImpl#getResponseFlow <em>Response Flow</em>}</li>
  * </ul>
  * </p>
  *
  * @generated
  */
-public abstract class DeployableItemImpl extends EObjectImpl implements DeployableItem {
+public abstract class DeployableItemImpl extends ParameterizableImpl implements DeployableItem {
     /**
-     * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+     * The cached value of the '{@link #getRequestFlow() <em>Request Flow</em>}' reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see #getName()
+     * @see #getRequestFlow()
      * @generated
      * @ordered
      */
-    protected static final String NAME_EDEFAULT = null;
-
+    protected Flow requestFlow;
     /**
-     * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+     * The cached value of the '{@link #getResponseFlow() <em>Response Flow</em>}' reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see #getName()
+     * @see #getResponseFlow()
      * @generated
      * @ordered
      */
-    protected String name = NAME_EDEFAULT;
+    protected Flow responseFlow;
 
     /**
      * <!-- begin-user-doc -->
@@ -69,8 +71,14 @@ public abstract class DeployableItemImpl
      * <!-- end-user-doc -->
      * @generated
      */
-    public String getName() {
-        return name;
+    public Flow getRequestFlow() {
+        if (requestFlow != null && ((EObject)requestFlow).eIsProxy()) {
+            InternalEObject oldRequestFlow = (InternalEObject)requestFlow;
+            requestFlow = (Flow)eResolveProxy(oldRequestFlow);
+            if (requestFlow != oldRequestFlow) {
+            }
+        }
+        return requestFlow;
     }
 
     /**
@@ -78,8 +86,50 @@ public abstract class DeployableItemImpl
      * <!-- end-user-doc -->
      * @generated
      */
-    public void setName(String newName) {
-        name = newName;
+    public Flow basicGetRequestFlow() {
+        return requestFlow;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setRequestFlow(Flow newRequestFlow) {
+        requestFlow = newRequestFlow;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public Flow getResponseFlow() {
+        if (responseFlow != null && ((EObject)responseFlow).eIsProxy()) {
+            InternalEObject oldResponseFlow = (InternalEObject)responseFlow;
+            responseFlow = (Flow)eResolveProxy(oldResponseFlow);
+            if (responseFlow != oldResponseFlow) {
+            }
+        }
+        return responseFlow;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public Flow basicGetResponseFlow() {
+        return responseFlow;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setResponseFlow(Flow newResponseFlow) {
+        responseFlow = newResponseFlow;
     }
 
     /**
@@ -89,8 +139,12 @@ public abstract class DeployableItemImpl
      */
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
-            case WSDDPackageImpl.DEPLOYABLE_ITEM__NAME:
-                return getName();
+            case WSDDPackageImpl.DEPLOYABLE_ITEM__REQUEST_FLOW:
+                if (resolve) return getRequestFlow();
+                return basicGetRequestFlow();
+            case WSDDPackageImpl.DEPLOYABLE_ITEM__RESPONSE_FLOW:
+                if (resolve) return getResponseFlow();
+                return basicGetResponseFlow();
         }
         return super.eGet(featureID, resolve, coreType);
     }
@@ -102,8 +156,11 @@ public abstract class DeployableItemImpl
      */
     public void eSet(int featureID, Object newValue) {
         switch (featureID) {
-            case WSDDPackageImpl.DEPLOYABLE_ITEM__NAME:
-                setName((String)newValue);
+            case WSDDPackageImpl.DEPLOYABLE_ITEM__REQUEST_FLOW:
+                setRequestFlow((Flow)newValue);
+                return;
+            case WSDDPackageImpl.DEPLOYABLE_ITEM__RESPONSE_FLOW:
+                setResponseFlow((Flow)newValue);
                 return;
         }
         super.eSet(featureID, newValue);
@@ -116,8 +173,11 @@ public abstract class DeployableItemImpl
      */
     public void eUnset(int featureID) {
         switch (featureID) {
-            case WSDDPackageImpl.DEPLOYABLE_ITEM__NAME:
-                setName(NAME_EDEFAULT);
+            case WSDDPackageImpl.DEPLOYABLE_ITEM__REQUEST_FLOW:
+                setRequestFlow((Flow)null);
+                return;
+            case WSDDPackageImpl.DEPLOYABLE_ITEM__RESPONSE_FLOW:
+                setResponseFlow((Flow)null);
                 return;
         }
         super.eUnset(featureID);
@@ -130,25 +190,12 @@ public abstract class DeployableItemImpl
      */
     public boolean eIsSet(int featureID) {
         switch (featureID) {
-            case WSDDPackageImpl.DEPLOYABLE_ITEM__NAME:
-                return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+            case WSDDPackageImpl.DEPLOYABLE_ITEM__REQUEST_FLOW:
+                return requestFlow != null;
+            case WSDDPackageImpl.DEPLOYABLE_ITEM__RESPONSE_FLOW:
+                return responseFlow != null;
         }
         return super.eIsSet(featureID);
     }
 
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
-        result.append(name);
-        result.append(')');
-        return result.toString();
-    }
-
 } //DeployableItemImpl

Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeploymentImpl.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeploymentImpl.java?rev=1418018&r1=1418017&r2=1418018&view=diff
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeploymentImpl.java (original)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeploymentImpl.java Thu Dec  6 18:03:41 2012
@@ -10,8 +10,11 @@ import java.util.Collection;
 
 import java.util.List;
 import org.apache.axis.model.wsdd.Deployment;
+import org.apache.axis.model.wsdd.GlobalConfiguration;
+import org.apache.axis.model.wsdd.Handler;
 import org.apache.axis.model.wsdd.Service;
 
+import org.apache.axis.model.wsdd.Transport;
 import org.eclipse.emf.common.notify.NotificationChain;
 
 import org.eclipse.emf.common.util.EList;
@@ -31,6 +34,10 @@ import org.eclipse.emf.ecore.util.Intern
  * <p>
  * The following features are implemented:
  * <ul>
+ *   <li>{@link org.apache.axis.model.wsdd.impl.DeploymentImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.apache.axis.model.wsdd.impl.DeploymentImpl#getGlobalConfiguration <em>Global Configuration</em>}</li>
+ *   <li>{@link org.apache.axis.model.wsdd.impl.DeploymentImpl#getHandlers <em>Handlers</em>}</li>
+ *   <li>{@link org.apache.axis.model.wsdd.impl.DeploymentImpl#getTransports <em>Transports</em>}</li>
  *   <li>{@link org.apache.axis.model.wsdd.impl.DeploymentImpl#getServices <em>Services</em>}</li>
  * </ul>
  * </p>
@@ -39,6 +46,51 @@ import org.eclipse.emf.ecore.util.Intern
  */
 public class DeploymentImpl extends EObjectImpl implements Deployment {
     /**
+     * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getName()
+     * @generated
+     * @ordered
+     */
+    protected static final String NAME_EDEFAULT = null;
+    /**
+     * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getName()
+     * @generated
+     * @ordered
+     */
+    protected String name = NAME_EDEFAULT;
+    /**
+     * The cached value of the '{@link #getGlobalConfiguration() <em>Global Configuration</em>}' containment reference.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getGlobalConfiguration()
+     * @generated
+     * @ordered
+     */
+    protected GlobalConfiguration globalConfiguration;
+    /**
+     * The cached value of the '{@link #getHandlers() <em>Handlers</em>}' reference list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getHandlers()
+     * @generated
+     * @ordered
+     */
+    protected EList handlers;
+    /**
+     * The cached value of the '{@link #getTransports() <em>Transports</em>}' reference list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getTransports()
+     * @generated
+     * @ordered
+     */
+    protected EList transports;
+    /**
      * The cached value of the '{@link #getServices() <em>Services</em>}' containment reference list.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -71,6 +123,85 @@ public class DeploymentImpl extends EObj
      * <!-- end-user-doc -->
      * @generated
      */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setName(String newName) {
+        name = newName;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public GlobalConfiguration getGlobalConfiguration() {
+        return globalConfiguration;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public NotificationChain basicSetGlobalConfiguration(GlobalConfiguration newGlobalConfiguration, NotificationChain msgs) {
+        GlobalConfiguration oldGlobalConfiguration = globalConfiguration;
+        globalConfiguration = newGlobalConfiguration;
+        return msgs;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setGlobalConfiguration(GlobalConfiguration newGlobalConfiguration) {
+        if (newGlobalConfiguration != globalConfiguration) {
+            NotificationChain msgs = null;
+            if (globalConfiguration != null)
+                msgs = ((InternalEObject)globalConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WSDDPackageImpl.DEPLOYMENT__GLOBAL_CONFIGURATION, null, msgs);
+            if (newGlobalConfiguration != null)
+                msgs = ((InternalEObject)newGlobalConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WSDDPackageImpl.DEPLOYMENT__GLOBAL_CONFIGURATION, null, msgs);
+            msgs = basicSetGlobalConfiguration(newGlobalConfiguration, msgs);
+            if (msgs != null) msgs.dispatch();
+        }
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public List getHandlers() {
+        if (handlers == null) {
+            handlers = new BasicInternalEList(Handler.class);
+        }
+        return handlers;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public List getTransports() {
+        if (transports == null) {
+            transports = new BasicInternalEList(Transport.class);
+        }
+        return transports;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
     public List getServices() {
         if (services == null) {
             services = new BasicInternalEList(Service.class);
@@ -85,6 +216,8 @@ public class DeploymentImpl extends EObj
      */
     public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
         switch (featureID) {
+            case WSDDPackageImpl.DEPLOYMENT__GLOBAL_CONFIGURATION:
+                return basicSetGlobalConfiguration(null, msgs);
             case WSDDPackageImpl.DEPLOYMENT__SERVICES:
                 return ((InternalEList)getServices()).basicRemove(otherEnd, msgs);
         }
@@ -98,6 +231,14 @@ public class DeploymentImpl extends EObj
      */
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
+            case WSDDPackageImpl.DEPLOYMENT__NAME:
+                return getName();
+            case WSDDPackageImpl.DEPLOYMENT__GLOBAL_CONFIGURATION:
+                return getGlobalConfiguration();
+            case WSDDPackageImpl.DEPLOYMENT__HANDLERS:
+                return getHandlers();
+            case WSDDPackageImpl.DEPLOYMENT__TRANSPORTS:
+                return getTransports();
             case WSDDPackageImpl.DEPLOYMENT__SERVICES:
                 return getServices();
         }
@@ -111,6 +252,20 @@ public class DeploymentImpl extends EObj
      */
     public void eSet(int featureID, Object newValue) {
         switch (featureID) {
+            case WSDDPackageImpl.DEPLOYMENT__NAME:
+                setName((String)newValue);
+                return;
+            case WSDDPackageImpl.DEPLOYMENT__GLOBAL_CONFIGURATION:
+                setGlobalConfiguration((GlobalConfiguration)newValue);
+                return;
+            case WSDDPackageImpl.DEPLOYMENT__HANDLERS:
+                getHandlers().clear();
+                getHandlers().addAll((Collection)newValue);
+                return;
+            case WSDDPackageImpl.DEPLOYMENT__TRANSPORTS:
+                getTransports().clear();
+                getTransports().addAll((Collection)newValue);
+                return;
             case WSDDPackageImpl.DEPLOYMENT__SERVICES:
                 getServices().clear();
                 getServices().addAll((Collection)newValue);
@@ -126,6 +281,18 @@ public class DeploymentImpl extends EObj
      */
     public void eUnset(int featureID) {
         switch (featureID) {
+            case WSDDPackageImpl.DEPLOYMENT__NAME:
+                setName(NAME_EDEFAULT);
+                return;
+            case WSDDPackageImpl.DEPLOYMENT__GLOBAL_CONFIGURATION:
+                setGlobalConfiguration((GlobalConfiguration)null);
+                return;
+            case WSDDPackageImpl.DEPLOYMENT__HANDLERS:
+                getHandlers().clear();
+                return;
+            case WSDDPackageImpl.DEPLOYMENT__TRANSPORTS:
+                getTransports().clear();
+                return;
             case WSDDPackageImpl.DEPLOYMENT__SERVICES:
                 getServices().clear();
                 return;
@@ -140,10 +307,33 @@ public class DeploymentImpl extends EObj
      */
     public boolean eIsSet(int featureID) {
         switch (featureID) {
+            case WSDDPackageImpl.DEPLOYMENT__NAME:
+                return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+            case WSDDPackageImpl.DEPLOYMENT__GLOBAL_CONFIGURATION:
+                return globalConfiguration != null;
+            case WSDDPackageImpl.DEPLOYMENT__HANDLERS:
+                return handlers != null && !handlers.isEmpty();
+            case WSDDPackageImpl.DEPLOYMENT__TRANSPORTS:
+                return transports != null && !transports.isEmpty();
             case WSDDPackageImpl.DEPLOYMENT__SERVICES:
                 return services != null && !services.isEmpty();
         }
         return super.eIsSet(featureID);
     }
 
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String toString() {
+        if (eIsProxy()) return super.toString();
+
+        StringBuffer result = new StringBuffer(super.toString());
+        result.append(" (name: ");
+        result.append(name);
+        result.append(')');
+        return result.toString();
+    }
+
 } //DeploymentImpl

Added: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/FlowImpl.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/FlowImpl.java?rev=1418018&view=auto
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/FlowImpl.java (added)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/FlowImpl.java Thu Dec  6 18:03:41 2012
@@ -0,0 +1,129 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.apache.axis.model.wsdd.impl;
+
+import java.util.Collection;
+import java.util.List;
+import org.apache.axis.model.wsdd.Flow;
+
+import org.apache.axis.model.wsdd.Handler;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.emf.ecore.util.BasicInternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Flow</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.apache.axis.model.wsdd.impl.FlowImpl#getHandlers <em>Handlers</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class FlowImpl extends EObjectImpl implements Flow {
+    /**
+     * The cached value of the '{@link #getHandlers() <em>Handlers</em>}' reference list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getHandlers()
+     * @generated
+     * @ordered
+     */
+    protected EList handlers;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected FlowImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected EClass eStaticClass() {
+        return WSDDPackageImpl.Literals.FLOW;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public List getHandlers() {
+        if (handlers == null) {
+            handlers = new BasicInternalEList(Handler.class);
+        }
+        return handlers;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+            case WSDDPackageImpl.FLOW__HANDLERS:
+                return getHandlers();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+            case WSDDPackageImpl.FLOW__HANDLERS:
+                getHandlers().clear();
+                getHandlers().addAll((Collection)newValue);
+                return;
+        }
+        super.eSet(featureID, newValue);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void eUnset(int featureID) {
+        switch (featureID) {
+            case WSDDPackageImpl.FLOW__HANDLERS:
+                getHandlers().clear();
+                return;
+        }
+        super.eUnset(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+            case WSDDPackageImpl.FLOW__HANDLERS:
+                return handlers != null && !handlers.isEmpty();
+        }
+        return super.eIsSet(featureID);
+    }
+
+} //FlowImpl

Propchange: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/FlowImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/GlobalConfigurationImpl.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/GlobalConfigurationImpl.java?rev=1418018&view=auto
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/GlobalConfigurationImpl.java (added)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/GlobalConfigurationImpl.java Thu Dec  6 18:03:41 2012
@@ -0,0 +1,41 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.apache.axis.model.wsdd.impl;
+
+import org.apache.axis.model.wsdd.GlobalConfiguration;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Global Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public class GlobalConfigurationImpl extends DeployableItemImpl implements GlobalConfiguration {
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected GlobalConfigurationImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected EClass eStaticClass() {
+        return WSDDPackageImpl.Literals.GLOBAL_CONFIGURATION;
+    }
+
+} //GlobalConfigurationImpl

Propchange: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/GlobalConfigurationImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/HandlerImpl.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/HandlerImpl.java?rev=1418018&view=auto
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/HandlerImpl.java (added)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/HandlerImpl.java Thu Dec  6 18:03:41 2012
@@ -0,0 +1,200 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.apache.axis.model.wsdd.impl;
+
+import org.apache.axis.model.wsdd.Handler;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Handler</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.apache.axis.model.wsdd.impl.HandlerImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.apache.axis.model.wsdd.impl.HandlerImpl#getType <em>Type</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class HandlerImpl extends ParameterizableImpl implements Handler {
+    /**
+     * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getName()
+     * @generated
+     * @ordered
+     */
+    protected static final String NAME_EDEFAULT = null;
+    /**
+     * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getName()
+     * @generated
+     * @ordered
+     */
+    protected String name = NAME_EDEFAULT;
+    /**
+     * The default value of the '{@link #getType() <em>Type</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getType()
+     * @generated
+     * @ordered
+     */
+    protected static final Object TYPE_EDEFAULT = null;
+    /**
+     * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getType()
+     * @generated
+     * @ordered
+     */
+    protected Object type = TYPE_EDEFAULT;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected HandlerImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected EClass eStaticClass() {
+        return WSDDPackageImpl.Literals.HANDLER;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setName(String newName) {
+        name = newName;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public Object getType() {
+        return type;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setType(Object newType) {
+        type = newType;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+            case WSDDPackageImpl.HANDLER__NAME:
+                return getName();
+            case WSDDPackageImpl.HANDLER__TYPE:
+                return getType();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+            case WSDDPackageImpl.HANDLER__NAME:
+                setName((String)newValue);
+                return;
+            case WSDDPackageImpl.HANDLER__TYPE:
+                setType(newValue);
+                return;
+        }
+        super.eSet(featureID, newValue);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void eUnset(int featureID) {
+        switch (featureID) {
+            case WSDDPackageImpl.HANDLER__NAME:
+                setName(NAME_EDEFAULT);
+                return;
+            case WSDDPackageImpl.HANDLER__TYPE:
+                setType(TYPE_EDEFAULT);
+                return;
+        }
+        super.eUnset(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+            case WSDDPackageImpl.HANDLER__NAME:
+                return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+            case WSDDPackageImpl.HANDLER__TYPE:
+                return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
+        }
+        return super.eIsSet(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String toString() {
+        if (eIsProxy()) return super.toString();
+
+        StringBuffer result = new StringBuffer(super.toString());
+        result.append(" (name: ");
+        result.append(name);
+        result.append(", type: ");
+        result.append(type);
+        result.append(')');
+        return result.toString();
+    }
+
+} //HandlerImpl

Propchange: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/HandlerImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ParameterizableImpl.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ParameterizableImpl.java?rev=1418018&view=auto
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ParameterizableImpl.java (added)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ParameterizableImpl.java Thu Dec  6 18:03:41 2012
@@ -0,0 +1,165 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.apache.axis.model.wsdd.impl;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.axis.model.wsdd.Parameter;
+import org.apache.axis.model.wsdd.Parameterizable;
+import org.apache.axis.model.wsdd.WSDDFactory;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+import org.eclipse.emf.ecore.util.BasicInternalEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Parameterizable</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.apache.axis.model.wsdd.impl.ParameterizableImpl#getParameters <em>Parameters</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ParameterizableImpl extends EObjectImpl implements Parameterizable {
+    /**
+     * The cached value of the '{@link #getParameters() <em>Parameters</em>}' containment reference list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getParameters()
+     * @generated
+     * @ordered
+     */
+    protected EList parameters;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected ParameterizableImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected EClass eStaticClass() {
+        return WSDDPackageImpl.Literals.PARAMETERIZABLE;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public List getParameters() {
+        if (parameters == null) {
+            parameters = new BasicInternalEList(Parameter.class);
+        }
+        return parameters;
+    }
+
+    public void setParameter(String name, String value) {
+        for (Iterator it = getParameters().iterator(); it.hasNext(); ) {
+            Parameter param = (Parameter)it.next();
+            if (name.equals(param.getName())) {
+                param.setValue(value);
+                return;
+            }
+        }
+        Parameter param = WSDDFactory.INSTANCE.createParameter();
+        param.setName(name);
+        param.setValue(value);
+        getParameters().add(param);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+        switch (featureID) {
+            case WSDDPackageImpl.PARAMETERIZABLE__PARAMETERS:
+                return ((InternalEList)getParameters()).basicRemove(otherEnd, msgs);
+        }
+        return super.eInverseRemove(otherEnd, featureID, msgs);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+            case WSDDPackageImpl.PARAMETERIZABLE__PARAMETERS:
+                return getParameters();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+            case WSDDPackageImpl.PARAMETERIZABLE__PARAMETERS:
+                getParameters().clear();
+                getParameters().addAll((Collection)newValue);
+                return;
+        }
+        super.eSet(featureID, newValue);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void eUnset(int featureID) {
+        switch (featureID) {
+            case WSDDPackageImpl.PARAMETERIZABLE__PARAMETERS:
+                getParameters().clear();
+                return;
+        }
+        super.eUnset(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+            case WSDDPackageImpl.PARAMETERIZABLE__PARAMETERS:
+                return parameters != null && !parameters.isEmpty();
+        }
+        return super.eIsSet(featureID);
+    }
+
+} //ParameterizableImpl

Propchange: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ParameterizableImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ServiceImpl.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ServiceImpl.java?rev=1418018&r1=1418017&r2=1418018&view=diff
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ServiceImpl.java (original)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ServiceImpl.java Thu Dec  6 18:03:41 2012
@@ -8,17 +8,14 @@ package org.apache.axis.model.wsdd.impl;
 
 import java.util.Collection;
 import java.util.List;
-import java.util.Iterator;
 
 import org.apache.axis.model.wsdd.ArrayMapping;
 import org.apache.axis.model.wsdd.BeanMapping;
 import org.apache.axis.model.wsdd.Operation;
-import org.apache.axis.model.wsdd.Parameter;
 import org.apache.axis.model.wsdd.Service;
 import org.apache.axis.model.wsdd.Style;
 import org.apache.axis.model.wsdd.TypeMapping;
 import org.apache.axis.model.wsdd.Use;
-import org.apache.axis.model.wsdd.WSDDFactory;
 
 import org.eclipse.emf.common.notify.NotificationChain;
 
@@ -37,10 +34,11 @@ import org.eclipse.emf.ecore.util.Intern
  * <p>
  * The following features are implemented:
  * <ul>
+ *   <li>{@link org.apache.axis.model.wsdd.impl.ServiceImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.apache.axis.model.wsdd.impl.ServiceImpl#getProvider <em>Provider</em>}</li>
  *   <li>{@link org.apache.axis.model.wsdd.impl.ServiceImpl#getUse <em>Use</em>}</li>
  *   <li>{@link org.apache.axis.model.wsdd.impl.ServiceImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.ServiceImpl#getParameters <em>Parameters</em>}</li>
+ *   <li>{@link org.apache.axis.model.wsdd.impl.ServiceImpl#getNamespaces <em>Namespaces</em>}</li>
  *   <li>{@link org.apache.axis.model.wsdd.impl.ServiceImpl#getOperations <em>Operations</em>}</li>
  *   <li>{@link org.apache.axis.model.wsdd.impl.ServiceImpl#getTypeMappings <em>Type Mappings</em>}</li>
  *   <li>{@link org.apache.axis.model.wsdd.impl.ServiceImpl#getBeanMappings <em>Bean Mappings</em>}</li>
@@ -52,6 +50,26 @@ import org.eclipse.emf.ecore.util.Intern
  */
 public class ServiceImpl extends DeployableItemImpl implements Service {
     /**
+     * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getName()
+     * @generated
+     * @ordered
+     */
+    protected static final String NAME_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getName()
+     * @generated
+     * @ordered
+     */
+    protected String name = NAME_EDEFAULT;
+
+    /**
      * The default value of the '{@link #getProvider() <em>Provider</em>}' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -112,14 +130,14 @@ public class ServiceImpl extends Deploya
     protected Style style = STYLE_EDEFAULT;
 
     /**
-     * The cached value of the '{@link #getParameters() <em>Parameters</em>}' containment reference list.
+     * The cached value of the '{@link #getNamespaces() <em>Namespaces</em>}' attribute list.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @see #getParameters()
+     * @see #getNamespaces()
      * @generated
      * @ordered
      */
-    protected EList parameters;
+    protected EList namespaces;
 
     /**
      * The cached value of the '{@link #getOperations() <em>Operations</em>}' containment reference list.
@@ -184,6 +202,24 @@ public class ServiceImpl extends Deploya
      * <!-- end-user-doc -->
      * @generated
      */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setName(String newName) {
+        name = newName;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
     public Object getProvider() {
         return provider;
     }
@@ -238,11 +274,11 @@ public class ServiceImpl extends Deploya
      * <!-- end-user-doc -->
      * @generated
      */
-    public List getParameters() {
-        if (parameters == null) {
-            parameters = new BasicInternalEList(Parameter.class);
+    public List getNamespaces() {
+        if (namespaces == null) {
+            namespaces = new BasicInternalEList(String.class);
         }
-        return parameters;
+        return namespaces;
     }
 
     /**
@@ -293,20 +329,6 @@ public class ServiceImpl extends Deploya
         return arrayMappings;
     }
 
-    public void setParameter(String name, String value) {
-        for (Iterator it = getParameters().iterator(); it.hasNext(); ) {
-            Parameter param = (Parameter)it.next();
-            if (name.equals(param.getName())) {
-                param.setValue(value);
-                return;
-            }
-        }
-        Parameter param = WSDDFactory.INSTANCE.createParameter();
-        param.setName(name);
-        param.setValue(value);
-        getParameters().add(param);
-    }
-
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -314,8 +336,6 @@ public class ServiceImpl extends Deploya
      */
     public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
         switch (featureID) {
-            case WSDDPackageImpl.SERVICE__PARAMETERS:
-                return ((InternalEList)getParameters()).basicRemove(otherEnd, msgs);
             case WSDDPackageImpl.SERVICE__OPERATIONS:
                 return ((InternalEList)getOperations()).basicRemove(otherEnd, msgs);
             case WSDDPackageImpl.SERVICE__TYPE_MAPPINGS:
@@ -335,14 +355,16 @@ public class ServiceImpl extends Deploya
      */
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
+            case WSDDPackageImpl.SERVICE__NAME:
+                return getName();
             case WSDDPackageImpl.SERVICE__PROVIDER:
                 return getProvider();
             case WSDDPackageImpl.SERVICE__USE:
                 return getUse();
             case WSDDPackageImpl.SERVICE__STYLE:
                 return getStyle();
-            case WSDDPackageImpl.SERVICE__PARAMETERS:
-                return getParameters();
+            case WSDDPackageImpl.SERVICE__NAMESPACES:
+                return getNamespaces();
             case WSDDPackageImpl.SERVICE__OPERATIONS:
                 return getOperations();
             case WSDDPackageImpl.SERVICE__TYPE_MAPPINGS:
@@ -362,6 +384,9 @@ public class ServiceImpl extends Deploya
      */
     public void eSet(int featureID, Object newValue) {
         switch (featureID) {
+            case WSDDPackageImpl.SERVICE__NAME:
+                setName((String)newValue);
+                return;
             case WSDDPackageImpl.SERVICE__PROVIDER:
                 setProvider(newValue);
                 return;
@@ -371,9 +396,9 @@ public class ServiceImpl extends Deploya
             case WSDDPackageImpl.SERVICE__STYLE:
                 setStyle((Style)newValue);
                 return;
-            case WSDDPackageImpl.SERVICE__PARAMETERS:
-                getParameters().clear();
-                getParameters().addAll((Collection)newValue);
+            case WSDDPackageImpl.SERVICE__NAMESPACES:
+                getNamespaces().clear();
+                getNamespaces().addAll((Collection)newValue);
                 return;
             case WSDDPackageImpl.SERVICE__OPERATIONS:
                 getOperations().clear();
@@ -402,6 +427,9 @@ public class ServiceImpl extends Deploya
      */
     public void eUnset(int featureID) {
         switch (featureID) {
+            case WSDDPackageImpl.SERVICE__NAME:
+                setName(NAME_EDEFAULT);
+                return;
             case WSDDPackageImpl.SERVICE__PROVIDER:
                 setProvider(PROVIDER_EDEFAULT);
                 return;
@@ -411,8 +439,8 @@ public class ServiceImpl extends Deploya
             case WSDDPackageImpl.SERVICE__STYLE:
                 setStyle(STYLE_EDEFAULT);
                 return;
-            case WSDDPackageImpl.SERVICE__PARAMETERS:
-                getParameters().clear();
+            case WSDDPackageImpl.SERVICE__NAMESPACES:
+                getNamespaces().clear();
                 return;
             case WSDDPackageImpl.SERVICE__OPERATIONS:
                 getOperations().clear();
@@ -437,14 +465,16 @@ public class ServiceImpl extends Deploya
      */
     public boolean eIsSet(int featureID) {
         switch (featureID) {
+            case WSDDPackageImpl.SERVICE__NAME:
+                return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
             case WSDDPackageImpl.SERVICE__PROVIDER:
                 return PROVIDER_EDEFAULT == null ? provider != null : !PROVIDER_EDEFAULT.equals(provider);
             case WSDDPackageImpl.SERVICE__USE:
                 return use != USE_EDEFAULT;
             case WSDDPackageImpl.SERVICE__STYLE:
                 return style != STYLE_EDEFAULT;
-            case WSDDPackageImpl.SERVICE__PARAMETERS:
-                return parameters != null && !parameters.isEmpty();
+            case WSDDPackageImpl.SERVICE__NAMESPACES:
+                return namespaces != null && !namespaces.isEmpty();
             case WSDDPackageImpl.SERVICE__OPERATIONS:
                 return operations != null && !operations.isEmpty();
             case WSDDPackageImpl.SERVICE__TYPE_MAPPINGS:
@@ -466,12 +496,16 @@ public class ServiceImpl extends Deploya
         if (eIsProxy()) return super.toString();
 
         StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (provider: ");
+        result.append(" (name: ");
+        result.append(name);
+        result.append(", provider: ");
         result.append(provider);
         result.append(", use: ");
         result.append(use);
         result.append(", style: ");
         result.append(style);
+        result.append(", namespaces: ");
+        result.append(namespaces);
         result.append(')');
         return result.toString();
     }

Added: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/TransportImpl.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/TransportImpl.java?rev=1418018&view=auto
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/TransportImpl.java (added)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/TransportImpl.java Thu Dec  6 18:03:41 2012
@@ -0,0 +1,203 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.apache.axis.model.wsdd.impl;
+
+import org.apache.axis.model.wsdd.Transport;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Transport</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.apache.axis.model.wsdd.impl.TransportImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.apache.axis.model.wsdd.impl.TransportImpl#getPivot <em>Pivot</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class TransportImpl extends DeployableItemImpl implements Transport {
+    /**
+     * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getName()
+     * @generated
+     * @ordered
+     */
+    protected static final String NAME_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getName()
+     * @generated
+     * @ordered
+     */
+    protected String name = NAME_EDEFAULT;
+
+    /**
+     * The default value of the '{@link #getPivot() <em>Pivot</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getPivot()
+     * @generated
+     * @ordered
+     */
+    protected static final Object PIVOT_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getPivot() <em>Pivot</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getPivot()
+     * @generated
+     * @ordered
+     */
+    protected Object pivot = PIVOT_EDEFAULT;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected TransportImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected EClass eStaticClass() {
+        return WSDDPackageImpl.Literals.TRANSPORT;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setName(String newName) {
+        name = newName;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public Object getPivot() {
+        return pivot;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setPivot(Object newPivot) {
+        pivot = newPivot;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+            case WSDDPackageImpl.TRANSPORT__NAME:
+                return getName();
+            case WSDDPackageImpl.TRANSPORT__PIVOT:
+                return getPivot();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+            case WSDDPackageImpl.TRANSPORT__NAME:
+                setName((String)newValue);
+                return;
+            case WSDDPackageImpl.TRANSPORT__PIVOT:
+                setPivot(newValue);
+                return;
+        }
+        super.eSet(featureID, newValue);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void eUnset(int featureID) {
+        switch (featureID) {
+            case WSDDPackageImpl.TRANSPORT__NAME:
+                setName(NAME_EDEFAULT);
+                return;
+            case WSDDPackageImpl.TRANSPORT__PIVOT:
+                setPivot(PIVOT_EDEFAULT);
+                return;
+        }
+        super.eUnset(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+            case WSDDPackageImpl.TRANSPORT__NAME:
+                return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+            case WSDDPackageImpl.TRANSPORT__PIVOT:
+                return PIVOT_EDEFAULT == null ? pivot != null : !PIVOT_EDEFAULT.equals(pivot);
+        }
+        return super.eIsSet(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String toString() {
+        if (eIsProxy()) return super.toString();
+
+        StringBuffer result = new StringBuffer(super.toString());
+        result.append(" (name: ");
+        result.append(name);
+        result.append(", pivot: ");
+        result.append(pivot);
+        result.append(')');
+        return result.toString();
+    }
+
+} //TransportImpl

Propchange: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/TransportImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDFactoryImpl.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDFactoryImpl.java?rev=1418018&r1=1418017&r2=1418018&view=diff
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDFactoryImpl.java (original)
+++ axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDFactoryImpl.java Thu Dec  6 18:03:41 2012
@@ -75,6 +75,11 @@ public class WSDDFactoryImpl extends EFa
             case WSDDPackageImpl.OPERATION_PARAMETER: return (EObject)createOperationParameter();
             case WSDDPackageImpl.FAULT: return (EObject)createFault();
             case WSDDPackageImpl.OPERATION: return (EObject)createOperation();
+            case WSDDPackageImpl.PARAMETERIZABLE: return (EObject)createParameterizable();
+            case WSDDPackageImpl.HANDLER: return (EObject)createHandler();
+            case WSDDPackageImpl.FLOW: return (EObject)createFlow();
+            case WSDDPackageImpl.GLOBAL_CONFIGURATION: return (EObject)createGlobalConfiguration();
+            case WSDDPackageImpl.TRANSPORT: return (EObject)createTransport();
             case WSDDPackageImpl.SERVICE: return (EObject)createService();
             case WSDDPackageImpl.DEPLOYMENT: return (EObject)createDeployment();
             default:
@@ -133,6 +138,16 @@ public class WSDDFactoryImpl extends EFa
      * <!-- end-user-doc -->
      * @generated
      */
+    public Flow createFlow() {
+        FlowImpl flow = new FlowImpl();
+        return flow;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
     public TypeMapping createTypeMapping() {
         TypeMappingImpl typeMapping = new TypeMappingImpl();
         return typeMapping;
@@ -193,6 +208,46 @@ public class WSDDFactoryImpl extends EFa
      * <!-- end-user-doc -->
      * @generated
      */
+    public Parameterizable createParameterizable() {
+        ParameterizableImpl parameterizable = new ParameterizableImpl();
+        return parameterizable;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public Handler createHandler() {
+        HandlerImpl handler = new HandlerImpl();
+        return handler;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public GlobalConfiguration createGlobalConfiguration() {
+        GlobalConfigurationImpl globalConfiguration = new GlobalConfigurationImpl();
+        return globalConfiguration;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public Transport createTransport() {
+        TransportImpl transport = new TransportImpl();
+        return transport;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
     public Service createService() {
         ServiceImpl service = new ServiceImpl();
         return service;