Author: veithen
Date: Wed Dec 5 20:47:30 2012
New Revision: 1417640
URL: http://svn.apache.org/viewvc?rev=1417640&view=rev
Log:
Fixed some issues to make the build succeed again.
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/wsdd.ecore
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Mapping.java
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Use.java
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/MappingImpl.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/WSDDPackageImpl.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=1417640&r1=1417639&r2=1417640&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
Wed Dec 5 20:47:30 2012
@@ -340,8 +340,8 @@ public class JavaDeployWriter extends Ja
org.apache.axis.model.wsdd.Service wsddService =
WSDDFactory.eINSTANCE.createService();
wsddService.setName(serviceName);
wsddService.setProvider(new QName(WSDDConstants.URI_WSDD_JAVA, "RPC"));
-
wsddService.setStyle(org.apache.axis.model.wsdd.Style.getByName(style.getName()));
-
wsddService.setUse(org.apache.axis.model.wsdd.Use.getByName(use.getName()));
+
wsddService.setStyle(org.apache.axis.model.wsdd.Style.get(style.getValue()));
+ wsddService.setUse(org.apache.axis.model.wsdd.Use.get(use.getValue()));
wsddService.setParameter("wsdlTargetNamespace",
service.getQName().getNamespaceURI());
wsddService.setParameter("wsdlServiceElement",
service.getQName().getLocalPart());
// MIME attachments don't work with multiref, so turn it off.
@@ -523,7 +523,7 @@ public class JavaDeployWriter extends Ja
operation.setReturnQName(new QName(returnQName.getNamespaceURI(),
Utils.getLastLocalPart(returnQName.getLocalPart())));
}
- operation.setReturnQName(returnType);
+ operation.setReturnType(returnType);
Parameter retParam = params.returnParam;
if (retParam != null) {
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=1417640&r1=1417639&r2=1417640&view=diff
==============================================================================
--- axis/axis1/java/branches/EMF/axis-model/model/wsdd.ecore (original)
+++ axis/axis1/java/branches/EMF/axis-model/model/wsdd.ecore Wed Dec 5
20:47:30 2012
@@ -4,8 +4,8 @@
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="LITERAL" literal="literal"/>
- <eLiterals name="ENCODED" value="1" literal="encoded"/>
+ <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"/>
@@ -14,7 +14,7 @@
<eLiterals name="MESSAGE" value="3" literal="message"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EEnum" name="ParameterMode">
- <eLiterals name="IN" value="1"/>
+ <eLiterals name="IN" value="1" literal="IN"/>
<eLiterals name="OUT" value="2" literal="OUT"/>
<eLiterals name="INOUT" value="3" literal="INOUT"/>
</eClassifiers>
@@ -25,8 +25,7 @@
<eClassifiers xsi:type="ecore:EClass" name="Mapping" abstract="true">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="qname"
eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//QName"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="type"
eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//QName"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="encodingStyle"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString";
- defaultValueLiteral=""/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="encodingStyle"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="TypeMapping"
eSuperTypes="#//Mapping">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="serializer"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
Modified:
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Mapping.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Mapping.java?rev=1417640&r1=1417639&r2=1417640&view=diff
==============================================================================
---
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Mapping.java
(original)
+++
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Mapping.java
Wed Dec 5 20:47:30 2012
@@ -81,7 +81,6 @@ public interface Mapping extends EObject
/**
* Returns the value of the '<em><b>Encoding Style</b></em>' attribute.
- * The default value is <code>""</code>.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Encoding Style</em>' attribute isn't clear,
@@ -91,7 +90,7 @@ public interface Mapping extends EObject
* @return the value of the '<em>Encoding Style</em>' attribute.
* @see #setEncodingStyle(String)
* @see org.apache.axis.model.wsdd.WSDDPackage#getMapping_EncodingStyle()
- * @model default=""
+ * @model
* @generated
*/
String getEncodingStyle();
Modified:
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Use.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Use.java?rev=1417640&r1=1417639&r2=1417640&view=diff
==============================================================================
---
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Use.java
(original)
+++
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/Use.java
Wed Dec 5 20:47:30 2012
@@ -23,54 +23,54 @@ import org.eclipse.emf.common.util.Abstr
*/
public final class Use extends AbstractEnumerator {
/**
- * The '<em><b>LITERAL</b></em>' literal value.
+ * The '<em><b>ENCODED</b></em>' literal value.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of '<em><b>LITERAL</b></em>' literal object isn't clear,
+ * If the meaning of '<em><b>ENCODED</b></em>' literal object isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @see #LITERAL_LITERAL
- * @model literal="literal"
+ * @see #ENCODED_LITERAL
+ * @model literal="encoded"
* @generated
* @ordered
*/
- public static final int LITERAL = 0;
+ public static final int ENCODED = 0;
/**
- * The '<em><b>ENCODED</b></em>' literal value.
+ * The '<em><b>LITERAL</b></em>' literal value.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of '<em><b>ENCODED</b></em>' literal object isn't clear,
+ * If the meaning of '<em><b>LITERAL</b></em>' literal object isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @see #ENCODED_LITERAL
- * @model literal="encoded"
+ * @see #LITERAL_LITERAL
+ * @model literal="literal"
* @generated
* @ordered
*/
- public static final int ENCODED = 1;
+ public static final int LITERAL = 1;
/**
- * The '<em><b>LITERAL</b></em>' literal object.
+ * The '<em><b>ENCODED</b></em>' literal object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #LITERAL
+ * @see #ENCODED
* @generated
* @ordered
*/
- public static final Use LITERAL_LITERAL = new Use(LITERAL, "LITERAL",
"literal");
+ public static final Use ENCODED_LITERAL = new Use(ENCODED, "ENCODED",
"encoded");
/**
- * The '<em><b>ENCODED</b></em>' literal object.
+ * The '<em><b>LITERAL</b></em>' literal object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #ENCODED
+ * @see #LITERAL
* @generated
* @ordered
*/
- public static final Use ENCODED_LITERAL = new Use(ENCODED, "ENCODED",
"encoded");
+ public static final Use LITERAL_LITERAL = new Use(LITERAL, "LITERAL",
"literal");
/**
* An array of all the '<em><b>Use</b></em>' enumerators.
@@ -80,8 +80,8 @@ public final class Use extends AbstractE
*/
private static final Use[] VALUES_ARRAY =
new Use[] {
- LITERAL_LITERAL,
ENCODED_LITERAL,
+ LITERAL_LITERAL,
};
/**
@@ -132,8 +132,8 @@ public final class Use extends AbstractE
*/
public static Use get(int value) {
switch (value) {
- case LITERAL: return LITERAL_LITERAL;
case ENCODED: return ENCODED_LITERAL;
+ case LITERAL: return LITERAL_LITERAL;
}
return null;
}
Modified:
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/MappingImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/MappingImpl.java?rev=1417640&r1=1417639&r2=1417640&view=diff
==============================================================================
---
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/MappingImpl.java
(original)
+++
axis/axis1/java/branches/EMF/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/MappingImpl.java
Wed Dec 5 20:47:30 2012
@@ -77,7 +77,7 @@ public abstract class MappingImpl extend
* @generated
* @ordered
*/
- protected static final String ENCODING_STYLE_EDEFAULT = "";
+ protected static final String ENCODING_STYLE_EDEFAULT = null;
/**
* The cached value of the '{@link #getEncodingStyle() <em>Encoding
Style</em>}' attribute.
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=1417640&r1=1417639&r2=1417640&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
Wed Dec 5 20:47:30 2012
@@ -79,7 +79,7 @@ public class ServiceImpl extends Deploya
* @generated
* @ordered
*/
- protected static final Use USE_EDEFAULT = Use.LITERAL_LITERAL;
+ protected static final Use USE_EDEFAULT = Use.ENCODED_LITERAL;
/**
* The cached value of the '{@link #getUse() <em>Use</em>}' attribute.
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=1417640&r1=1417639&r2=1417640&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
Wed Dec 5 20:47:30 2012
@@ -825,7 +825,7 @@ public class WSDDPackageImpl extends EPa
initEClass(mappingEClass, Mapping.class, "Mapping", IS_ABSTRACT,
!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getMapping_Qname(), theXMLTypePackage.getQName(),
"qname", null, 0, 1, Mapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getMapping_Type(), theXMLTypePackage.getQName(),
"type", null, 0, 1, Mapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getMapping_EncodingStyle(), ecorePackage.getEString(),
"encodingStyle", "", 0, 1, Mapping.class, !IS_TRANSIENT, !IS_VOLATILE,
IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getMapping_EncodingStyle(), ecorePackage.getEString(),
"encodingStyle", null, 0, 1, Mapping.class, !IS_TRANSIENT, !IS_VOLATILE,
IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(typeMappingEClass, TypeMapping.class, "TypeMapping",
!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getTypeMapping_Serializer(), ecorePackage.getEString(),
"serializer", null, 0, 1, TypeMapping.class, !IS_TRANSIENT, !IS_VOLATILE,
IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -886,8 +886,8 @@ public class WSDDPackageImpl extends EPa
// Initialize enums and add enum literals
initEEnum(useEEnum, Use.class, "Use");
- addEEnumLiteral(useEEnum, Use.LITERAL_LITERAL);
addEEnumLiteral(useEEnum, Use.ENCODED_LITERAL);
+ addEEnumLiteral(useEEnum, Use.LITERAL_LITERAL);
initEEnum(styleEEnum, Style.class, "Style");
addEEnumLiteral(styleEEnum, Style.RPC_LITERAL);
