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/02/16 00:35:00 UTC
svn commit: r1730622 - in /axis/axis2/java/core/branches/1_7: ./
modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/ServiceTest.java
Author: veithen
Date: Mon Feb 15 23:34:59 2016
New Revision: 1730622
URL: http://svn.apache.org/viewvc?rev=1730622&view=rev
Log:
AXIS2-5741: Merge r1730618 to the 1.7 branch.
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-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/ServiceTest.java
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 15 23:34:59 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
+/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
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=1730622&r1=1730621&r2=1730622&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 Mon Feb 15 23:34:59 2016
@@ -619,7 +619,7 @@ public class SchemaCompiler {
String className = findClassName(schemaType.getQName(),
isArray(xsElt));
- innerElementMap.put(xsElt.getQName(), className);
+ innerElementMap.put(xsElt.getWireName(), className);
// always store the class name in the element meta Info itself
// this details only needed by the unwrappig to set the complex type
@@ -642,7 +642,7 @@ public class SchemaCompiler {
//the anon map. we've to write it just like we treat a referenced type(giving due
//care that this is meant to be an attribute in some class)
- QName generatedTypeName = generateTypeQName(xsElt.getQName(), parentSchema);
+ QName generatedTypeName = generateTypeQName(xsElt.getWireName(), parentSchema);
if (schemaType instanceof XmlSchemaComplexType) {
//set a name
@@ -664,7 +664,7 @@ public class SchemaCompiler {
processedAnonymousComplexTypesMap.remove(xsElt);
String className = findClassName(schemaType.getQName(), isArray(xsElt));
innerElementMap.put(
- xsElt.getQName(),
+ xsElt.getWireName(),
className);
//store in the schema map to retrive in the unwrapping
@@ -832,7 +832,7 @@ public class SchemaCompiler {
if (!isOuter) {
String className = findClassName(schemaTypeName, isArray(xsElt));
//since this is a inner element we should add it to the inner element map
- innerElementMap.put(xsElt.getQName(), className);
+ innerElementMap.put(xsElt.getWireName(), className);
// set the class name to be used in unwrapping
xsElt.addMetaInfo(SchemaConstants.SchemaCompilerInfoHolder.CLASSNAME_KEY,
className);
@@ -843,7 +843,7 @@ public class SchemaCompiler {
//this type is not found at all. we'll just register it with whatever the class name we can comeup with
if (!isOuter) {
String className = findClassName(schemaTypeName, isArray(xsElt));
- innerElementMap.put(xsElt.getQName(), className);
+ innerElementMap.put(xsElt.getWireName(), className);
// set the class name to be used in unwrapping
xsElt.addMetaInfo(SchemaConstants.SchemaCompilerInfoHolder.CLASSNAME_KEY,
className);
@@ -2246,12 +2246,12 @@ public class SchemaCompiler {
XmlSchemaElement elt = (XmlSchemaElement) child;
QName referencedQName = null;
- if (elt.getQName() != null) {
- referencedQName = elt.getQName();
+ if (elt.getWireName() != null) {
+ referencedQName = elt.getWireName();
QName schemaTypeQName = elt.getSchemaType() != null ?
elt.getSchemaType().getQName() : elt.getSchemaTypeName();
if (schemaTypeQName != null) {
- String clazzName = (String) processedElementTypeMap.get(elt.getQName());
+ String clazzName = (String) processedElementTypeMap.get(elt.getWireName());
metainfHolder.registerMapping(referencedQName,
schemaTypeQName,
clazzName,
@@ -2337,13 +2337,13 @@ public class SchemaCompiler {
}
//get the nillable state and register that on the metainf holder
- if (localNillableList.contains(elt.getQName())) {
- metainfHolder.registerNillableQName(elt.getQName());
+ if (localNillableList.contains(elt.getWireName())) {
+ metainfHolder.registerNillableQName(elt.getWireName());
}
//get the binary state and add that to the status map
if (isBinary(elt)) {
- metainfHolder.addtStatus(elt.getQName(),
+ metainfHolder.addtStatus(elt.getWireName(),
SchemaConstants.BINARY_TYPE);
}
// process the XMLSchemaAny
Modified: axis/axis2/java/core/branches/1_7/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/ServiceTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/ServiceTest.java?rev=1730622&r1=1730621&r2=1730622&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/ServiceTest.java (original)
+++ axis/axis2/java/core/branches/1_7/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/ServiceTest.java Mon Feb 15 23:34:59 2016
@@ -28,12 +28,10 @@ import org.apache.axis2.context.Configur
import org.apache.axis2.databinding.axis2_5741.client.FiverxLinkService;
import org.apache.axis2.databinding.axis2_5741.client.FiverxLinkService_Service;
import org.apache.axis2.transport.http.SimpleHTTPServer;
-import org.junit.Ignore;
import org.junit.Test;
public class ServiceTest {
@Test
- @Ignore("AXIS2-5741")
public void test() throws Exception {
int port = PortAllocator.allocatePort();
ConfigurationContext configurationContext =