[jbossws-commits] JBossWS SVN: r3831 - in trunk/jbossws-core/src/main/java/org/jboss/ws: metadata/umdm and 1 other directory.

Author: heiko.braun(a)jboss.com Date: 2007-07-09 13:20:05 -0400 (Mon, 09 Jul 2007) New Revision: 3831 Removed: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/DefaultJAXBContextFactory.java Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java Log: Fix prev merge errors Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/DefaultJAXBContextFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/DefaultJAXBContextFactory.java 2007-07-09 17:01:33 UTC (rev 3830) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/DefaultJAXBContextFactory.java 2007-07-09 17:20:05 UTC (rev 3831) @@ -1,47 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.core.jaxws; - -import org.jboss.ws.WSException; - -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; - -/** - * Doesn't do anything fancy. It just delegates to <code>JAXBContext.newInstance(clazzes)</code> - * - * @author Heiko.Braun(a)jboss.com - * Created: Jun 26, 2007 - */ -public class DefaultJAXBContextFactory extends JAXBContextFactory -{ - public JAXBContext createContext(Class[] clazzes) throws WSException - { - try - { - return JAXBContext.newInstance(clazzes); - } - catch (JAXBException e) { - throw new WSException("Failed to create JAXBContext", e); - } - } -} Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java 2007-07-09 17:01:33 UTC (rev 3830) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java 2007-07-09 17:20:05 UTC (rev 3831) @@ -63,6 +63,7 @@ TypeMappingImpl typeMapping = serContext.getTypeMapping(); Class javaType = typeMapping.getJavaType(xmlType); + JAXBContext jaxbContext = getJAXBContext(javaTypes); Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2007-07-09 17:01:33 UTC (rev 3830) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2007-07-09 17:20:05 UTC (rev 3831) @@ -33,7 +33,6 @@ import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller; import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.namespace.QName; @@ -58,8 +57,7 @@ @Override public Result serialize(QName xmlName, QName xmlType, Object value, SerializationContext serContext, NamedNodeMap attributes) throws BindingException { - if (log.isDebugEnabled()) - log.debug("serialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); + if (log.isDebugEnabled()) log.debug("serialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); Result result = null; try @@ -68,7 +66,6 @@ // This should be more efficient and accurate than searching the type mapping Class expectedType = serContext.getJavaType(); Class actualType = value.getClass(); - Class[] types = shouldFilter(actualType) ? new Class[]{expectedType} : new Class[]{expectedType, actualType}; JAXBContext jaxbContext = getJAXBContext(types); @@ -82,8 +79,7 @@ result = new BufferedStreamResult(); marshaller.marshal(new JAXBElement(xmlName, expectedType, value), result); - if (log.isDebugEnabled()) - log.debug("serialized: " + result); + if (log.isDebugEnabled()) log.debug("serialized: " + result); } catch (Exception ex) { Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-07-09 17:01:33 UTC (rev 3830) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-07-09 17:20:05 UTC (rev 3831) @@ -129,8 +129,6 @@ private ConfigObservable configObservable = new ConfigObservable(); - private JAXBContextCache jaxbCache = new JAXBContextCache(); - private List<UnifiedPortComponentRefMetaData> serviceRefContrib = new ArrayList<UnifiedPortComponentRefMetaData>(); private JAXBContextCache jaxbCache = new JAXBContextCache();