[jbossws-commits] JBossWS SVN: r2196 - in trunk/jbossws-core/src/main/java/org/jboss/ws/metadata: builder/jaxws and 1 other directory.
Author: heiko.braun(a)jboss.com
Date: 2007-01-30 12:34:18 -0500 (Tue, 30 Jan 2007)
New Revision: 2196
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/acessor/JAXBAccessor.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
Log:
Use internalized Strings whenever calling JAXB private API
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/acessor/JAXBAccessor.java
===================================================================
---
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/acessor/JAXBAccessor.java 2007-01-30
16:52:13 UTC (rev 2195)
+++
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/acessor/JAXBAccessor.java 2007-01-30
17:34:18 UTC (rev 2196)
@@ -21,15 +21,21 @@
*/
package org.jboss.ws.metadata.acessor;
+import javax.xml.bind.JAXBException;
+import javax.xml.namespace.QName;
+
+import org.jboss.ws.WSException;
+import org.jboss.ws.metadata.umdm.Accessor;
+import org.jboss.ws.metadata.umdm.AccessorFactory;
+import org.jboss.ws.metadata.umdm.AccessorFactoryCreator;
+import org.jboss.ws.metadata.umdm.FaultMetaData;
+import org.jboss.ws.metadata.umdm.ParameterMetaData;
+import org.jboss.ws.metadata.umdm.WrappedParameter;
+
import com.sun.xml.bind.api.AccessorException;
import com.sun.xml.bind.api.JAXBRIContext;
import com.sun.xml.bind.api.RawAccessor;
-import org.jboss.ws.WSException;
-import org.jboss.ws.metadata.umdm.*;
-import javax.xml.bind.JAXBException;
-import javax.xml.namespace.QName;
-
/**
* A JAXB object accessor.
*
@@ -45,20 +51,20 @@
public AccessorFactory create(ParameterMetaData parameter)
{
- return create(parameter.getJavaType(),
parameter.getOperationMetaData().getEndpointMetaData().getClassLoader());
+ return create(parameter.getJavaType());
}
public AccessorFactory create(FaultMetaData fault)
{
- return create(fault.getFaultBean(),
fault.getOperationMetaData().getEndpointMetaData().getClassLoader());
+ return create(fault.getFaultBean());
}
- private AccessorFactory create(final Class clazz, ClassLoader loader)
+ private AccessorFactory create(final Class clazz)
{
final JAXBRIContext ctx;
try
{
- ctx = (JAXBRIContext)JAXBRIContext.newInstance(clazz.getPackage().getName(),
loader);
+ ctx = (JAXBRIContext)JAXBRIContext.newInstance(new Class[] { clazz });
}
catch (JAXBException e)
{
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
===================================================================
---
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-01-30
16:52:13 UTC (rev 2195)
+++
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-01-30
17:34:18 UTC (rev 2196)
@@ -304,7 +304,7 @@
private String convertToVariable(String localName)
{
- return JAXBRIContext.mangleNameToVariableName(localName);
+ return JAXBRIContext.mangleNameToVariableName(localName.intern());
}
private String[] convertTypeArguments(Class rawType, Type type)
@@ -806,7 +806,7 @@
{
try
{
- String targetNS = epMetaData.getPortTypeName().getNamespaceURI();
+ String targetNS = epMetaData.getPortTypeName().getNamespaceURI().intern();
log.debug("JAXBContext [types=" + javaTypes + ",tns=" +
targetNS + "]");
jaxbCtx = JAXBRIContext.newInstance(javaTypes.toArray(new Class[0]), typeRefs,
targetNS, false);
}