Author: veithen
Date: Thu Dec 6 21:54:43 2012
New Revision: 1418102
URL: http://svn.apache.org/viewvc?rev=1418102&view=rev
Log:
Reuse the Use and Style classes from the core.
Added:
axis/axis1/java/branches/EMF/axis-model/model/soap.ecore
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/soap/
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/soap/SOAPFactory.java
(with props)
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/soap/impl/
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/soap/impl/SOAPFactoryImpl.java
(with props)
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/soap/impl/SOAPPackageImpl.java
(with props)
Removed:
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Style.java
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Use.java
Modified:
axis/axis1/java/branches/EMF/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDeployWriter.java
axis/axis1/java/branches/EMF/axis-model/model/axis.genmodel
axis/axis1/java/branches/EMF/axis-model/model/wsdd.ecore
axis/axis1/java/branches/EMF/axis-model/pom.xml
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/impl/DeployableItemImpl.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
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/xml/impl/XmlPackageImpl.java
Modified:
axis/axis1/java/branches/EMF/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDeployWriter.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDeployWriter.java?rev=1418102&r1=1418101&r2=1418102&view=diff
==============================================================================
---
axis/axis1/java/branches/EMF/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDeployWriter.java
(original)
+++
axis/axis1/java/branches/EMF/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDeployWriter.java
Thu Dec 6 21:54:43 2012
@@ -340,8 +340,8 @@ public class JavaDeployWriter extends Ja
org.apache.axis.model.wsdd.Service wsddService =
WSDDFactory.INSTANCE.createService();
wsddService.setName(serviceName);
wsddService.setProvider(new QName(WSDDConstants.URI_WSDD_JAVA, "RPC"));
-
wsddService.setStyle(org.apache.axis.model.wsdd.Style.get(style.getValue()));
- wsddService.setUse(org.apache.axis.model.wsdd.Use.get(use.getValue()));
+ wsddService.setStyle(style);
+ wsddService.setUse(use);
wsddService.setParameter("wsdlTargetNamespace",
service.getQName().getNamespaceURI());
wsddService.setParameter("wsdlServiceElement",
service.getQName().getLocalPart());
// MIME attachments don't work with multiref, so turn it off.
Modified: axis/axis1/java/branches/EMF/axis-model/model/axis.genmodel
URL:
http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/model/axis.genmodel?rev=1418102&r1=1418101&r2=1418102&view=diff
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/model/axis.genmodel (original)
+++ axis/axis1/java/branches/EMF/axis-model/model/axis.genmodel Thu Dec 6
21:54:43 2012
@@ -12,16 +12,6 @@
<foreignModel>wsdd.ecore</foreignModel>
<genPackages prefix="WSDD" basePackage="org.apache.axis.model"
disposableProviderFactory="true"
adapterFactory="false" contentTypeIdentifier=""
ecorePackage="wsdd.ecore#/">
- <genEnums typeSafeEnumCompatible="false" ecoreEnum="wsdd.ecore#//Use">
- <genEnumLiterals ecoreEnumLiteral="wsdd.ecore#//Use/ENCODED"/>
- <genEnumLiterals ecoreEnumLiteral="wsdd.ecore#//Use/LITERAL"/>
- </genEnums>
- <genEnums typeSafeEnumCompatible="false" ecoreEnum="wsdd.ecore#//Style">
- <genEnumLiterals ecoreEnumLiteral="wsdd.ecore#//Style/RPC"/>
- <genEnumLiterals ecoreEnumLiteral="wsdd.ecore#//Style/DOCUMENT"/>
- <genEnumLiterals ecoreEnumLiteral="wsdd.ecore#//Style/WRAPPED"/>
- <genEnumLiterals ecoreEnumLiteral="wsdd.ecore#//Style/MESSAGE"/>
- </genEnums>
<genEnums typeSafeEnumCompatible="false"
ecoreEnum="wsdd.ecore#//ParameterMode">
<genEnumLiterals ecoreEnumLiteral="wsdd.ecore#//ParameterMode/IN"/>
<genEnumLiterals ecoreEnumLiteral="wsdd.ecore#//ParameterMode/OUT"/>
@@ -120,4 +110,8 @@
<genPackages prefix="Xml" basePackage="org.apache.axis.model"
ecorePackage="xml.ecore#/">
<genDataTypes ecoreDataType="xml.ecore#//QName"/>
</genPackages>
+ <genPackages prefix="SOAP" basePackage="org.apache.axis.model"
ecorePackage="soap.ecore#/">
+ <genDataTypes ecoreDataType="soap.ecore#//Use"/>
+ <genDataTypes ecoreDataType="soap.ecore#//Style"/>
+ </genPackages>
</genmodel:GenModel>
Added: axis/axis1/java/branches/EMF/axis-model/model/soap.ecore
URL:
http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/model/soap.ecore?rev=1418102&view=auto
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/model/soap.ecore (added)
+++ axis/axis1/java/branches/EMF/axis-model/model/soap.ecore Thu Dec 6
21:54:43 2012
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"; name="soap"
+ nsURI="http://axis.apache.org/emf/soap"; nsPrefix="soap">
+ <eClassifiers xsi:type="ecore:EDataType" name="Use"
instanceClassName="org.apache.axis.constants.Use"/>
+ <eClassifiers xsi:type="ecore:EDataType" name="Style"
instanceClassName="org.apache.axis.constants.Style"/>
+</ecore:EPackage>
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=1418102&r1=1418101&r2=1418102&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
21:54:43 2012
@@ -3,16 +3,6 @@
xmlns:xmi="http://www.omg.org/XMI";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"; name="wsdd"
nsURI="http://xml.apache.org/axis/wsdd/"; nsPrefix="wsdd">
- <eClassifiers xsi:type="ecore:EEnum" name="Use">
- <eLiterals name="ENCODED" literal="encoded"/>
- <eLiterals name="LITERAL" value="1" literal="literal"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EEnum" name="Style">
- <eLiterals name="RPC" literal="rpc"/>
- <eLiterals name="DOCUMENT" value="1" literal="document"/>
- <eLiterals name="WRAPPED" value="2" literal="wrapped"/>
- <eLiterals name="MESSAGE" value="3" literal="message"/>
- </eClassifiers>
<eClassifiers xsi:type="ecore:EEnum" name="ParameterMode">
<eLiterals name="IN" value="1" literal="IN"/>
<eLiterals name="OUT" value="2" literal="OUT"/>
@@ -119,8 +109,8 @@
<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 xml.ecore#//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="use"
eType="ecore:EDataType soap.ecore#//Use"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="style"
eType="ecore:EDataType soap.ecore#//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";>
Modified: axis/axis1/java/branches/EMF/axis-model/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/pom.xml?rev=1418102&r1=1418101&r2=1418102&view=diff
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/pom.xml (original)
+++ axis/axis1/java/branches/EMF/axis-model/pom.xml Thu Dec 6 21:54:43 2012
@@ -29,9 +29,8 @@
<name>EMF Model for WSDD Files</name>
<dependencies>
<dependency>
- <!-- This is just to get javax.xml.namespace.QName -->
<groupId>${project.groupId}</groupId>
- <artifactId>axis-jaxrpc</artifactId>
+ <artifactId>axis-rt-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Added:
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/soap/SOAPFactory.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/soap/SOAPFactory.java?rev=1418102&view=auto
==============================================================================
---
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/soap/SOAPFactory.java
(added)
+++
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/soap/SOAPFactory.java
Thu Dec 6 21:54:43 2012
@@ -0,0 +1,26 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.apache.axis.model.soap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public interface SOAPFactory {
+ /**
+ * The singleton instance of the factory.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ SOAPFactory INSTANCE =
org.apache.axis.model.soap.impl.SOAPFactoryImpl.eINSTANCE;
+
+} //SOAPFactory
Propchange:
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/soap/SOAPFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/soap/impl/SOAPFactoryImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/soap/impl/SOAPFactoryImpl.java?rev=1418102&view=auto
==============================================================================
---
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/soap/impl/SOAPFactoryImpl.java
(added)
+++
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/soap/impl/SOAPFactoryImpl.java
Thu Dec 6 21:54:43 2012
@@ -0,0 +1,146 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.apache.axis.model.soap.impl;
+
+import org.apache.axis.constants.Style;
+import org.apache.axis.constants.Use;
+
+import org.apache.axis.model.soap.*;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class SOAPFactoryImpl extends EFactoryImpl implements SOAPFactory {
+ /**
+ * The singleton instance of the factory.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final SOAPFactoryImpl eINSTANCE = init();
+
+ /**
+ * Creates the default factory implementation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static SOAPFactoryImpl init() {
+ try {
+ SOAPFactoryImpl theSOAPFactory =
(SOAPFactoryImpl)EPackage.Registry.INSTANCE.getEFactory("http://axis.apache.org/emf/soap";);
+ if (theSOAPFactory != null) {
+ return theSOAPFactory;
+ }
+ }
+ catch (Exception exception) {
+ EcorePlugin.INSTANCE.log(exception);
+ }
+ return new SOAPFactoryImpl();
+ }
+
+ /**
+ * Creates an instance of the factory.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public SOAPFactoryImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EObject create(EClass eClass) {
+ switch (eClass.getClassifierID()) {
+ default:
+ throw new IllegalArgumentException("The class '" +
eClass.getName() + "' is not a valid classifier");
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public Object createFromString(EDataType eDataType, String initialValue) {
+ switch (eDataType.getClassifierID()) {
+ case SOAPPackageImpl.USE:
+ return createUseFromString(eDataType, initialValue);
+ case SOAPPackageImpl.STYLE:
+ return createStyleFromString(eDataType, initialValue);
+ default:
+ throw new IllegalArgumentException("The datatype '" +
eDataType.getName() + "' is not a valid classifier");
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String convertToString(EDataType eDataType, Object instanceValue) {
+ switch (eDataType.getClassifierID()) {
+ case SOAPPackageImpl.USE:
+ return convertUseToString(eDataType, instanceValue);
+ case SOAPPackageImpl.STYLE:
+ return convertStyleToString(eDataType, instanceValue);
+ default:
+ throw new IllegalArgumentException("The datatype '" +
eDataType.getName() + "' is not a valid classifier");
+ }
+ }
+
+ public Use createUseFromString(EDataType eDataType, String initialValue) {
+ return Use.getUse(initialValue);
+ }
+
+ public String convertUseToString(EDataType eDataType, Object
instanceValue) {
+ return ((Use)instanceValue).getName();
+ }
+
+ public Style createStyleFromString(EDataType eDataType, String
initialValue) {
+ return Style.getStyle(initialValue);
+ }
+
+ public String convertStyleToString(EDataType eDataType, Object
instanceValue) {
+ return ((Style)instanceValue).getName();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public SOAPPackageImpl getSOAPPackage() {
+ return (SOAPPackageImpl)getEPackage();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @deprecated
+ * @generated
+ */
+ public static SOAPPackageImpl getPackage() {
+ return SOAPPackageImpl.eINSTANCE;
+ }
+
+} //SOAPFactoryImpl
Propchange:
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/soap/impl/SOAPFactoryImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/soap/impl/SOAPPackageImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/soap/impl/SOAPPackageImpl.java?rev=1418102&view=auto
==============================================================================
---
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/soap/impl/SOAPPackageImpl.java
(added)
+++
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/soap/impl/SOAPPackageImpl.java
Thu Dec 6 21:54:43 2012
@@ -0,0 +1,302 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.apache.axis.model.soap.impl;
+
+import org.apache.axis.constants.Style;
+import org.apache.axis.constants.Use;
+
+import org.apache.axis.model.soap.SOAPFactory;
+
+import org.apache.axis.model.wsdd.impl.WSDDPackageImpl;
+
+import org.apache.axis.model.xml.impl.XmlPackageImpl;
+
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EFactory;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.apache.axis.model.soap.SOAPFactory
+ * @model kind="package"
+ * @generated
+ */
+public class SOAPPackageImpl extends EPackageImpl {
+ /**
+ * The package name.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final String eNAME = "soap";
+
+ /**
+ * The package namespace URI.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final String eNS_URI = "http://axis.apache.org/emf/soap";;
+
+ /**
+ * The package namespace name.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final String eNS_PREFIX = "soap";
+
+ /**
+ * The singleton instance of the package.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final SOAPPackageImpl eINSTANCE =
org.apache.axis.model.soap.impl.SOAPPackageImpl.init();
+
+ /**
+ * The meta object id for the '<em>Use</em>' data type.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.apache.axis.constants.Use
+ * @see org.apache.axis.model.soap.impl.SOAPPackageImpl#getUse()
+ * @generated
+ */
+ public static final int USE = 0;
+
+ /**
+ * The meta object id for the '<em>Style</em>' data type.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.apache.axis.constants.Style
+ * @see org.apache.axis.model.soap.impl.SOAPPackageImpl#getStyle()
+ * @generated
+ */
+ public static final int STYLE = 1;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EDataType useEDataType = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EDataType styleEDataType = null;
+
+ /**
+ * Creates an instance of the model <b>Package</b>, registered with
+ * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by
the package
+ * package URI value.
+ * <p>Note: the correct way to create the package is via the static
+ * factory method {@link #init init()}, which also performs
+ * initialization of the package, or returns the registered package,
+ * if one already exists.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.ecore.EPackage.Registry
+ * @see org.apache.axis.model.soap.impl.SOAPPackageImpl#eNS_URI
+ * @see #init()
+ * @generated
+ */
+ private SOAPPackageImpl() {
+ super(eNS_URI, ((EFactory)SOAPFactory.INSTANCE));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private static boolean isInited = false;
+
+ /**
+ * Creates, registers, and initializes the <b>Package</b> for this model,
and for any others upon which it depends.
+ *
+ * <p>This method is used to initialize {@link SOAPPackageImpl#eINSTANCE}
when that field is accessed.
+ * Clients should not invoke it directly. Instead, they should simply
access that field to obtain the package.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #eNS_URI
+ * @see #createPackageContents()
+ * @see #initializePackageContents()
+ * @generated
+ */
+ public static SOAPPackageImpl init() {
+ if (isInited) return
(SOAPPackageImpl)EPackage.Registry.INSTANCE.getEPackage(SOAPPackageImpl.eNS_URI);
+
+ // Obtain or create and register package
+ SOAPPackageImpl theSOAPPackage =
(SOAPPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof
SOAPPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new
SOAPPackageImpl());
+
+ isInited = true;
+
+ // Obtain or create and register interdependencies
+ WSDDPackageImpl theWSDDPackage =
(WSDDPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WSDDPackageImpl.eNS_URI)
instanceof WSDDPackageImpl ?
EPackage.Registry.INSTANCE.getEPackage(WSDDPackageImpl.eNS_URI) :
WSDDPackageImpl.eINSTANCE);
+ XmlPackageImpl theXmlPackage =
(XmlPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(XmlPackageImpl.eNS_URI)
instanceof XmlPackageImpl ?
EPackage.Registry.INSTANCE.getEPackage(XmlPackageImpl.eNS_URI) :
XmlPackageImpl.eINSTANCE);
+
+ // Create package meta-data objects
+ theSOAPPackage.createPackageContents();
+ theWSDDPackage.createPackageContents();
+ theXmlPackage.createPackageContents();
+
+ // Initialize created meta-data
+ theSOAPPackage.initializePackageContents();
+ theWSDDPackage.initializePackageContents();
+ theXmlPackage.initializePackageContents();
+
+ // Mark meta-data to indicate it can't be changed
+ theSOAPPackage.freeze();
+
+
+ // Update the registry and return the package
+ EPackage.Registry.INSTANCE.put(SOAPPackageImpl.eNS_URI,
theSOAPPackage);
+ return theSOAPPackage;
+ }
+
+
+ /**
+ * Returns the meta object for data type '{@link
org.apache.axis.constants.Use <em>Use</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for data type '<em>Use</em>'.
+ * @see org.apache.axis.constants.Use
+ * @model instanceClass="org.apache.axis.constants.Use"
+ * @generated
+ */
+ public EDataType getUse() {
+ return useEDataType;
+ }
+
+ /**
+ * Returns the meta object for data type '{@link
org.apache.axis.constants.Style <em>Style</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for data type '<em>Style</em>'.
+ * @see org.apache.axis.constants.Style
+ * @model instanceClass="org.apache.axis.constants.Style"
+ * @generated
+ */
+ public EDataType getStyle() {
+ return styleEDataType;
+ }
+
+ /**
+ * Returns the factory that creates the instances of the model.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the factory that creates the instances of the model.
+ * @generated
+ */
+ public SOAPFactory getSOAPFactory() {
+ return (SOAPFactory)getEFactoryInstance();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private boolean isCreated = false;
+
+ /**
+ * Creates the meta-model objects for the package. This method is
+ * guarded to have no affect on any invocation but its first.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void createPackageContents() {
+ if (isCreated) return;
+ isCreated = true;
+
+ // Create data types
+ useEDataType = createEDataType(USE);
+ styleEDataType = createEDataType(STYLE);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private boolean isInitialized = false;
+
+ /**
+ * Complete the initialization of the package and its meta-model. This
+ * method is guarded to have no affect on any invocation but its first.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void initializePackageContents() {
+ if (isInitialized) return;
+ isInitialized = true;
+
+ // Initialize package
+ setName(eNAME);
+ setNsPrefix(eNS_PREFIX);
+ setNsURI(eNS_URI);
+
+ // Initialize data types
+ initEDataType(useEDataType, Use.class, "Use", IS_SERIALIZABLE,
!IS_GENERATED_INSTANCE_CLASS);
+ initEDataType(styleEDataType, Style.class, "Style", IS_SERIALIZABLE,
!IS_GENERATED_INSTANCE_CLASS);
+
+ // Create resource
+ createResource(eNS_URI);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * Defines literals for the meta objects that represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public interface Literals {
+ /**
+ * The meta object literal for the '<em>Use</em>' data type.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.apache.axis.constants.Use
+ * @see org.apache.axis.model.soap.impl.SOAPPackageImpl#getUse()
+ * @generated
+ */
+ public static final EDataType USE = eINSTANCE.getUse();
+
+ /**
+ * The meta object literal for the '<em>Style</em>' data type.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.apache.axis.constants.Style
+ * @see org.apache.axis.model.soap.impl.SOAPPackageImpl#getStyle()
+ * @generated
+ */
+ public static final EDataType STYLE = eINSTANCE.getStyle();
+
+ }
+
+} //SOAPPackageImpl
Propchange:
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/soap/impl/SOAPPackageImpl.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=1418102&r1=1418101&r2=1418102&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 21:54:43 2012
@@ -8,6 +8,8 @@ package org.apache.axis.model.wsdd;
import java.util.List;
import javax.xml.namespace.QName;
+import org.apache.axis.constants.Style;
+import org.apache.axis.constants.Use;
/**
* <!-- begin-user-doc -->
@@ -85,7 +87,6 @@ public interface Service extends Deploya
/**
* Returns the value of the '<em><b>Use</b></em>' attribute.
- * The literals are from the enumeration {@link
org.apache.axis.model.wsdd.Use}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Use</em>' attribute isn't clear,
@@ -93,9 +94,8 @@ public interface Service extends Deploya
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Use</em>' attribute.
- * @see org.apache.axis.model.wsdd.Use
* @see #setUse(Use)
- * @model
+ * @model dataType="org.apache.axis.model.soap.Use"
* @generated
*/
Use getUse();
@@ -105,7 +105,6 @@ public interface Service extends Deploya
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Use</em>' attribute.
- * @see org.apache.axis.model.wsdd.Use
* @see #getUse()
* @generated
*/
@@ -113,7 +112,6 @@ public interface Service extends Deploya
/**
* Returns the value of the '<em><b>Style</b></em>' attribute.
- * The literals are from the enumeration {@link
org.apache.axis.model.wsdd.Style}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Style</em>' attribute isn't clear,
@@ -121,9 +119,8 @@ public interface Service extends Deploya
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Style</em>' attribute.
- * @see org.apache.axis.model.wsdd.Style
* @see #setStyle(Style)
- * @model
+ * @model dataType="org.apache.axis.model.soap.Style"
* @generated
*/
Style getStyle();
@@ -133,7 +130,6 @@ public interface Service extends Deploya
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Style</em>' attribute.
- * @see org.apache.axis.model.wsdd.Style
* @see #getStyle()
* @generated
*/
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=1418102&r1=1418101&r2=1418102&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 21:54:43 2012
@@ -12,7 +12,6 @@ import org.apache.axis.model.wsdd.Flow;
import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.InternalEObject;
/**
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=1418102&r1=1418101&r2=1418102&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 21:54:43 2012
@@ -10,13 +10,13 @@ import java.util.Collection;
import java.util.List;
import javax.xml.namespace.QName;
+import org.apache.axis.constants.Style;
+import org.apache.axis.constants.Use;
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.Service;
-import org.apache.axis.model.wsdd.Style;
import org.apache.axis.model.wsdd.TypeMapping;
-import org.apache.axis.model.wsdd.Use;
import org.eclipse.emf.common.notify.NotificationChain;
@@ -98,7 +98,7 @@ public class ServiceImpl extends Deploya
* @generated
* @ordered
*/
- protected static final Use USE_EDEFAULT = Use.ENCODED_LITERAL;
+ protected static final Use USE_EDEFAULT = null;
/**
* The cached value of the '{@link #getUse() <em>Use</em>}' attribute.
@@ -118,7 +118,7 @@ public class ServiceImpl extends Deploya
* @generated
* @ordered
*/
- protected static final Style STYLE_EDEFAULT = Style.RPC_LITERAL;
+ protected static final Style STYLE_EDEFAULT = null;
/**
* The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
@@ -249,7 +249,7 @@ public class ServiceImpl extends Deploya
* @generated
*/
public void setUse(Use newUse) {
- use = newUse == null ? USE_EDEFAULT : newUse;
+ use = newUse;
}
/**
@@ -267,7 +267,7 @@ public class ServiceImpl extends Deploya
* @generated
*/
public void setStyle(Style newStyle) {
- style = newStyle == null ? STYLE_EDEFAULT : newStyle;
+ style = newStyle;
}
/**
@@ -471,9 +471,9 @@ public class ServiceImpl extends Deploya
case WSDDPackageImpl.SERVICE__PROVIDER:
return PROVIDER_EDEFAULT == null ? provider != null :
!PROVIDER_EDEFAULT.equals(provider);
case WSDDPackageImpl.SERVICE__USE:
- return use != USE_EDEFAULT;
+ return USE_EDEFAULT == null ? use != null :
!USE_EDEFAULT.equals(use);
case WSDDPackageImpl.SERVICE__STYLE:
- return style != STYLE_EDEFAULT;
+ return STYLE_EDEFAULT == null ? style != null :
!STYLE_EDEFAULT.equals(style);
case WSDDPackageImpl.SERVICE__NAMESPACES:
return namespaces != null && !namespaces.isEmpty();
case WSDDPackageImpl.SERVICE__OPERATIONS:
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=1418102&r1=1418101&r2=1418102&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 21:54:43 2012
@@ -94,10 +94,6 @@ public class WSDDFactoryImpl extends EFa
*/
public Object createFromString(EDataType eDataType, String initialValue) {
switch (eDataType.getClassifierID()) {
- case WSDDPackageImpl.USE:
- return createUseFromString(eDataType, initialValue);
- case WSDDPackageImpl.STYLE:
- return createStyleFromString(eDataType, initialValue);
case WSDDPackageImpl.PARAMETER_MODE:
return createParameterModeFromString(eDataType, initialValue);
default:
@@ -112,10 +108,6 @@ public class WSDDFactoryImpl extends EFa
*/
public String convertToString(EDataType eDataType, Object instanceValue) {
switch (eDataType.getClassifierID()) {
- case WSDDPackageImpl.USE:
- return convertUseToString(eDataType, instanceValue);
- case WSDDPackageImpl.STYLE:
- return convertStyleToString(eDataType, instanceValue);
case WSDDPackageImpl.PARAMETER_MODE:
return convertParameterModeToString(eDataType, instanceValue);
default:
@@ -268,46 +260,6 @@ public class WSDDFactoryImpl extends EFa
* <!-- end-user-doc -->
* @generated
*/
- public Use createUseFromString(EDataType eDataType, String initialValue) {
- Use result = Use.get(initialValue);
- if (result == null) throw new IllegalArgumentException("The value '" +
initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
- return result;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertUseToString(EDataType eDataType, Object
instanceValue) {
- return instanceValue == null ? null : instanceValue.toString();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Style createStyleFromString(EDataType eDataType, String
initialValue) {
- Style result = Style.get(initialValue);
- if (result == null) throw new IllegalArgumentException("The value '" +
initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
- return result;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertStyleToString(EDataType eDataType, Object
instanceValue) {
- return instanceValue == null ? null : instanceValue.toString();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
public ParameterMode createParameterModeFromString(EDataType eDataType,
String initialValue) {
ParameterMode result = ParameterMode.get(initialValue);
if (result == null) throw new IllegalArgumentException("The value '" +
initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
Modified:
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDPackageImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDPackageImpl.java?rev=1418102&r1=1418101&r2=1418102&view=diff
==============================================================================
---
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDPackageImpl.java
(original)
+++
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDPackageImpl.java
Thu Dec 6 21:54:43 2012
@@ -6,6 +6,7 @@
*/
package org.apache.axis.model.wsdd.impl;
+import org.apache.axis.model.soap.impl.SOAPPackageImpl;
import org.apache.axis.model.wsdd.ArrayMapping;
import org.apache.axis.model.wsdd.BeanMapping;
import org.apache.axis.model.wsdd.DeployableItem;
@@ -21,10 +22,8 @@ import org.apache.axis.model.wsdd.Parame
import org.apache.axis.model.wsdd.ParameterMode;
import org.apache.axis.model.wsdd.Parameterizable;
import org.apache.axis.model.wsdd.Service;
-import org.apache.axis.model.wsdd.Style;
import org.apache.axis.model.wsdd.Transport;
import org.apache.axis.model.wsdd.TypeMapping;
-import org.apache.axis.model.wsdd.Use;
import org.apache.axis.model.wsdd.WSDDFactory;
import org.apache.axis.model.xml.impl.XmlPackageImpl;
@@ -38,8 +37,6 @@ import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-
/**
* <!-- begin-user-doc -->
* An implementation of the model <b>Package</b>.
@@ -1034,26 +1031,6 @@ public class WSDDPackageImpl extends EPa
public static final int DEPLOYMENT_FEATURE_COUNT = 5;
/**
- * The meta object id for the '{@link org.apache.axis.model.wsdd.Use
<em>Use</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.apache.axis.model.wsdd.Use
- * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getUse()
- * @generated
- */
- public static final int USE = 16;
-
- /**
- * The meta object id for the '{@link org.apache.axis.model.wsdd.Style
<em>Style</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.apache.axis.model.wsdd.Style
- * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getStyle()
- * @generated
- */
- public static final int STYLE = 17;
-
- /**
* The meta object id for the '{@link
org.apache.axis.model.wsdd.ParameterMode <em>Parameter Mode</em>}' enum.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1061,7 +1038,7 @@ public class WSDDPackageImpl extends EPa
* @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getParameterMode()
* @generated
*/
- public static final int PARAMETER_MODE = 18;
+ public static final int PARAMETER_MODE = 16;
/**
* <!-- begin-user-doc -->
@@ -1180,20 +1157,6 @@ public class WSDDPackageImpl extends EPa
* <!-- end-user-doc -->
* @generated
*/
- private EEnum useEEnum = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EEnum styleEEnum = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
private EEnum parameterModeEEnum = null;
/**
@@ -1244,14 +1207,17 @@ public class WSDDPackageImpl extends EPa
// Obtain or create and register interdependencies
XmlPackageImpl theXmlPackage =
(XmlPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(XmlPackageImpl.eNS_URI)
instanceof XmlPackageImpl ?
EPackage.Registry.INSTANCE.getEPackage(XmlPackageImpl.eNS_URI) :
XmlPackageImpl.eINSTANCE);
+ SOAPPackageImpl theSOAPPackage =
(SOAPPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(SOAPPackageImpl.eNS_URI)
instanceof SOAPPackageImpl ?
EPackage.Registry.INSTANCE.getEPackage(SOAPPackageImpl.eNS_URI) :
SOAPPackageImpl.eINSTANCE);
// Create package meta-data objects
theWSDDPackage.createPackageContents();
theXmlPackage.createPackageContents();
+ theSOAPPackage.createPackageContents();
// Initialize created meta-data
theWSDDPackage.initializePackageContents();
theXmlPackage.initializePackageContents();
+ theSOAPPackage.initializePackageContents();
// Mark meta-data to indicate it can't be changed
theWSDDPackage.freeze();
@@ -2131,30 +2097,6 @@ public class WSDDPackageImpl extends EPa
}
/**
- * Returns the meta object for enum '{@link org.apache.axis.model.wsdd.Use
<em>Use</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for enum '<em>Use</em>'.
- * @see org.apache.axis.model.wsdd.Use
- * @generated
- */
- public EEnum getUse() {
- return useEEnum;
- }
-
- /**
- * Returns the meta object for enum '{@link
org.apache.axis.model.wsdd.Style <em>Style</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for enum '<em>Style</em>'.
- * @see org.apache.axis.model.wsdd.Style
- * @generated
- */
- public EEnum getStyle() {
- return styleEEnum;
- }
-
- /**
* Returns the meta object for enum '{@link
org.apache.axis.model.wsdd.ParameterMode <em>Parameter Mode</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -2281,8 +2223,6 @@ public class WSDDPackageImpl extends EPa
createEReference(deploymentEClass, DEPLOYMENT__SERVICES);
// Create enums
- useEEnum = createEEnum(USE);
- styleEEnum = createEEnum(STYLE);
parameterModeEEnum = createEEnum(PARAMETER_MODE);
}
@@ -2311,6 +2251,7 @@ public class WSDDPackageImpl extends EPa
// Obtain other dependent packages
XmlPackageImpl theXmlPackage =
(XmlPackageImpl)EPackage.Registry.INSTANCE.getEPackage(XmlPackageImpl.eNS_URI);
+ SOAPPackageImpl theSOAPPackage =
(SOAPPackageImpl)EPackage.Registry.INSTANCE.getEPackage(SOAPPackageImpl.eNS_URI);
// Add supertypes to classes
typeMappingEClass.getESuperTypes().add(this.getMapping());
@@ -2396,8 +2337,8 @@ public class WSDDPackageImpl extends EPa
initEClass(serviceEClass, Service.class, "Service", !IS_ABSTRACT,
!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getService_Name(), ecorePackage.getEString(), "name",
null, 0, 1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getService_Provider(), theXmlPackage.getQName(),
"provider", null, 0, 1, Service.class, !IS_TRANSIENT, !IS_VOLATILE,
IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getService_Use(), this.getUse(), "use", null, 0, 1,
Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
!IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getService_Style(), this.getStyle(), "style", null, 0,
1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
!IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getService_Use(), theSOAPPackage.getUse(), "use", null,
0, 1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getService_Style(), theSOAPPackage.getStyle(), "style",
null, 0, 1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getService_Namespaces(), ecorePackage.getEString(),
"namespaces", null, 0, -1, Service.class, !IS_TRANSIENT, !IS_VOLATILE,
IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getService_Operations(), this.getOperation(), null,
"operations", null, 0, -1, Service.class, !IS_TRANSIENT, !IS_VOLATILE,
IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEReference(getService_TypeMappings(), this.getTypeMapping(), null,
"typeMappings", null, 0, -1, Service.class, !IS_TRANSIENT, !IS_VOLATILE,
IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
@@ -2415,16 +2356,6 @@ public class WSDDPackageImpl extends EPa
addEParameter(op, this.getDeployment(), "other", 1, 1);
// Initialize enums and add enum literals
- initEEnum(useEEnum, Use.class, "Use");
- addEEnumLiteral(useEEnum, Use.ENCODED_LITERAL);
- addEEnumLiteral(useEEnum, Use.LITERAL_LITERAL);
-
- initEEnum(styleEEnum, Style.class, "Style");
- addEEnumLiteral(styleEEnum, Style.RPC_LITERAL);
- addEEnumLiteral(styleEEnum, Style.DOCUMENT_LITERAL);
- addEEnumLiteral(styleEEnum, Style.WRAPPED_LITERAL);
- addEEnumLiteral(styleEEnum, Style.MESSAGE_LITERAL);
-
initEEnum(parameterModeEEnum, ParameterMode.class, "ParameterMode");
addEEnumLiteral(parameterModeEEnum, ParameterMode.IN_LITERAL);
addEEnumLiteral(parameterModeEEnum, ParameterMode.OUT_LITERAL);
@@ -3141,26 +3072,6 @@ public class WSDDPackageImpl extends EPa
public static final EReference DEPLOYMENT__SERVICES =
eINSTANCE.getDeployment_Services();
/**
- * The meta object literal for the '{@link
org.apache.axis.model.wsdd.Use <em>Use</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.apache.axis.model.wsdd.Use
- * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getUse()
- * @generated
- */
- public static final EEnum USE = eINSTANCE.getUse();
-
- /**
- * The meta object literal for the '{@link
org.apache.axis.model.wsdd.Style <em>Style</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.apache.axis.model.wsdd.Style
- * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getStyle()
- * @generated
- */
- public static final EEnum STYLE = eINSTANCE.getStyle();
-
- /**
* The meta object literal for the '{@link
org.apache.axis.model.wsdd.ParameterMode <em>Parameter Mode</em>}' enum.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
Modified:
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/xml/impl/XmlPackageImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/xml/impl/XmlPackageImpl.java?rev=1418102&r1=1418101&r2=1418102&view=diff
==============================================================================
---
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/xml/impl/XmlPackageImpl.java
(original)
+++
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/xml/impl/XmlPackageImpl.java
Thu Dec 6 21:54:43 2012
@@ -8,6 +8,7 @@ package org.apache.axis.model.xml.impl;
import javax.xml.namespace.QName;
+import org.apache.axis.model.soap.impl.SOAPPackageImpl;
import org.apache.axis.model.wsdd.impl.WSDDPackageImpl;
import org.apache.axis.model.xml.XmlFactory;
@@ -131,14 +132,17 @@ public class XmlPackageImpl extends EPac
// Obtain or create and register interdependencies
WSDDPackageImpl theWSDDPackage =
(WSDDPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WSDDPackageImpl.eNS_URI)
instanceof WSDDPackageImpl ?
EPackage.Registry.INSTANCE.getEPackage(WSDDPackageImpl.eNS_URI) :
WSDDPackageImpl.eINSTANCE);
+ SOAPPackageImpl theSOAPPackage =
(SOAPPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(SOAPPackageImpl.eNS_URI)
instanceof SOAPPackageImpl ?
EPackage.Registry.INSTANCE.getEPackage(SOAPPackageImpl.eNS_URI) :
SOAPPackageImpl.eINSTANCE);
// Create package meta-data objects
theXmlPackage.createPackageContents();
theWSDDPackage.createPackageContents();
+ theSOAPPackage.createPackageContents();
// Initialize created meta-data
theXmlPackage.initializePackageContents();
theWSDDPackage.initializePackageContents();
+ theSOAPPackage.initializePackageContents();
// Mark meta-data to indicate it can't be changed
theXmlPackage.freeze();
