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 2016/07/09 20:58:36 UTC
svn commit: r1752046 - in /axis/axis2/java/core/branches/1_7: ./
modules/adb-codegen/src/org/apache/axis2/schema/
modules/adb-codegen/test/org/apache/axis2/schema/extension/
modules/adb-tests/
modules/adb-tests/src/test/java/org/apache/axis2/databindin...
Author: veithen
Date: Sat Jul 9 20:58:36 2016
New Revision: 1752046
URL: http://svn.apache.org/viewvc?rev=1752046&view=rev
Log:
AXIS2-5799: Merge r1752039 to the 1.7 branch.
Added:
axis/axis2/java/core/branches/1_7/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5799/
- copied from r1752039, axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5799/
axis/axis2/java/core/branches/1_7/modules/adb-tests/src/test/wsdl/AXIS2-5799.wsdl
- copied unchanged from r1752039, axis/axis2/java/core/trunk/modules/adb-tests/src/test/wsdl/AXIS2-5799.wsdl
Modified:
axis/axis2/java/core/branches/1_7/ (props changed)
axis/axis2/java/core/branches/1_7/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
axis/axis2/java/core/branches/1_7/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java
axis/axis2/java/core/branches/1_7/modules/adb-tests/pom.xml
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 9 20:58:36 2016
@@ -1,4 +1,4 @@
/axis/axis2/java/core/branches/1_6:1295540
/axis/axis2/java/core/branches/AXIOM-420:1334386-1336397
/axis/axis2/java/core/branches/AXIS2-4318:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
-/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739493,1739592,1739594,1739815,1739826,1740693-1740694,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109,1746782,1746784,1746787,1746813,1746842,1746880,1746883,1746889,1746894,1747448,1747466,1747503,1747575,1747578,1747601,1747773,1747920,1751057
+/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739493,1739592,1739594,1739815,1739826,1740693-1740694,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109,1746782,1746784,1746787,1746813,1746842,1746880,1746883,1746889,1746894,1747448,1747466,1747503,1747575,1747578,1747601,1747773,1747920,1751057,1752039
Modified: axis/axis2/java/core/branches/1_7/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java?rev=1752046&r1=1752045&r2=1752046&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java (original)
+++ axis/axis2/java/core/branches/1_7/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java Sat Jul 9 20:58:36 2016
@@ -1837,17 +1837,17 @@ public class SchemaCompiler {
QName schemaTypeName = att.getSchemaTypeName();
if (schemaTypeName != null) {
- if (att.getQName() != null) {
+ if (att.getWireName() != null) {
if (baseSchemaTypeMap.containsKey(schemaTypeName)) {
- metainf.registerMapping(att.getQName(), schemaTypeName,
+ metainf.registerMapping(att.getWireName(), schemaTypeName,
baseSchemaTypeMap.get(schemaTypeName).toString(),
SchemaConstants.ATTRIBUTE_TYPE);
// add optional attribute status if set
String use = att.getUse().toString();
if (USE_NONE.equals(use) || USE_OPTIONAL.equals(use)) {
- metainf.addtStatus(att.getQName(), SchemaConstants.OPTIONAL_TYPE);
+ metainf.addtStatus(att.getWireName(), SchemaConstants.OPTIONAL_TYPE);
}
String className = findClassName(schemaTypeName, false);
@@ -1857,11 +1857,11 @@ public class SchemaCompiler {
className);
// set the default value
if (att.getDefaultValue() != null) {
- metainf.registerDefaultValue(att.getQName(), att.getDefaultValue());
+ metainf.registerDefaultValue(att.getWireName(), att.getDefaultValue());
}
if (att.getFixedValue() != null) {
- metainf.registerDefaultValue(att.getQName(), att.getFixedValue());
- metainf.registerFixedQName(att.getQName());
+ metainf.registerDefaultValue(att.getWireName(), att.getFixedValue());
+ metainf.registerFixedQName(att.getWireName());
}
// after
} else {
@@ -1882,14 +1882,14 @@ public class SchemaCompiler {
//process simple type
processSimpleSchemaType(simpleType, null, resolvedSchema, null);
}
- metainf.registerMapping(att.getQName(),
+ metainf.registerMapping(att.getWireName(),
schemaTypeName,
processedTypemap.get(schemaTypeName).toString(),
SchemaConstants.ATTRIBUTE_TYPE);
// add optional attribute status if set
String use = att.getUse().toString();
if (USE_NONE.equals(use) || USE_OPTIONAL.equals(use)) {
- metainf.addtStatus(att.getQName(), SchemaConstants.OPTIONAL_TYPE);
+ metainf.addtStatus(att.getWireName(), SchemaConstants.OPTIONAL_TYPE);
}
}
@@ -1924,7 +1924,7 @@ public class SchemaCompiler {
} else {
// this attribute refers to a custom type, probably one of the extended simple types.
// with the inline schema definition
- QName attributeQName = att.getQName();
+ QName attributeQName = att.getWireName();
if (attributeQName != null) {
XmlSchemaSimpleType attributeSimpleType = att.getSchemaType();
XmlSchema resolvedSchema = parentSchema;
@@ -1964,14 +1964,14 @@ public class SchemaCompiler {
processSimpleSchemaType(attributeSimpleType, null, resolvedSchema,
schemaTypeQName);
}
- metainf.registerMapping(att.getQName(),
+ metainf.registerMapping(att.getWireName(),
schemaTypeQName,
processedTypemap.get(schemaTypeQName).toString(),
SchemaConstants.ATTRIBUTE_TYPE);
// add optional attribute status if set
String use = att.getUse().toString();
if (USE_NONE.equals(use) || USE_OPTIONAL.equals(use)) {
- metainf.addtStatus(att.getQName(), SchemaConstants.OPTIONAL_TYPE);
+ metainf.addtStatus(att.getWireName(), SchemaConstants.OPTIONAL_TYPE);
}
} else {
// TODO: handle the case when no attribute type specifed
Modified: axis/axis2/java/core/branches/1_7/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java?rev=1752046&r1=1752045&r2=1752046&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java (original)
+++ axis/axis2/java/core/branches/1_7/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java Sat Jul 9 20:58:36 2016
@@ -58,8 +58,7 @@ public class SimpleExtensionTest extends
OMFactory factory = OMAbstractFactory.getOMFactory();
OMElement element = factory.createOMElement(new QName(
"http://apache.org/axis2/schema/extension", "SimpleAmmountElement"));
- element.addAttribute("currency", "SLR",
- factory.createOMNamespace("http://apache.org/axis2/schema/extension", null));
+ element.addAttribute("currency", "SLR", null);
element.setText("1000");
SimpleAmmountElement ammountElement = SimpleAmmountElement.Factory.parse(element
.getXMLStreamReader());
@@ -82,8 +81,7 @@ public class SimpleExtensionTest extends
OMFactory factory = OMAbstractFactory.getOMFactory();
OMElement element = factory.createOMElement(new QName(
"http://apache.org/axis2/schema/extension", "PaymentAmountElement"));
- element.addAttribute("currency", "SLR",
- factory.createOMNamespace("http://apache.org/axis2/schema/extension", null));
+ element.addAttribute("currency", "SLR", null);
element.setText("2000");
PaymentAmountElement ammountElement = PaymentAmountElement.Factory.parse(element
.getXMLStreamReader());
@@ -156,8 +154,7 @@ public class SimpleExtensionTest extends
OMFactory factory = OMAbstractFactory.getOMFactory();
OMElement element = factory.createOMElement(new QName(
"http://apache.org/axis2/schema/extension", "ReproStringTypeElement"));
- element.addAttribute("lang", "EN",
- factory.createOMNamespace("http://apache.org/axis2/schema/extension", null));
+ element.addAttribute("lang", "EN", null);
element.setText("Value");
ReproStringTypeElement reproStringTypeElement = ReproStringTypeElement.Factory.parse(element
Modified: axis/axis2/java/core/branches/1_7/modules/adb-tests/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/adb-tests/pom.xml?rev=1752046&r1=1752045&r2=1752046&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/adb-tests/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/modules/adb-tests/pom.xml Sat Jul 9 20:58:36 2016
@@ -158,6 +158,26 @@
<outputDirectory>${project.build.directory}/wsdl2code/AXIS2-5758</outputDirectory>
</configuration>
</execution>
+ <execution>
+ <id>wsdl2code-axis2-5799</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>wsdl2code</goal>
+ </goals>
+ <configuration>
+ <wsdlFile>src/test/wsdl/AXIS2-5799.wsdl</wsdlFile>
+ <syncMode>sync</syncMode>
+ <unpackClasses>true</unpackClasses>
+ <namespaceURIs>
+ <namespaceURI>
+ <uri>urn:echo</uri>
+ <packageName>org.apache.axis2.databinding.axis2_5799.client</packageName>
+ </namespaceURI>
+ </namespaceURIs>
+ <packageName>org.apache.axis2.databinding.axis2_5799.client</packageName>
+ <outputDirectory>${project.build.directory}/wsdl2code/AXIS2-5799</outputDirectory>
+ </configuration>
+ </execution>
</executions>
<configuration>
<databindingName>adb</databindingName>
@@ -261,6 +281,18 @@
<packageName>org.apache.axis2.databinding.axis2_5758.service</packageName>
</configuration>
</execution>
+ <execution>
+ <id>wsimport-axis2-5799</id>
+ <goals>
+ <goal>wsimport-test</goal>
+ </goals>
+ <configuration>
+ <wsdlFiles>
+ <wsdlFile>${basedir}/src/test/wsdl/AXIS2-5799.wsdl</wsdlFile>
+ </wsdlFiles>
+ <packageName>org.apache.axis2.databinding.axis2_5799.service</packageName>
+ </configuration>
+ </execution>
</executions>
<dependencies>
<dependency>
@@ -286,6 +318,7 @@
<source>${project.build.directory}/wsdl2code/AXIS2-5749/src</source>
<source>${project.build.directory}/wsdl2code/AXIS2-5750/src</source>
<source>${project.build.directory}/wsdl2code/AXIS2-5758/src</source>
+ <source>${project.build.directory}/wsdl2code/AXIS2-5799/src</source>
</sources>
</configuration>
</execution>