Author: alessio.soldano(a)jboss.com Date: 2012-01-18 06:38:32 -0500 (Wed, 18 Jan 2012) New Revision: 15491 Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java Log: Minor changes to log all DDEndpoint attributes and synch with CXF properties type Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2012-01-18 10:57:41 UTC (rev 15490) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2012-01-18 11:38:32 UTC (rev 15491) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat Middleware LLC, and individual contributors + * Copyright 2012, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -108,7 +108,8 @@ DDBeans metadata = dep.getAttachment(DDBeans.class); holder = new NonSpringBusHolder(metadata); } - Configurer configurer = holder.createServerConfigurer(dep.getAttachment(BindingCustomization.class), new WSDLFilePublisher(aDep), dep.getService().getEndpoints(), aDep.getRootFile()); + Configurer configurer = holder.createServerConfigurer(dep.getAttachment(BindingCustomization.class), + new WSDLFilePublisher(aDep), dep.getService().getEndpoints(), aDep.getRootFile()); holder.configure(new SoapTransportFactoryExt(), resolver, configurer); dep.addAttachment(BusHolder.class, holder); } Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2012-01-18 10:57:41 UTC (rev 15490) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2012-01-18 11:38:32 UTC (rev 15491) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * Copyright 2012, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -22,8 +22,6 @@ package org.jboss.wsf.stack.cxf.deployment.aspect; import static org.jboss.wsf.spi.deployment.DeploymentType.JAXRPC; -import static org.jboss.ws.common.integration.WSHelper.isJaxwsEjbDeployment; -import static org.jboss.ws.common.integration.WSHelper.isJaxwsJseDeployment; import static org.jboss.ws.common.integration.WSHelper.isJaxrpcDeployment; import static org.jboss.ws.common.integration.WSHelper.isJseDeployment; import static org.jboss.ws.common.integration.WSHelper.isWarArchive; @@ -50,6 +48,7 @@ * A deployer that locates or generates cxf.xml * * @author Thomas.Diesler(a)jboss.org + * @author alessio.soldano(a)jboss.com * @since 10-May-2007 */ public class DescriptorDeploymentAspect extends AbstractDeploymentAspect Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2012-01-18 10:57:41 UTC (rev 15490) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2012-01-18 11:38:32 UTC (rev 15491) @@ -21,8 +21,10 @@ */ package org.jboss.wsf.stack.cxf.metadata; +import java.util.HashMap; import java.util.LinkedList; import java.util.List; +import java.util.Map; import java.util.ResourceBundle; import java.util.Stack; import java.util.StringTokenizer; @@ -266,7 +268,11 @@ result.setEpClass(seiClass != null ? seiClass : sepClass); result.setPortName(new QName(serviceNS, portName)); result.setServiceName(new QName(serviceNS, serviceName)); - + Map<String, Object> props = new HashMap<String, Object>(); + for (String k : ep.getProperties()) { + props.put(k, ep.getProperty(k)); + } + result.setProperties(props); return result; } Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java 2012-01-18 10:57:41 UTC (rev 15490) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java 2012-01-18 11:38:32 UTC (rev 15491) @@ -23,6 +23,7 @@ import java.io.IOException; import java.io.Writer; +import java.util.Iterator; import java.util.List; import java.util.Map; @@ -66,7 +67,7 @@ private List<String> handlers; - private Map<String, String> properties; + private Map<String, Object> properties; //additional fields private Class<?> epClass; @@ -216,12 +217,12 @@ return this.addressingResponses; } - public Map<String, String> getProperties() + public Map<String, Object> getProperties() { return properties; } - public void setProperties(Map<String, String> properties) + public void setProperties(Map<String, Object> properties) { this.properties = properties; } @@ -296,7 +297,8 @@ writer.write("<jaxws:properties>"); for (String key : this.properties.keySet()) { - String value = this.properties.get(key); + Object value = this.properties.get(key); + //TODO implement proper mapping of mapType (http://www.springframework.org/schema/beans/spring-beans.xsd) if (value != null) { writer.write("<entry key='" + key + "' value='" + value + "'/>"); @@ -326,6 +328,23 @@ str.append("\n portName=" + this.portName); str.append("\n wsdlLocation=" + this.wsdlLocation); str.append("\n mtomEnabled=" + this.mtomEnabled); + if (this.handlers != null && !this.handlers.isEmpty()) { + str.append("\n handlers=["); + for (Iterator<String> it = this.handlers.iterator(); it.hasNext();) { + str.append(it.next()); + str.append(it.hasNext() ? "," : "]"); + } + } + if (this.properties != null && !this.properties.isEmpty()) + { + str.append("\n properties=["); + for (Iterator<String> it = this.properties.keySet().iterator(); it.hasNext();) + { + final String p = it.next(); + str.append(p + " -> " + this.properties.get(p)); + str.append(it.hasNext() ? "," : "]"); + } + } return str.toString(); } }