Author: veithen
Date: Fri May 18 20:52:41 2012
New Revision: 1340246
URL: http://svn.apache.org/viewvc?rev=1340246&view=rev
Log:
Use the feature introduced by AXIOM-399 instead of the "lossy prefix" stuff.
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBCustomBuilder.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDataSource.java
axis/axis2/java/core/trunk/modules/jaxws/test/org/apache/axis2/jaxws/message/BlockTests.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBCustomBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBCustomBuilder.java?rev=1340246&r1=1340245&r2=1340246&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBCustomBuilder.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBCustomBuilder.java
Fri May 18 20:52:41 2012
@@ -78,7 +78,10 @@ public class JAXBCustomBuilder implement
}
try {
// Create an OMSourcedElement backed by an unmarshalled JAXB object
- OMNamespace ns = factory.createOMNamespace(namespace,
reader.getPrefix());
+
+ // Currently we cannot control how the unmarshaller will emit the
prefix
+ // So if the value of the prefix is needed, full expansion is
necessary.
+ OMNamespace ns = factory.createOMNamespace(namespace, null);
Object jaxb = jdsContext.unmarshal(reader);
if (log.isDebugEnabled()) {
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDataSource.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDataSource.java?rev=1340246&r1=1340245&r2=1340246&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDataSource.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDataSource.java
Fri May 18 20:52:41 2012
@@ -55,10 +55,6 @@ public class JAXBDataSource extends OMDa
super();
this.jaxb = jaxb;
this.context = context;
-
- // Currently we cannot control how the unmarshaller will emit the
prefix
- // So if the value of the prefix is needed, full expansion is
necessary.
- setProperty(OMDataSourceExt.LOSSY_PREFIX, Boolean.TRUE);
}
public void close() {
Modified:
axis/axis2/java/core/trunk/modules/jaxws/test/org/apache/axis2/jaxws/message/BlockTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/test/org/apache/axis2/jaxws/message/BlockTests.java?rev=1340246&r1=1340245&r2=1340246&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws/test/org/apache/axis2/jaxws/message/BlockTests.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/test/org/apache/axis2/jaxws/message/BlockTests.java
Fri May 18 20:52:41 2012
@@ -581,7 +581,7 @@ public class BlockTests extends TestCase
OMFactory omFactory = OMAbstractFactory.getOMFactory();
JAXBDSContext dsContext = new JAXBDSContext(jaxbContext);
JAXBDataSource ds = new JAXBDataSource(jaxb, dsContext);
- OMNamespace ns =
omFactory.createOMNamespace(expectedQName.getNamespaceURI(), "pre");
+ OMNamespace ns =
omFactory.createOMNamespace(expectedQName.getNamespaceURI(), null);
OMElement om = omFactory.createOMElement(ds,
expectedQName.getLocalPart(), ns);
