January 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r2136 - in trunk: integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50 and 13 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-26 08:37:04 -0500 (Fri, 26 Jan 2007) New Revision: 2136 Added: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ResourceLoaderAdapter.java Removed: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/DefaultFileAdapter.java Modified: trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBossServiceEndpointServlet.java trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/ConfigProvider.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/CallImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ServiceImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceExt.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/ConfigurationProvider.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/binding/SOAPEndpoint.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.java Log: Fix NPE with null configFile Modified: trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBossServiceEndpointServlet.java =================================================================== --- trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBossServiceEndpointServlet.java 2007-01-26 11:12:01 UTC (rev 2135) +++ trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBossServiceEndpointServlet.java 2007-01-26 13:37:04 UTC (rev 2136) @@ -23,19 +23,14 @@ // $Id$ -import java.util.List; - import javax.servlet.ServletContext; import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.core.server.AbstractServiceEndpointServlet; import org.jboss.ws.core.server.ServiceEndpoint; -import org.jboss.ws.metadata.config.CommonConfig; import org.jboss.ws.metadata.config.ConfigurationProvider; -import org.jboss.ws.metadata.umdm.HandlerMetaData; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; /** * A servlet that is installed for every web service endpoint. @@ -68,8 +63,7 @@ ServerEndpointMetaData sepMetaData = wsEndpoint.getServiceEndpointInfo().getServerEndpointMetaData(); ConfigurationProvider configProvider = (ConfigurationProvider)sepMetaData; - configProvider.setConfigName(configName); - configProvider.setConfigFile(configFile); + configProvider.setConfigName(configName, configFile); // configure handler chain configProvider.configure(sepMetaData); Modified: trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java =================================================================== --- trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java 2007-01-26 11:12:01 UTC (rev 2135) +++ trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java 2007-01-26 13:37:04 UTC (rev 2136) @@ -23,15 +23,15 @@ // $Id$ +import javax.servlet.ServletContext; + import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.core.server.AbstractServiceEndpointServlet; import org.jboss.ws.core.server.ServiceEndpoint; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.config.ConfigurationProvider; +import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import javax.servlet.ServletContext; - /** * A servlet that is installed for every web service endpoint. * @@ -42,13 +42,13 @@ { // provide logging private static final Logger log = Logger.getLogger(JBossServiceEndpointServlet.class); - + /** Initialize the service endpoint */ protected void initServiceEndpoint(String contextPath) { super.initServiceEndpoint(contextPath); - + ServiceEndpoint wsEndpoint = epManager.getServiceEndpointByID(sepId); if (wsEndpoint == null) throw new WSException("Cannot obtain endpoint for: " + sepId); @@ -63,8 +63,7 @@ ServerEndpointMetaData sepMetaData = wsEndpoint.getServiceEndpointInfo().getServerEndpointMetaData(); ConfigurationProvider configProvider = (ConfigurationProvider)sepMetaData; - configProvider.setConfigName(configName); - configProvider.setConfigFile(configFile); + configProvider.setConfigName(configName, configFile); // configure handler chain configProvider.configure(sepMetaData); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-01-26 11:12:01 UTC (rev 2135) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-01-26 13:37:04 UTC (rev 2136) @@ -54,7 +54,13 @@ import org.jboss.ws.core.soap.UnboundHeader; import org.jboss.ws.core.utils.HolderUtils; import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; -import org.jboss.ws.metadata.umdm.*; +import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; +import org.jboss.ws.metadata.umdm.EndpointMetaData; +import org.jboss.ws.metadata.umdm.OperationMetaData; +import org.jboss.ws.metadata.umdm.ParameterMetaData; +import org.jboss.ws.metadata.umdm.ResourceLoaderAdapter; +import org.jboss.ws.metadata.umdm.ServiceMetaData; +import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; @@ -185,17 +191,16 @@ { if (epMetaData == null) { - ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); + ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); + ResourceLoaderAdapter vfsRoot = new ResourceLoaderAdapter(); + UnifiedMetaData wsMetaData = new UnifiedMetaData(vfsRoot); + wsMetaData.setClassLoader(ctxLoader); - DefaultFileAdapter vfsRoot = new DefaultFileAdapter(); - vfsRoot.setLoader(contextClassLoader); - UnifiedMetaData wsMetaData = new UnifiedMetaData( vfsRoot ); - wsMetaData.setClassLoader(contextClassLoader); - ServiceMetaData serviceMetaData = new ServiceMetaData(wsMetaData, new QName(Constants.NS_JBOSSWS_URI, "AnonymousService")); wsMetaData.addService(serviceMetaData); - epMetaData = new ClientEndpointMetaData(serviceMetaData, new QName(Constants.NS_JBOSSWS_URI, "AnonymousPort"), new QName(Constants.NS_JBOSSWS_URI, "Anonymous"), Type.JAXRPC); + epMetaData = new ClientEndpointMetaData(serviceMetaData, new QName(Constants.NS_JBOSSWS_URI, "AnonymousPort"), + new QName(Constants.NS_JBOSSWS_URI, "Anonymous"), Type.JAXRPC); epMetaData.setStyle(Style.RPC); serviceMetaData.addEndpoint(epMetaData); @@ -251,7 +256,7 @@ // Bind the request message SOAPMessage reqMessage = (SOAPMessage)binding.bindRequestMessage(opMetaData, epInv, unboundHeaders); - + // Add possible attachment parts addAttachmentParts(reqMessage); @@ -333,7 +338,7 @@ // BP-1.0 R1027 if (handlerPass) - HandlerChainBaseImpl.checkMustUnderstand(msgContext, new String[]{}); + HandlerChainBaseImpl.checkMustUnderstand(msgContext, new String[] {}); // Check if protocol handlers modified the payload if (((SOAPBodyImpl)reqMessage.getSOAPBody()).isModifiedFromSource()) @@ -486,7 +491,7 @@ { return unboundHeaders.keySet().iterator(); } - + /** * Adds the given AttachmentPart object to the outgoing SOAPMessage. * An AttachmentPart object must be created before it can be added to a message. @@ -526,17 +531,16 @@ return epMetaData.getConfigName(); } - public abstract void setConfigName(String configName); - - public String getConfigFile() + public void setConfigName(String configName) { - EndpointMetaData epMetaData = getEndpointMetaData(); - return epMetaData.getConfigFile(); + setConfigName(configName, null); } - public void setConfigFile(String configFile) + public abstract void setConfigName(String configName, String configFile); + + public String getConfigFile() { EndpointMetaData epMetaData = getEndpointMetaData(); - epMetaData.setConfigFile(configFile); + return epMetaData.getConfigFile(); } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/ConfigProvider.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/ConfigProvider.java 2007-01-26 11:12:01 UTC (rev 2135) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/ConfigProvider.java 2007-01-26 13:37:04 UTC (rev 2136) @@ -37,11 +37,6 @@ String getConfigFile(); /** - * Set the port configuration file - */ - void setConfigFile(String configFile); - - /** * Get the port configuration name */ String getConfigName(); @@ -50,4 +45,9 @@ * Set the port configuration name */ void setConfigName(String configName); + + /** + * Set the port configuration name and file + */ + void setConfigName(String configName, String configFile); } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/CallImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/CallImpl.java 2007-01-26 11:12:01 UTC (rev 2135) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/CallImpl.java 2007-01-26 13:37:04 UTC (rev 2136) @@ -615,13 +615,12 @@ } @Override - public void setConfigName(String configName) + public void setConfigName(String configName, String configFile) { EndpointMetaData epMetaData = getEndpointMetaData(); - epMetaData.setConfigName(configName); + epMetaData.setConfigName(configName, configFile); // Reinitialize the client handler chain - // TODO: is this necessary? jaxrpcService.setupHandlerChain(epMetaData); } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ServiceImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ServiceImpl.java 2007-01-26 11:12:01 UTC (rev 2135) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ServiceImpl.java 2007-01-26 13:37:04 UTC (rev 2136) @@ -47,7 +47,13 @@ import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCClientMetaDataBuilder; import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.ws.metadata.umdm.*; +import org.jboss.ws.metadata.umdm.EndpointMetaData; +import org.jboss.ws.metadata.umdm.HandlerMetaData; +import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXRPC; +import org.jboss.ws.metadata.umdm.OperationMetaData; +import org.jboss.ws.metadata.umdm.ResourceLoaderAdapter; +import org.jboss.ws.metadata.umdm.ServiceMetaData; +import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerInitParam; import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; @@ -83,7 +89,7 @@ */ ServiceImpl(QName serviceName) { - UnifiedMetaData wsMetaData = new UnifiedMetaData(new DefaultFileAdapter()); + UnifiedMetaData wsMetaData = new UnifiedMetaData(new ResourceLoaderAdapter()); serviceMetaData = new ServiceMetaData(wsMetaData, serviceName); handlerRegistry = new HandlerRegistryImpl(serviceMetaData); } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java 2007-01-26 11:12:01 UTC (rev 2135) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java 2007-01-26 13:37:04 UTC (rev 2136) @@ -88,9 +88,7 @@ public List<Handler> getHandlerChain() { log.debug("getHandlerChain: " + jaxwsHandlerChain); - List<Handler> handlerChain = new ArrayList<Handler>(); - handlerChain.addAll(jaxwsHandlerChain); - return handlerChain; + return Collections.unmodifiableList(jaxwsHandlerChain); } public void setHandlerChain(List<Handler> handlerChain) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-01-26 11:12:01 UTC (rev 2135) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-01-26 13:37:04 UTC (rev 2136) @@ -24,7 +24,6 @@ // $Id$ import java.rmi.RemoteException; -import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Observable; @@ -323,9 +322,9 @@ throw new NotImplementedException(); } - public void setConfigName(String configName) + public void setConfigName(String configName, String configFile) { ConfigurationProvider configProvider = (ConfigurationProvider)getEndpointMetaData(); - configProvider.setConfigName(configName); + configProvider.setConfigName(configName, configFile); } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceExt.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceExt.java 2007-01-26 11:12:01 UTC (rev 2135) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceExt.java 2007-01-26 13:37:04 UTC (rev 2136) @@ -60,27 +60,28 @@ } /** - * Set the port configuration file for newly created ports + * Get the port configuration name for newly created ports */ - public void setConfigFile(String configFile) + public String getConfigName() { - this.configFile = configFile; + return configName; } /** - * Get the port configuration name for newly created ports + * Set the port configuration name for newly created ports */ - public String getConfigName() + public void setConfigName(String configName) { - return configName; + this.configName = configName; } /** * Set the port configuration name for newly created ports */ - public void setConfigName(String configName) + public void setConfigName(String configName, String configFile) { this.configName = configName; + this.configFile = configFile; } @Override @@ -126,9 +127,7 @@ private void configurePort(Object port) { ConfigProvider cp = (ConfigProvider)port; - if (configFile != null) - cp.setConfigFile(configFile); if (configName != null) - cp.setConfigName(configName); + cp.setConfigName(configName, configFile); } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactory.java 2007-01-26 11:12:01 UTC (rev 2135) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactory.java 2007-01-26 13:37:04 UTC (rev 2136) @@ -218,10 +218,8 @@ log.debug("Configure Service: [configName=" + configName + ",configFile=" + configFile + "]"); ConfigProvider cp = (ConfigProvider)service; - if (configFile != null) - cp.setConfigFile(configFile); if (configName != null) - cp.setConfigName(configName); + cp.setConfigName(configName, configFile); } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-01-26 11:12:01 UTC (rev 2135) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-01-26 13:37:04 UTC (rev 2136) @@ -97,7 +97,7 @@ if(usRef!=null) vfsRoot = usRef.getRootFile(); else - vfsRoot = new DefaultFileAdapter(); + vfsRoot = new ResourceLoaderAdapter(); if (wsdlURL != null) { @@ -390,10 +390,8 @@ log.debug("No matching port configuration for: [portName=" + portName + ",seiName=" + seiName + "]"); log.debug("Configure Stub: [configName=" + configName + ",configFile=" + configFile + "]"); - if (configFile != null) - stub.setConfigFile(configFile); if (configName != null) - stub.setConfigName(configName); + stub.setConfigName(configName, configFile); } @Override Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java 2007-01-26 11:12:01 UTC (rev 2135) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java 2007-01-26 13:37:04 UTC (rev 2136) @@ -100,7 +100,7 @@ if(null == serviceMetaData.getSecurityConfiguration()) // might be set through ServiceObjectFactory { - UnifiedVirtualFile vfsRoot = serviceMetaData.getUnifiedMetaData().getVfsRoot(); + UnifiedVirtualFile vfsRoot = serviceMetaData.getUnifiedMetaData().getRootFile(); boolean successful = false; WSSecurityConfiguration config = null; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2007-01-26 11:12:01 UTC (rev 2135) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2007-01-26 13:37:04 UTC (rev 2136) @@ -94,7 +94,7 @@ if(null == serviceMetaData.getSecurityConfiguration()) // might be set through ServiceObjectFactory { - UnifiedVirtualFile vfsRoot = serviceMetaData.getUnifiedMetaData().getVfsRoot(); + UnifiedVirtualFile vfsRoot = serviceMetaData.getUnifiedMetaData().getRootFile(); boolean successful = false; WSSecurityConfiguration config = null; try Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-01-26 11:12:01 UTC (rev 2135) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-01-26 13:37:04 UTC (rev 2136) @@ -101,8 +101,7 @@ log.debug("START buildMetaData: [service=" + serviceQName + "]"); try { - DefaultFileAdapter vfsRoot = new DefaultFileAdapter(); - vfsRoot.setLoader(loader); + ResourceLoaderAdapter vfsRoot = new ResourceLoaderAdapter(loader); UnifiedMetaData wsMetaData = new UnifiedMetaData(vfsRoot); wsMetaData.setClassLoader(loader); @@ -127,7 +126,7 @@ if (securityConfig != null) { serviceMetaData.setSecurityConfiguration(securityConfig); - setupSecurity(securityConfig, wsMetaData.getVfsRoot()); + setupSecurity(securityConfig, wsMetaData.getRootFile()); } buildMetaDataInternal(serviceMetaData, wsdlDefinitions, javaWsdlMapping, serviceRefMetaData); @@ -185,13 +184,10 @@ // config-name, config-file if (serviceRefMetaData != null) { - String configName = serviceRefMetaData.getConfigName(); - if (configName != null) - epMetaData.setConfigName(configName); - + String configName= serviceRefMetaData.getConfigName(); String configFile = serviceRefMetaData.getConfigFile(); - if (configFile != null) - epMetaData.setConfigFile(configFile); + if (configName != null) + epMetaData.setConfigName(configName, configFile); } // Init the endpoint binding @@ -224,8 +220,11 @@ private void setupHandlers(UnifiedServiceRefMetaData serviceRefMetaData, QName portName, EndpointMetaData epMetaData) { // Add pre handlers + UnifiedVirtualFile vfsRoot = epMetaData.getRootFile(); + String configName = epMetaData.getConfigName(); + String configFile = epMetaData.getConfigFile(); JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); - ClientConfigJAXRPC jaxrpcConfig = (ClientConfigJAXRPC)factory.getConfig(epMetaData.getConfigName(), epMetaData.getConfigFile()); + ClientConfigJAXRPC jaxrpcConfig = (ClientConfigJAXRPC)factory.getConfig(vfsRoot, configName, configFile); epMetaData.addHandlers(jaxrpcConfig.getHandlers(epMetaData, HandlerType.PRE)); // Setup the endpoint handlers Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-01-26 11:12:01 UTC (rev 2135) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-01-26 13:37:04 UTC (rev 2136) @@ -24,6 +24,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; +import org.jboss.ws.core.server.UnifiedVirtualFile; import org.jboss.ws.metadata.config.JBossWSConfigFactory; import org.jboss.ws.metadata.config.jaxrpc.EndpointConfigJAXRPC; import org.jboss.ws.metadata.j2ee.*; @@ -100,7 +101,7 @@ // Assign the WS-Security configuration, WSSecurityConfigFactory wsseConfFactory = WSSecurityConfigFactory.newInstance(); WSSecurityConfiguration securityConfiguration = wsseConfFactory.createConfiguration( - wsMetaData.getVfsRoot(), WSSecurityOMFactory.SERVER_RESOURCE_NAME + wsMetaData.getRootFile(), WSSecurityOMFactory.SERVER_RESOURCE_NAME ); serviceMetaData.setSecurityConfiguration(securityConfiguration); @@ -154,13 +155,10 @@ throw new WSException("Cannot obtain UnifiedBeanMetaData for: " + linkName); String configName = apMetaData.getConfigName(); + String configFile = apMetaData.getConfigFile(); if (configName != null) - sepMetaData.setConfigName(configName); + sepMetaData.setConfigName(configName, configFile); - String configFile = apMetaData.getConfigFile(); - if (configFile != null) - sepMetaData.setConfigFile(configFile); - UnifiedEjbPortComponentMetaData bpcMetaData = beanMetaData.getPortComponent(); if (bpcMetaData != null) { @@ -192,13 +190,10 @@ serviceMetaData.setWsdlPublishLocation(wsdlPublishLocation); String configName = webMetaData.getConfigName(); + String configFile = webMetaData.getConfigFile(); if (configName != null) - sepMetaData.setConfigName(configName); + sepMetaData.setConfigName(configName, configFile); - String configFile = webMetaData.getConfigFile(); - if (configFile != null) - sepMetaData.setConfigFile(configFile); - initTransportGuaranteeJSE(udi, sepMetaData, linkName); } @@ -222,8 +217,11 @@ setupOperationsFromWSDL(sepMetaData, wsdlEndpoint, seiMapping); // Add pre handlers + UnifiedVirtualFile vfsRoot = sepMetaData.getRootFile(); + String configName = sepMetaData.getConfigName(); + String configFile = sepMetaData.getConfigFile(); JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); - EndpointConfigJAXRPC jaxrpcConfig = (EndpointConfigJAXRPC)factory.getConfig(sepMetaData.getConfigName(), sepMetaData.getConfigFile()); + EndpointConfigJAXRPC jaxrpcConfig = (EndpointConfigJAXRPC)factory.getConfig(vfsRoot, configName, configFile); sepMetaData.addHandlers(jaxrpcConfig.getHandlers(sepMetaData, HandlerType.PRE)); // Setup the endpoint handlers Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-01-26 11:12:01 UTC (rev 2135) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-01-26 13:37:04 UTC (rev 2136) @@ -97,7 +97,7 @@ */ public ServiceMetaData buildMetaData(QName serviceName, URL wsdlURL) { - return buildMetaData(serviceName, wsdlURL, new DefaultFileAdapter()); + return buildMetaData(serviceName, wsdlURL, new ResourceLoaderAdapter()); } private void buildMetaDataInternal(ServiceMetaData serviceMetaData, WSDLDefinitions wsdlDefinitions) throws IOException Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2007-01-26 11:12:01 UTC (rev 2135) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2007-01-26 13:37:04 UTC (rev 2136) @@ -34,7 +34,7 @@ import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; -import org.jboss.ws.metadata.umdm.DefaultFileAdapter; +import org.jboss.ws.metadata.umdm.ResourceLoaderAdapter; /** * A server side meta data builder that is based on JSR-181 annotations Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2007-01-26 11:12:01 UTC (rev 2135) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2007-01-26 13:37:04 UTC (rev 2136) @@ -29,7 +29,7 @@ import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; -import org.jboss.ws.metadata.umdm.DefaultFileAdapter; +import org.jboss.ws.metadata.umdm.ResourceLoaderAdapter; /** * A server side meta data builder that is based on JSR-181 annotations Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2007-01-26 11:12:01 UTC (rev 2135) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2007-01-26 13:37:04 UTC (rev 2136) @@ -62,19 +62,17 @@ if (anEndpointConfig== null) return; - // setup config name + String configName = null; + String configFile = null; + if (anEndpointConfig.configName().length() > 0) - { - String configName = anEndpointConfig.configName(); - sepMetaData.setConfigName(configName); - } + configName = anEndpointConfig.configName(); - // setup config file if (anEndpointConfig.configFile().length() > 0) - { - String configFile = anEndpointConfig.configFile(); - sepMetaData.setConfigFile(configFile); - } + configFile = anEndpointConfig.configFile(); + + if (configName != null) + sepMetaData.setConfigName(configName, configFile); } protected void processWebContext(UnifiedDeploymentInfo udi, Class<?> wsClass, String linkName, ServerEndpointMetaData sepMetaData) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-01-26 11:12:01 UTC (rev 2135) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-01-26 13:37:04 UTC (rev 2136) @@ -90,7 +90,7 @@ // Assign the WS-Security configuration, WSSecurityConfigFactory wsseConfFactory = WSSecurityConfigFactory.newInstance(); WSSecurityConfiguration securityConfiguration = wsseConfFactory.createConfiguration( - wsMetaData.getVfsRoot(), WSSecurityOMFactory.SERVER_RESOURCE_NAME + wsMetaData.getRootFile(), WSSecurityOMFactory.SERVER_RESOURCE_NAME ); serviceMetaData.setSecurityConfiguration(securityConfiguration); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/ConfigurationProvider.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/ConfigurationProvider.java 2007-01-26 11:12:01 UTC (rev 2135) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/ConfigurationProvider.java 2007-01-26 13:37:04 UTC (rev 2136) @@ -52,9 +52,9 @@ String getConfigFile(); - void setConfigFile(String configFile); - String getConfigName(); void setConfigName(String configName); + + void setConfigName(String configName, String configFile); } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2007-01-26 11:12:01 UTC (rev 2135) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2007-01-26 13:37:04 UTC (rev 2136) @@ -23,22 +23,23 @@ //$Id$ +import java.io.IOException; +import java.net.URL; + import org.jboss.logging.Logger; import org.jboss.ws.WSException; +import org.jboss.ws.core.server.UnifiedVirtualFile; import org.jboss.ws.core.utils.DOMUtils; import org.jboss.ws.metadata.config.binding.OMFactoryJAXRPC; import org.jboss.ws.metadata.config.binding.OMFactoryJAXWS; import org.jboss.ws.metadata.config.jaxrpc.ConfigRootJAXRPC; import org.jboss.ws.metadata.config.jaxws.ConfigRootJAXWS; +import org.jboss.ws.metadata.umdm.ResourceLoaderAdapter; import org.jboss.xb.binding.JBossXBException; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; import org.w3c.dom.Element; -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; - /** * A factory for the JBossWS endpoint/client configuration * @@ -50,8 +51,8 @@ // provide logging private final Logger log = Logger.getLogger(JBossWSConfigFactory.class); - private static String URN_JAXRPC_CONFIG = "urn:jboss:jaxrpc-config:2.0"; - private static String URN_JAXWS_CONFIG = "urn:jboss:jaxws-config:2.0"; + private static String URN_JAXRPC_CONFIG = "urn:jboss:jaxrpc-config:2.0"; + private static String URN_JAXWS_CONFIG = "urn:jboss:jaxws-config:2.0"; // Hide constructor private JBossWSConfigFactory() @@ -95,7 +96,8 @@ { throw new WSException("Error while parsing configuration", e); } - catch (IOException e) { + catch (IOException e) + { throw new WSException("Failed to read config file: " + configURL, e); } @@ -118,17 +120,21 @@ /** * @return config - cannot be null */ - public CommonConfig getConfig(String configName, String configFile) + public CommonConfig getConfig(UnifiedVirtualFile vfsRoot, String configName, String configFile) { - CommonConfig config; - log.debug("getConfig: [name=" + configName + ",url=" + configFile + "]"); + if (configName == null) + throw new IllegalArgumentException("Config name cannot be null"); + if (configFile == null) + throw new IllegalArgumentException("Config file cannot be null"); + // Get the config root - URL configURL = filenameToURL(configFile); + URL configURL = filenameToURL(vfsRoot, configFile); Object configRoot = parse(configURL); // Get the endpoint config + CommonConfig config; if (configRoot instanceof ConfigRootJAXRPC) { config = ((ConfigRootJAXRPC)configRoot).getConfigByName(configName); @@ -141,31 +147,37 @@ if (config == null) throw new WSException("Cannot obtain config: " + configName); - return config; } - private static URL filenameToURL(String configFile) { + private URL filenameToURL(UnifiedVirtualFile vfsRoot, String configFile) + { URL configURL = null; try { - configURL = new URL(configFile); + configURL = vfsRoot.findChild(configFile).toURL(); } - catch (MalformedURLException ex) + catch (IOException ex) { // ignore } - + // Try to get the URL as resource if (configURL == null) { - ClassLoader cl = Thread.currentThread().getContextClassLoader(); - configURL = cl.getResource(configFile); - if (configURL == null) - throw new WSException("Cannot get resource: " + configFile); + try + { + configURL = new ResourceLoaderAdapter().findChild(configFile).toURL(); + } + catch (IOException ex) + { + // ignore + } } - + + if (configURL == null) + throw new WSException("Cannot find configFile: " + configFile); + return configURL; } - } Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/DefaultFileAdapter.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/DefaultFileAdapter.java 2007-01-26 11:12:01 UTC (rev 2135) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/DefaultFileAdapter.java 2007-01-26 13:37:04 UTC (rev 2136) @@ -1,118 +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.metadata.umdm; - -import org.jboss.ws.core.server.UnifiedVirtualFile; - -import java.io.IOException; -import java.io.File; -import java.net.URL; -import java.net.MalformedURLException; - -/** - * The default file adapter loads resources through an associated classloader. - * If no classload is set, the the thread context classloader will be used. - * - * @author Heiko.Braun(a)jboss.org - * @version $Id$ - * @since 25.01.2007 - */ -public class DefaultFileAdapter implements UnifiedVirtualFile { - - private URL location; - private ClassLoader loader; - - public DefaultFileAdapter(URL location) { - this.location = location; - } - - public DefaultFileAdapter() { - } - - public UnifiedVirtualFile findChild(String child) throws IOException - { - - URL loc = null; - if (child != null) - { - // Try the child as URL - try - { - loc = new URL(child); - } - catch (MalformedURLException ex) - { - // ignore - } - - // Try the filename as File - if (loc == null) - { - try - { - File file = new File(child); - if (file.exists()) - loc = file.toURL(); - } - catch (MalformedURLException e) - { - // ignore - } - } - - // Try the filename as Resource - if (loc == null) - { - try - { - loc = getLoader().getResource(child); - } - catch (Exception ex) - { - // ignore - } - } - - } - - if (loc == null) - throw new IllegalArgumentException("Cannot get URL for: " + child); - - return new DefaultFileAdapter(loc); - } - - public URL toURL() { - if(null == this.location) - throw new IllegalStateException("UnifiedVirtualFile not initialized"); - return location; - } - - public void setLoader(ClassLoader loader) { - this.loader = loader; - } - - public ClassLoader getLoader() { - if(null == this.loader) - loader = Thread.currentThread().getContextClassLoader(); - return loader; - } -} 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-01-26 11:12:01 UTC (rev 2135) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-01-26 13:37:04 UTC (rev 2136) @@ -52,6 +52,7 @@ import org.jboss.ws.core.jaxrpc.binding.SOAPArraySerializerFactory; import org.jboss.ws.core.jaxws.JAXBDeserializerFactory; import org.jboss.ws.core.jaxws.JAXBSerializerFactory; +import org.jboss.ws.core.server.UnifiedVirtualFile; import org.jboss.ws.core.utils.JavaUtils; import org.jboss.ws.metadata.config.CommonConfig; import org.jboss.ws.metadata.config.Configurable; @@ -66,8 +67,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 12-May-2005 */ -public abstract class EndpointMetaData extends ExtensibleMetaData - implements ConfigurationProvider, Configurable +public abstract class EndpointMetaData extends ExtensibleMetaData implements ConfigurationProvider, Configurable { // provide logging private static Logger log = Logger.getLogger(EndpointMetaData.class); @@ -169,10 +169,8 @@ public void setBindingId(String bindingId) { - if (!Constants.SOAP11HTTP_BINDING.equals(bindingId) - && !Constants.SOAP12HTTP_BINDING.equals(bindingId) - && !Constants.SOAP11HTTP_MTOM_BINDING.equals(bindingId) - && !Constants.SOAP12HTTP_MTOM_BINDING.equals(bindingId)) + if (!Constants.SOAP11HTTP_BINDING.equals(bindingId) && !Constants.SOAP12HTTP_BINDING.equals(bindingId) && !Constants.SOAP11HTTP_MTOM_BINDING.equals(bindingId) + && !Constants.SOAP12HTTP_MTOM_BINDING.equals(bindingId)) { throw new WSException("Unsupported binding: " + bindingId); } @@ -399,10 +397,10 @@ boolean doesMatch = aux.getJavaMethod().equals(method); // fallback for async methods - if(!doesMatch && method.getName().endsWith(Constants.ASYNC_METHOD_SUFFIX)) + if (!doesMatch && method.getName().endsWith(Constants.ASYNC_METHOD_SUFFIX)) { String name = method.getName(); - name = name.substring(0, name.length()-5); + name = name.substring(0, name.length() - 5); doesMatch = aux.getJavaName().equals(name); } @@ -530,7 +528,8 @@ List<Class> types = typeMapping.getJavaTypes(xmlType); boolean registered = false; - for (Class current : types) { + for (Class current : types) + { if (current.getName().equals(javaTypeName)) { registered = true; @@ -584,28 +583,29 @@ * * @param configurable */ - public void configure(Configurable configurable) { + public void configure(Configurable configurable) + { // emit notificatins when the config changes registerConfigObserver(configurable); - if(null == config) + if (null == config) { - log.trace("Create new config: " + getConfigFile()+":"+getConfigName()); + log.trace("Create new config: " + getConfigFile() + ":" + getConfigName()); JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); - config = factory.getConfig(getConfigName(), getConfigFile()); + config = factory.getConfig(getRootFile(), getConfigName(), getConfigFile()); } else { - log.trace("Reusing cached config. Current should be: " + getConfigFile()+":"+getConfigName()); + log.trace("Reusing cached config. Current should be: " + getConfigFile() + ":" + getConfigName()); } // SOAPBinding configuration - if(configurable instanceof CommonBindingProvider) + if (configurable instanceof CommonBindingProvider) { log.debug("Configure SOAPBinding"); - if(config.hasFeature(EndpointFeature.MTOM)) + if (config.hasFeature(EndpointFeature.MTOM)) { CommonBindingProvider provider = (CommonBindingProvider)configurable; ((CommonSOAPBinding)provider.getCommonBinding()).setMTOMEnabled(true); @@ -614,7 +614,7 @@ } // Configure EndpointMetaData - else if(configurable instanceof EndpointMetaData) + else if (configurable instanceof EndpointMetaData) { log.debug("Configure EndpointMetaData"); @@ -636,11 +636,16 @@ log.debug("Added " + preHandlers.size() + " PRE handlers"); log.debug("Added " + postHandlers.size() + " POST handlers"); } + } + public UnifiedVirtualFile getRootFile() + { + return getServiceMetaData().getUnifiedMetaData().getRootFile(); } - public void registerConfigObserver(Configurable observer) { - this.configObservable.addObserver(observer); + public void registerConfigObserver(Configurable observer) + { + this.configObservable.addObserver(observer); } public String getConfigFile() @@ -648,12 +653,6 @@ return this.configFile; } - public void setConfigFile(String configFile) - { - this.configFile = configFile; - this.config = null; - } - public String getConfigName() { return this.configName; @@ -661,32 +660,48 @@ public void setConfigName(String configName) { - if(null == configName) - throw new IllegalArgumentException("Invalid config name: " + configName); + setConfigNameInternal(configName, null); + } - if( !configName.equals(this.configName) ) + public void setConfigName(String configName, String configFile) + { + setConfigNameInternal(configName, configFile); + } + + private void setConfigNameInternal(String configName, String configFile) + { + if (configName == null) + throw new IllegalArgumentException("Config name cannot be null"); + + if (configFile != null) + this.configFile = configFile; + + if (configName.equals(this.configName) == false) { this.configName = configName; this.config = null; // notify observers - log.debug("Reconfiguration forced, new config is '"+configName+"'"); + log.debug("Reconfiguration forced, new config is '" + configName + "'"); this.configObservable.doNotify(configName); } } - + public List<Class> getRegisteredTypes() { return Collections.unmodifiableList(registeredTypes); } - public void update(Observable observable, Object object) { + public void update(Observable observable, Object object) + { log.trace("Ingore configuration change notification"); } - class ConfigObservable extends Observable { + class ConfigObservable extends Observable + { - public void doNotify(Object object) { + public void doNotify(Object object) + { setChanged(); notifyObservers(object); } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-01-26 11:12:01 UTC (rev 2135) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-01-26 13:37:04 UTC (rev 2136) @@ -69,7 +69,7 @@ public OperationMetaData(QName qname, String javaName) { - UnifiedMetaData umd = new UnifiedMetaData(new DefaultFileAdapter()); + UnifiedMetaData umd = new UnifiedMetaData(new ResourceLoaderAdapter()); ServiceMetaData smd = new ServiceMetaData(umd, new QName("mock-service")); ServerEndpointMetaData epmd = new ServerEndpointMetaData(smd, new QName("mock-endpoint"), new QName("mock-interface"), Type.JAXRPC); initOperationMetaData(epmd, qname, javaName); Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ResourceLoaderAdapter.java (from rev 2131, trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/DefaultFileAdapter.java) =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ResourceLoaderAdapter.java (rev 0) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ResourceLoaderAdapter.java 2007-01-26 13:37:04 UTC (rev 2136) @@ -0,0 +1,122 @@ +/* + * 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.metadata.umdm; + +// $Id: $ + +import java.io.File; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; + +import org.jboss.ws.core.server.UnifiedVirtualFile; + +/** + * The default file adapter loads resources through an associated classloader. + * If no classload is set, the the thread context classloader will be used. + * + * @author Heiko.Braun(a)jboss.org + * @since 25.01.2007 + */ +public class ResourceLoaderAdapter implements UnifiedVirtualFile +{ + private URL location; + private ClassLoader loader; + + public ResourceLoaderAdapter() + { + this(Thread.currentThread().getContextClassLoader()); + } + + public ResourceLoaderAdapter(ClassLoader loader) + { + this.loader = loader; + } + + private ResourceLoaderAdapter(ClassLoader loader, URL location) + { + this.location = location; + this.loader = loader; + } + + public UnifiedVirtualFile findChild(String resourcePath) throws IOException + { + URL resourceURL = null; + if (resourcePath != null) + { + // Try the child as URL + try + { + resourceURL = new URL(resourcePath); + } + catch (MalformedURLException ex) + { + // ignore + } + + // Try the filename as File + if (resourceURL == null) + { + try + { + File file = new File(resourcePath); + if (file.exists()) + resourceURL = file.toURL(); + } + catch (MalformedURLException e) + { + // ignore + } + } + + // Try the filename as Resource + if (resourceURL == null) + { + try + { + resourceURL = loader.getResource(resourcePath); + } + catch (Exception ex) + { + // ignore + } + } + } + + if (resourceURL == null) + throw new IOException("Cannot get URL for: " + resourcePath); + + return new ResourceLoaderAdapter(loader, resourceURL); + } + + public URL toURL() + { + if (null == this.location) + throw new IllegalStateException("UnifiedVirtualFile not initialized"); + return location; + } + + public ClassLoader getResourceLoader() + { + return loader; + } +} Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-01-26 11:12:01 UTC (rev 2135) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-01-26 13:37:04 UTC (rev 2136) @@ -1,24 +1,24 @@ /* -* 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. -*/ + * 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.metadata.umdm; // $Id$ @@ -79,11 +79,11 @@ // Used by validate private boolean validated; - public UnifiedMetaData(UnifiedVirtualFile vfsRoot) { + public UnifiedMetaData(UnifiedVirtualFile vfsRoot) + { + if (vfsRoot == null) + throw new IllegalArgumentException("VFS root cannot be null"); - if(null==vfsRoot) - throw new IllegalArgumentException("VFS root cannot be null"); - this.vfsRoot = vfsRoot; this.classLoader = Thread.currentThread().getContextClassLoader(); } @@ -91,12 +91,13 @@ public ClassLoader getClassLoader() { if (classLoader == null) - throw new IllegalStateException ("Class loader not available"); - + throw new IllegalStateException("Class loader not available"); + return classLoader; } - public UnifiedVirtualFile getVfsRoot() { + public UnifiedVirtualFile getRootFile() + { return vfsRoot; } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java 2007-01-26 11:12:01 UTC (rev 2135) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java 2007-01-26 13:37:04 UTC (rev 2136) @@ -35,7 +35,7 @@ import org.jboss.ws.core.jaxrpc.Style; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; -import org.jboss.ws.metadata.umdm.DefaultFileAdapter; +import org.jboss.ws.metadata.umdm.ResourceLoaderAdapter; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.tools.Configuration.OperationConfig; @@ -85,8 +85,7 @@ throw new WSException("A service endpoint interface should extend Remote"); ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); - DefaultFileAdapter vfsRoot = new DefaultFileAdapter(); - vfsRoot.setLoader(contextClassLoader); + ResourceLoaderAdapter vfsRoot = new ResourceLoaderAdapter(); um = new UnifiedMetaData(vfsRoot); um.setClassLoader(contextClassLoader); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java 2007-01-26 11:12:01 UTC (rev 2135) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/binding/ClientHandler.java 2007-01-26 13:37:04 UTC (rev 2136) @@ -21,24 +21,18 @@ */ package org.jboss.test.ws.jaxws.binding; -import java.util.HashSet; -import java.util.Set; - -import javax.xml.namespace.QName; import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPEnvelope; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.ws.WebServiceException; import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.handler.soap.SOAPHandler; import javax.xml.ws.handler.soap.SOAPMessageContext; -import org.jboss.logging.Logger; import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; /** - * A client side handler for the ws-addressing + * A client side handler * * @author Thomas.Diesler(a)jboss.org * @since 24-Nov-2005 Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java 2007-01-26 11:12:01 UTC (rev 2135) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/binding/SOAPBindingTestCase.java 2007-01-26 13:37:04 UTC (rev 2136) @@ -24,6 +24,7 @@ // $Id: $ import java.net.URL; +import java.util.ArrayList; import java.util.List; import javax.xml.namespace.QName; @@ -58,8 +59,10 @@ SOAPEndpoint port = (SOAPEndpoint)service.getPort(SOAPEndpoint.class); BindingProvider provider = (BindingProvider)port; - List<Handler> handlerChain = provider.getBinding().getHandlerChain(); + List<Handler> handlerChain = new ArrayList<Handler>(); + handlerChain.addAll(provider.getBinding().getHandlerChain()); handlerChain.add(new ClientHandler()); + provider.getBinding().setHandlerChain(handlerChain); String nsURI = port.namespace(); assertEquals(Constants.NS_SOAP12_ENV + ":" + Constants.NS_SOAP12_ENV, nsURI); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/binding/SOAPEndpoint.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/binding/SOAPEndpoint.java 2007-01-26 11:12:01 UTC (rev 2135) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/binding/SOAPEndpoint.java 2007-01-26 13:37:04 UTC (rev 2136) @@ -21,13 +21,13 @@ */ package org.jboss.test.ws.jaxws.binding; -import javax.jws.WebMethod; +//$Id: $ + import javax.jws.WebService; import javax.jws.soap.SOAPBinding; import javax.jws.soap.SOAPBinding.Style; import javax.xml.ws.BindingType; -// $Id: $ @WebService(name = "SOAPEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/binding") @SOAPBinding(style = Style.RPC) Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.java 2007-01-26 11:12:01 UTC (rev 2135) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.java 2007-01-26 13:37:04 UTC (rev 2136) @@ -24,21 +24,18 @@ // $Id: $ import javax.annotation.Resource; -import javax.jws.WebMethod; import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.jws.soap.SOAPBinding.Style; import javax.xml.soap.SOAPEnvelope; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; -import javax.xml.ws.BindingType; import javax.xml.ws.WebServiceContext; import javax.xml.ws.WebServiceException; import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; -@WebService(name="SOAPEndpoint", targetNamespace="http://org.jboss.ws/jaxws/binding", endpointInterface = "org.jboss.test.ws.jaxws.binding.SOAPEndpoint") +@WebService(name="SOAPEndpoint", targetNamespace="http://org.jboss.ws/jaxws/binding", + endpointInterface = "org.jboss.test.ws.jaxws.binding.SOAPEndpoint") public class SOAPEndpointBean implements SOAPEndpoint { private static Logger log = Logger.getLogger(SOAPEndpointBean.class);

17 years, 11 months

1
0
0 / 0

JBossWS SVN: r2135 - trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/wseventing.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-01-26 06:12:01 -0500 (Fri, 26 Jan 2007) New Revision: 2135 Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/wseventing/EventingSupport.java Log: Keep ports as static members Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/wseventing/EventingSupport.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/wseventing/EventingSupport.java 2007-01-26 11:06:40 UTC (rev 2134) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/wseventing/EventingSupport.java 2007-01-26 11:12:01 UTC (rev 2135) @@ -52,17 +52,17 @@ public class EventingSupport extends JBossWSTest { - EventSourceEndpoint eventSourcePort; + static EventSourceEndpoint eventSourcePort; - SubscriptionManagerEndpoint managerPort; + static SubscriptionManagerEndpoint managerPort; - protected URI eventSourceURI = null; + static URI eventSourceURI = null; private static int msgId = 0; - URL wsdlLocation; + static URL wsdlLocation; - protected String eventString = + static String eventString = "<WindReport type='critical'>\n" + " <Date>030701</Date>\n" + " <Time>0041</Time>\n" + @@ -85,20 +85,17 @@ protected void setUp() throws Exception { - super.setUp(); - - eventSourceURI = new URI(EVENT_SOURCE_NAME); - wsdlLocation = new URL("http://" + getServerHost() + ":8080/jaxws-wseventing/subscribe?wsdl"); - if (eventSourcePort == null) { + eventSourceURI = new URI(EVENT_SOURCE_NAME); + wsdlLocation = new URL("http://" + getServerHost() + ":8080/jaxws-wseventing/subscribe?wsdl"); + Service service = Service.create(wsdlLocation, new QName("","EventingService")); eventSourcePort = (EventSourceEndpoint)service.getPort(EventSourceEndpoint.class); managerPort = (SubscriptionManagerEndpoint)service.getPort(SubscriptionManagerEndpoint.class); ((StubExt)eventSourcePort).setConfigName("Standard WSAddressing Client"); ((StubExt)managerPort).setConfigName("Standard WSAddressing Client"); - } }

17 years, 11 months

1
0
0 / 0

JBossWS SVN: r2134 - trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-01-26 06:06:40 -0500 (Fri, 26 Jan 2007) New Revision: 2134 Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java Log: Keep ports as static members Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java 2007-01-26 11:05:09 UTC (rev 2133) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java 2007-01-26 11:06:40 UTC (rev 2134) @@ -47,13 +47,13 @@ */ public class AddressingTestCase extends JBossWSTest { - private EchoPortType echoPort; - private Notify notifyPort; + private static EchoPortType echoPort; + private static Notify notifyPort; final static String WSA_FROM = "http://example.org/node/A"; final static String WSA_TO = "http://example.org/node/B"; - private URL wsdlLocation; + private static URL wsdlLocation; private static AddressingBuilder BUILDER; private static AddressingConstants CONSTANTS; @@ -77,24 +77,25 @@ protected void setUp() throws Exception { - super.setUp(); + + if (echoPort==null || notifyPort==null) + { + this.wsdlLocation = new File("resources/interop/wsa/WEB-INF/wsdl/service.wsdl").toURL(); - this.wsdlLocation = new File("resources/interop/wsa/WEB-INF/wsdl/service.wsdl").toURL(); - - if (echoPort == null || notifyPort==null) - { Service service = Service.create(wsdlLocation, new QName("http://tempuri.org/", "WSAddressingCR")); echoPort = service.getPort(EchoPortType.class); notifyPort= service.getPort(Notify.class); + + ((StubExt)echoPort).setConfigName("Standard WSAddressing Client"); + ((StubExt)notifyPort).setConfigName("Standard WSAddressing Client"); + + ((BindingProvider)echoPort).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://"+getServerHost()+":8080/wsa10/echo"); + ((BindingProvider)notifyPort).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://"+getServerHost()+":8080/wsa10/notify"); + configureClient(); } - ((StubExt)echoPort).setConfigName("Standard WSAddressing Client"); - ((StubExt)notifyPort).setConfigName("Standard WSAddressing Client"); - ((BindingProvider)echoPort).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://"+getServerHost()+":8080/wsa10/echo"); - ((BindingProvider)notifyPort).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://"+getServerHost()+":8080/wsa10/notify"); - customerParam = DOMUtils.parse("<customer:CustomerKey xmlns:customer=\"http://example.org/customer\">Key#123456789</customer:CustomerKey>"); faultParam = DOMUtils.parse("<customer:CustomerKey xmlns:customer=\"http://example.org/customer\">Fault#123456789</customer:CustomerKey>"); wsdl1Param = DOMUtils.parse("<definitions xmlns=\"http://schemas.xmlsoap.org/wsdl/\">insert WSDL 1.1 here!</definitions>");

17 years, 11 months

1
0
0 / 0

JBossWS SVN: r2133 - branches.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-26 06:05:09 -0500 (Fri, 26 Jan 2007) New Revision: 2133 Removed: branches/jbossws-1.2.0/ Log: Recreate branch 1.2.0

17 years, 11 months

1
0
0 / 0

JBossWS SVN: r2132 - in trunk: build/ant-import and 29 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-26 05:59:18 -0500 (Fri, 26 Jan 2007) New Revision: 2132 Added: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace/ trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace/server.xml trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml trunk/jbossws-core/src/main/resources/samples/common/tests-jboss-excludes.txt trunk/jbossws-core/src/main/resources/samples/common/tests-tomcat-excludes.txt Removed: trunk/build/hudson/hudson-home/jobs/AS-5.x/ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/JBossWS-TRUNK/ trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace/server.xml trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml Modified: trunk/build/ant-import/build-hudson.xml trunk/build/ant-import/build-samples.xml trunk/build/ant-import/build-setup.xml trunk/build/ant.properties.example trunk/build/hudson/hudson-home/config.xml trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml trunk/build/hudson/hudson-home/jobs/TC-5.5/config.xml trunk/build/version.properties trunk/integration-tomcat/build.xml trunk/jbossws-core/src/main/resources/samples/ant.properties.example trunk/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml trunk/jbossws-core/src/main/resources/samples/common/imported-build.xml trunk/jbossws-tests/build.xml trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt Log: Merge hudson setup from branch Modified: trunk/build/ant-import/build-hudson.xml =================================================================== --- trunk/build/ant-import/build-hudson.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/ant-import/build-hudson.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -66,6 +66,9 @@ <exec executable="basename" outputproperty="svn.basename"> <arg value="${svn.url}"/> </exec> + <exec executable="dirname" outputproperty="svn.basedir.local"> + <arg value="${basedir}"/> + </exec>  <copy todir="${hudson.home}" overwrite="true"> @@ -74,6 +77,7 @@ </fileset> <filterset> <filter token="version.id" value="${version.id}"/> + <filter token="svn.basedir.local" value="${svn.basedir.local}"/> <filter token="svn.basename" value="${svn.basename}"/> <filter token="svn.url" value="${svn.url}"/> <filter token="hudson.home" value="${hudson.home}"/> Modified: trunk/build/ant-import/build-samples.xml =================================================================== --- trunk/build/ant-import/build-samples.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/ant-import/build-samples.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -67,6 +67,7 @@ </copy> <copy todir="${build.src.samples.dir}/common/resources"> <fileset dir="${core.samples.dir}/common"> + <include name="tests-*-excludes.txt"/> <include name="jndi.properties"/> <include name="log4j.xml"/> </fileset> Modified: trunk/build/ant-import/build-setup.xml =================================================================== --- trunk/build/ant-import/build-setup.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/ant-import/build-setup.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -59,6 +59,7 @@ <property name="tomcat.webapps.dir" value="${tomcat.home}/webapps"/> <property name="tomcat.common.dir" value="${tomcat.home}/common"/> + <property name="tomcat.common.lib" value="${tomcat.home}/common/lib"/> <available property="jboss50.available" file="${jboss50.client}/jboss-client.jar"/> <available property="jboss42.available" file="${jboss42.client}/jboss-client.jar"/> Modified: trunk/build/ant.properties.example =================================================================== --- trunk/build/ant.properties.example 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/ant.properties.example 2007-01-26 10:59:18 UTC (rev 2132) @@ -19,27 +19,7 @@ tomcat.manager.username=manager tomcat.manager.password=manager -<<<<<<< .working # Hudson QA Environment -hudson.root=/home/tdiesler/workspac -hudson.port=8180 - -hudson.jdk15=/usr/java/jdk1.5 -hudson.jdk14=/usr/java/jdk1.4 - -hudson.jboss50.build=jboss-5.0.0.Beta2 -hudson.jboss42.build=jboss-4.2.0.CR1 -hudson.jboss40.build=jboss-4.0.5.SP1 - -hudson.jboss50.rev=HEAD -hudson.jboss42.rev=HEAD -hudson.jboss40.rev=HEAD - -hudson.mail.recipients=thomas.diesler(a)jboss.com -hudson.smtp.host=pobox-2.corp.redhat.com - -======= -# Hudson QA Environment hudson.root=/home/tdiesler/workspace hudson.port=8180 @@ -57,7 +37,6 @@ hudson.mail.recipients=thomas.diesler(a)jboss.com hudson.smtp.host=pobox-2.corp.redhat.com ->>>>>>> .merge-rechts.r2111 # JBoss Repository #jboss.repository=file:/home/tdiesler/cvs/jboss.local.repository jboss.repository=http://repository.jboss.com Modified: trunk/build/hudson/hudson-home/config.xml =================================================================== --- trunk/build/hudson/hudson-home/config.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/hudson/hudson-home/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -2,11 +2,136 @@ <hudson> <numExecutors>1</numExecutors> <useSecurity>false</useSecurity> - <systemMessage></systemMessage> <jdks/> <slaves/> <quietPeriod>5</quietPeriod> - <views/> + <views> + +  + <view> + <owner reference="../../.."/> + <jobNames class="tree-set"> + <no-comparator/> + <string>JBAS-Tests-AS-4.0</string> + <string>JBAS-Tests-AS-4.0-jdk14</string> + <string>JBAS-Tests-AS-4.2</string> + <string>JBAS-Tests-AS-5.0</string> + </jobNames> + <name>JBossAS Testsuite</name> + <description> +<![CDATA[ + Run the JBossAS webservice testsuite. + + Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a> +]]> + </description> + </view> + +  + <view> + <owner reference="../../.."/> + <jobNames class="tree-set"> + <no-comparator/> + <string>JBWS-Local-Sanity-AS-5.0</string> + <string>JBWS-Local-Sanity-AS-4.2</string> + <string>JBWS-Local-Tests-AS-5.0</string> + <string>JBWS-Local-Tests-AS-4.2</string> + </jobNames> + <name>JBossWS Local Testsuite</name> + <description> +<![CDATA[ + Run the JBossWS local testsuite. + + Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a> +]]> + </description> + </view> + +  + <view> + <owner reference="../../.."/> + <jobNames class="tree-set"> + <no-comparator/> + <string>JBWS-Tests-AS-4.0</string> + <string>JBWS-Tests-AS-4.0-jdk14</string> + <string>JBWS-Tests-AS-4.2</string> + <string>JBWS-Tests-AS-5.0</string> + <string>JBWS-Tests-TC-5.5</string> + </jobNames> + <name>JBossWS Testsuite</name> + <description> +<![CDATA[ + Run the JBossWS testsuite. + + Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a> +]]> + </description> + </view> + +  + <view> + <owner reference="../../.."/> + <jobNames class="tree-set"> + <no-comparator/> + <string>JBWS-Samples-AS-4.0</string> + <string>JBWS-Samples-AS-4.0-jdk14</string> + <string>JBWS-Samples-AS-4.2</string> + <string>JBWS-Samples-AS-5.0</string> + <string>JBWS-Samples-TC-5.5</string> + </jobNames> + <name>JBossWS Samples</name> + <description> +<![CDATA[ + Run the JBossWS samples. + + Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a> +]]> + </description> + </view> + +  + <view> + <owner reference="../../.."/> + <jobNames class="tree-set"> + <no-comparator/> + <string>Release-Matrix-Step1</string> + <string>Release-Matrix-Step2</string> + </jobNames> + <name>Release QA</name> + <description> +<![CDATA[ +A collection of jobs that covers the JBossWS release matrix. + +<table border=1> +<tr><th> </th><th>JBWS-Tests</th><th>JBAS-Tests</th><th>JBWS-Samples</th></tr> +<tr align=center><th align=left>AS-5.0</th><td>ok</td><td>ok</td><td>ok</td></tr> +<tr align=center><th align=left>AS-4.2</th><td>ok</td><td>ok</td><td>ok</td></tr> +<tr align=center><th align=left>AS-4.0</th><td>ok</td><td>ok</td><td>ok</td></tr> +<tr align=center><th align=left>AS-4.0-jdk14</th><td>ok</td><td>ok</td><td>N/A</td></tr> +<tr align=center><th align=left>TC-5.5</th><td>ok</td><td>ok</td><td>ok</td></tr> +</table> +]]> + </description> + </view> + +  + <view> + <owner reference="../../.."/> + <jobNames class="tree-set"> + <no-comparator/> + <string>AS-4.0</string> + <string>AS-4.0-jdk14</string> + <string>AS-4.2</string> + <string>AS-5.0</string> + <string>TC-5.5</string> + </jobNames> + <name>Target Container</name> + <description> +<![CDATA[ + Build the supported target container. A successful build is a prerequisite for any testrun that targets the container. +]]> + </description> + </view> + + </views> </hudson> \ No newline at end of file Modified: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -1,4 +1,3 @@ -<<<<<<< .working <?xml version='1.0' encoding='UTF-8'?> <project> <builders class="vector"> @@ -51,92 +50,6 @@ # # copy the test reports # -rm -f $WORKSPACE/test-reports/* -cp ./output/reports/*.xml $WORKSPACE/test-reports - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop -</command> - </hudson.tasks.Shell> - </builders> - <publishers class="vector"> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults>test-reports/*.xml</testResults> - </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> - <recipients>@hudson.mail.recipients@</recipients> - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> - </publishers> - <buildWrappers class="vector"/> - <scm class="hudson.scm.SubversionSCM"> - <modules>@svn.url@</modules> - <useUpdate>true</useUpdate> - </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> - <description>Run the AS-4.0 webservice testsuite agains jbossws-(a)version.id@</description> - <keepDependencies>false</keepDependencies> - <properties/> - <actions class="vector"/> -</project>======= -<?xml version='1.0' encoding='UTF-8'?> -<project> - <builders class="vector"> - <hudson.tasks.Shell> - <command> -# -# Module settings -# -MODULE=JBAS-Tests-AS-4.0 -SVNBASENAME=(a)svn.basename@ -WORKSPACE=`pwd` -SVNBASEDIR=$WORKSPACE/(a)svn.basename@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3 -ENVIRONMENT="-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE" - -# -# copy ant.properties -# -cd $SVNBASEDIR/build -cp ant.properties.example ant.properties - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop - -# -# deploy to jboss -# -cd $SVNBASEDIR/build -ant $ENVIRONMENT deploy-jboss40 - -# -# build the testsuite -# -cd $JBOSS_INSTANCE/../../../testsuite -./build.sh clean main - -# -# start jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start - -# -# execute tests -# -./build.sh tests-webservice tests-report 2>&1 | tee $WORKSPACE/tests.out -cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u - -# -# copy the test reports -# rm -rf $WORKSPACE/test-reports mkdir $WORKSPACE/test-reports cp -r ./output/reports/*.xml $WORKSPACE/test-reports @@ -171,4 +84,4 @@ <keepDependencies>false</keepDependencies> <properties/> <actions class="vector"/> -</project>>>>>>>> .merge-rechts.r2111 +</project> \ No newline at end of file Modified: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -1,4 +1,3 @@ -<<<<<<< .working <?xml version='1.0' encoding='UTF-8'?> <project> <builders class="vector"> @@ -53,94 +52,6 @@ # # copy the test reports # -rm -f $WORKSPACE/test-reports/* -cp ./output/reports/*.xml $WORKSPACE/test-reports - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop -</command> - </hudson.tasks.Shell> - </builders> - <publishers class="vector"> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults>test-reports/*.xml</testResults> - </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> - <recipients>@hudson.mail.recipients@</recipients> - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> - </publishers> - <buildWrappers class="vector"/> - <scm class="hudson.scm.SubversionSCM"> - <modules>@svn.url@</modules> - <useUpdate>true</useUpdate> - </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> - <description>Run the AS-4.0 webservice testsuite agains jbossws-(a)version.id@</description> - <keepDependencies>false</keepDependencies> - <properties/> - <actions class="vector"/> -</project>======= -<?xml version='1.0' encoding='UTF-8'?> -<project> - <builders class="vector"> - <hudson.tasks.Shell> - <command> -# -# Module settings -# -MODULE=JBAS-Tests-AS-4.0-jdk14 -SVNBASENAME=(a)svn.basename@ -WORKSPACE=`pwd` -SVNBASEDIR=$WORKSPACE/(a)svn.basename@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0-jdk14/workspace/Branch_4_0/build/output/(a)hudson.jboss40.build@ -ENVIRONMENT="-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE" - -# -# copy ant.properties -# -cd $SVNBASEDIR/build -cp ant.properties.example ant.properties - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop - -# -# deploy to jboss -# -cd $SVNBASEDIR/build -ant $ENVIRONMENT deploy-jboss40-jdk14 - -export JAVA_HOME=(a)hudson.jdk14@ - -# -# build the testsuite -# -cd $JBOSS_INSTANCE/../../../testsuite -./build.sh clean main - -# -# start jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start - -# -# execute tests -# -./build.sh tests-webservice tests-report 2>&1 | tee $WORKSPACE/tests.out -cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u - -# -# copy the test reports -# rm -rf $WORKSPACE/test-reports mkdir $WORKSPACE/test-reports cp -r ./output/reports/*.xml $WORKSPACE/test-reports @@ -175,4 +86,4 @@ <keepDependencies>false</keepDependencies> <properties/> <actions class="vector"/> -</project>>>>>>>> .merge-rechts.r2111 +</project> \ No newline at end of file Modified: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -1,4 +1,3 @@ -<<<<<<< .working <?xml version='1.0' encoding='UTF-8'?> <project> <builders class="vector"> @@ -51,92 +50,6 @@ # # copy the test reports # -rm -f $WORKSPACE/test-reports/* -cp ./output/reports/*.xml $WORKSPACE/test-reports - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop -</command> - </hudson.tasks.Shell> - </builders> - <publishers class="vector"> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults>test-reports/*.xml</testResults> - </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> - <recipients>@hudson.mail.recipients@</recipients> - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> - </publishers> - <buildWrappers class="vector"/> - <scm class="hudson.scm.SubversionSCM"> - <modules>@svn.url@</modules> - <useUpdate>true</useUpdate> - </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> - <description>Run the AS-4.2 webservice testsuite agains jbossws-(a)version.id@</description> - <keepDependencies>false</keepDependencies> - <properties/> - <actions class="vector"/> -</project>======= -<?xml version='1.0' encoding='UTF-8'?> -<project> - <builders class="vector"> - <hudson.tasks.Shell> - <command> -# -# Module settings -# -MODULE=JBAS-Tests-AS-4.2 -SVNBASENAME=(a)svn.basename@ -WORKSPACE=`pwd` -SVNBASEDIR=$WORKSPACE/(a)svn.basename@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 -ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" - -# -# copy ant.properties -# -cd $SVNBASEDIR/build -cp ant.properties.example ant.properties - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop - -# -# deploy to jboss -# -cd $SVNBASEDIR/build -ant $ENVIRONMENT deploy-jboss42 - -# -# build the testsuite -# -cd $JBOSS_INSTANCE/../../../testsuite -./build.sh clean main - -# -# start jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start - -# -# execute tests -# -./build.sh tests-webservice tests-report 2>&1 | tee $WORKSPACE/tests.out -cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u - -# -# copy the test reports -# rm -rf $WORKSPACE/test-reports mkdir $WORKSPACE/test-reports cp -r ./output/reports/*.xml $WORKSPACE/test-reports @@ -171,4 +84,4 @@ <keepDependencies>false</keepDependencies> <properties/> <actions class="vector"/> -</project>>>>>>>> .merge-rechts.r2111 +</project> \ No newline at end of file Modified: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -1,4 +1,3 @@ -<<<<<<< .working <?xml version='1.0' encoding='UTF-8'?> <project> <builders class="vector"> @@ -51,92 +50,6 @@ # # copy the test reports # -rm -f $WORKSPACE/test-reports/* -cp ./output/reports/*.xml $WORKSPACE/test-reports - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop -</command> - </hudson.tasks.Shell> - </builders> - <publishers class="vector"> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults>test-reports/*.xml</testResults> - </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> - <recipients>@hudson.mail.recipients@</recipients> - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> - </publishers> - <buildWrappers class="vector"/> - <scm class="hudson.scm.SubversionSCM"> - <modules>@svn.url@</modules> - <useUpdate>true</useUpdate> - </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> - <description>Run the AS-5.0 webservice testsuite agains jbossws-(a)version.id@</description> - <keepDependencies>false</keepDependencies> - <properties/> - <actions class="vector"/> -</project>======= -<?xml version='1.0' encoding='UTF-8'?> -<project> - <builders class="vector"> - <hudson.tasks.Shell> - <command> -# -# Module settings -# -MODULE=JBAS-Tests-AS-5.0 -SVNBASENAME=(a)svn.basename@ -WORKSPACE=`pwd` -SVNBASEDIR=$WORKSPACE/(a)svn.basename@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ -ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE" - -# -# copy ant.properties -# -cd $SVNBASEDIR/build -cp ant.properties.example ant.properties - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop - -# -# deploy to jboss -# -cd $SVNBASEDIR/build -ant $ENVIRONMENT deploy-jboss50 - -# -# build the testsuite -# -cd $JBOSS_INSTANCE/../../../testsuite -./build.sh clean main - -# -# start jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start - -# -# execute tests -# -./build.sh tests-webservice tests-report 2>&1 | tee $WORKSPACE/tests.out -cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u - -# -# copy the test reports -# rm -rf $WORKSPACE/test-reports mkdir $WORKSPACE/test-reports cp -r ./output/reports/*.xml $WORKSPACE/test-reports @@ -171,4 +84,4 @@ <keepDependencies>false</keepDependencies> <properties/> <actions class="vector"/> -</project>>>>>>>> .merge-rechts.r2111 +</project> \ No newline at end of file Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2 (from rev 2129, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2) Deleted: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml 2007-01-26 08:50:02 UTC (rev 2129) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -1,77 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<project> - <builders class="vector"> - <hudson.tasks.Shell> - <command> -# -# Module settings -# -MODULE=JBWS-Local-Sanity-AS-4.2 -SVNBASENAME=(a)svn.basename@ -WORKSPACE=`pwd` -SVNBASEDIR=(a)svn.basedir.local@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 -ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop - -# -# deploy to jboss -# -cd $SVNBASEDIR/build -ant $ENVIRONMENT deploy-jboss42 - -# -# start jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start - -# -# execute tests -# -cd $SVNBASEDIR/jbossws-tests -ant $ENVIRONMENT main tests-samples 2>&1 | tee $WORKSPACE/tests.out -cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u - -# -# copy the test reports -# -rm -rf $WORKSPACE/test-reports -mkdir $WORKSPACE/test-reports -cp -r @svn.basedir.local(a)/jbossws-tests/output/reports/*.xml $WORKSPACE/test-reports - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop -</command> - </hudson.tasks.Shell> - </builders> - <publishers class="vector"> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults>test-reports/*.xml</testResults> - </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> - <recipients>@hudson.mail.recipients@</recipients> - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> - </publishers> - <buildWrappers class="vector"/> - <scm class="hudson.scm.NullSCM"/> - <canRoam>true</canRoam> - <disabled>false</disabled> - <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> - <description> - Build and test the local jbossws-(a)version.id@ against AS-4.2 - - Local SVN dir: @svn.basedir.local@ - </description> - <keepDependencies>false</keepDependencies> - <properties/> - <actions class="vector"/> -</project> \ No newline at end of file Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml (from rev 2129, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml) =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml (rev 0) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -0,0 +1,77 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=JBWS-Local-Sanity-AS-4.2 +SVNBASENAME=(a)svn.basename@ +WORKSPACE=`pwd` +SVNBASEDIR=(a)svn.basedir.local@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 +ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" + +# +# stop jbossas +# +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop + +# +# deploy to jboss +# +cd $SVNBASEDIR/build +ant $ENVIRONMENT deploy-jboss42 + +# +# start jbossas +# +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start + +# +# execute tests +# +cd $SVNBASEDIR/jbossws-tests +ant $ENVIRONMENT main tests-samples 2>&1 | tee $WORKSPACE/tests.out +cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u + +# +# copy the test reports +# +rm -rf $WORKSPACE/test-reports +mkdir $WORKSPACE/test-reports +cp -r @svn.basedir.local(a)/jbossws-tests/output/reports/*.xml $WORKSPACE/test-reports + +# +# stop jbossas +# +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>test-reports/*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients>@hudson.mail.recipients@</recipients> + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>false</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.NullSCM"/> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <description> + Build and test the local jbossws-(a)version.id@ against AS-4.2 + + Local SVN dir: @svn.basedir.local@ + </description> + <keepDependencies>false</keepDependencies> + <properties/> + <actions class="vector"/> +</project> \ No newline at end of file Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0 (from rev 2129, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0) Deleted: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml 2007-01-26 08:50:02 UTC (rev 2129) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -1,77 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<project> - <builders class="vector"> - <hudson.tasks.Shell> - <command> -# -# Module settings -# -MODULE=JBWS-Local-Sanity-AS-5.0 -SVNBASENAME=(a)svn.basename@ -WORKSPACE=`pwd` -SVNBASEDIR=(a)svn.basedir.local@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ -ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE" - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop - -# -# deploy to jboss -# -cd $SVNBASEDIR/build -ant $ENVIRONMENT deploy-jboss50 - -# -# start jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start - -# -# execute tests -# -cd $SVNBASEDIR/jbossws-tests -ant $ENVIRONMENT main tests-samples 2>&1 | tee $WORKSPACE/tests.out -cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u - -# -# copy the test reports -# -rm -rf $WORKSPACE/test-reports -mkdir $WORKSPACE/test-reports -cp -r @svn.basedir.local(a)/jbossws-tests/output/reports/*.xml $WORKSPACE/test-reports - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop -</command> - </hudson.tasks.Shell> - </builders> - <publishers class="vector"> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults>test-reports/*.xml</testResults> - </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> - <recipients>@hudson.mail.recipients@</recipients> - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> - </publishers> - <buildWrappers class="vector"/> - <scm class="hudson.scm.NullSCM"/> - <canRoam>true</canRoam> - <disabled>false</disabled> - <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> - <description> - Build and test the local jbossws-(a)version.id@ against AS-5.0 - - Local SVN dir: @svn.basedir.local@ - </description> - <keepDependencies>false</keepDependencies> - <properties/> - <actions class="vector"/> -</project> \ No newline at end of file Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml (from rev 2129, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml) =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml (rev 0) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -0,0 +1,77 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=JBWS-Local-Sanity-AS-5.0 +SVNBASENAME=(a)svn.basename@ +WORKSPACE=`pwd` +SVNBASEDIR=(a)svn.basedir.local@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ +ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE" + +# +# stop jbossas +# +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop + +# +# deploy to jboss +# +cd $SVNBASEDIR/build +ant $ENVIRONMENT deploy-jboss50 + +# +# start jbossas +# +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start + +# +# execute tests +# +cd $SVNBASEDIR/jbossws-tests +ant $ENVIRONMENT main tests-samples 2>&1 | tee $WORKSPACE/tests.out +cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u + +# +# copy the test reports +# +rm -rf $WORKSPACE/test-reports +mkdir $WORKSPACE/test-reports +cp -r @svn.basedir.local(a)/jbossws-tests/output/reports/*.xml $WORKSPACE/test-reports + +# +# stop jbossas +# +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>test-reports/*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients>@hudson.mail.recipients@</recipients> + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>false</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.NullSCM"/> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <description> + Build and test the local jbossws-(a)version.id@ against AS-5.0 + + Local SVN dir: @svn.basedir.local@ + </description> + <keepDependencies>false</keepDependencies> + <properties/> + <actions class="vector"/> +</project> \ No newline at end of file Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2 (from rev 2129, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2) Deleted: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml 2007-01-26 08:50:02 UTC (rev 2129) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -1,77 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<project> - <builders class="vector"> - <hudson.tasks.Shell> - <command> -# -# Module settings -# -MODULE=JBWS-Local-Tests-AS-4.2 -SVNBASENAME=(a)svn.basename@ -WORKSPACE=`pwd` -SVNBASEDIR=(a)svn.basedir.local@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 -ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop - -# -# deploy to jboss -# -cd $SVNBASEDIR/build -ant $ENVIRONMENT clean deploy-jboss42 - -# -# start jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start - -# -# execute tests -# -cd $SVNBASEDIR/jbossws-tests -ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out -cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u - -# -# copy the test reports -# -rm -rf $WORKSPACE/test-reports -mkdir $WORKSPACE/test-reports -cp -r @svn.basedir.local(a)/jbossws-tests/output/reports/*.xml $WORKSPACE/test-reports - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop -</command> - </hudson.tasks.Shell> - </builders> - <publishers class="vector"> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults>test-reports/*.xml</testResults> - </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> - <recipients>@hudson.mail.recipients@</recipients> - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> - </publishers> - <buildWrappers class="vector"/> - <scm class="hudson.scm.NullSCM"/> - <canRoam>true</canRoam> - <disabled>false</disabled> - <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> - <description> - Build and test the local jbossws-(a)version.id@ against AS-4.2 - - Local SVN dir: @svn.basedir.local@ - </description> - <keepDependencies>false</keepDependencies> - <properties/> - <actions class="vector"/> -</project> \ No newline at end of file Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml (from rev 2129, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml) =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml (rev 0) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -0,0 +1,77 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=JBWS-Local-Tests-AS-4.2 +SVNBASENAME=(a)svn.basename@ +WORKSPACE=`pwd` +SVNBASEDIR=(a)svn.basedir.local@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 +ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" + +# +# stop jbossas +# +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop + +# +# deploy to jboss +# +cd $SVNBASEDIR/build +ant $ENVIRONMENT clean deploy-jboss42 + +# +# start jbossas +# +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start + +# +# execute tests +# +cd $SVNBASEDIR/jbossws-tests +ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out +cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u + +# +# copy the test reports +# +rm -rf $WORKSPACE/test-reports +mkdir $WORKSPACE/test-reports +cp -r @svn.basedir.local(a)/jbossws-tests/output/reports/*.xml $WORKSPACE/test-reports + +# +# stop jbossas +# +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>test-reports/*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients>@hudson.mail.recipients@</recipients> + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>false</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.NullSCM"/> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <description> + Build and test the local jbossws-(a)version.id@ against AS-4.2 + + Local SVN dir: @svn.basedir.local@ + </description> + <keepDependencies>false</keepDependencies> + <properties/> + <actions class="vector"/> +</project> \ No newline at end of file Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0 (from rev 2129, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0) Deleted: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml 2007-01-26 08:50:02 UTC (rev 2129) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -1,77 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<project> - <builders class="vector"> - <hudson.tasks.Shell> - <command> -# -# Module settings -# -MODULE=JBWS-Local-Tests-AS-5.0 -SVNBASENAME=(a)svn.basename@ -WORKSPACE=`pwd` -SVNBASEDIR=(a)svn.basedir.local@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ -ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE" - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop - -# -# deploy to jboss -# -cd $SVNBASEDIR/build -ant $ENVIRONMENT clean deploy-jboss50 - -# -# start jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start - -# -# execute tests -# -cd $SVNBASEDIR/jbossws-tests -ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out -cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u - -# -# copy the test reports -# -rm -rf $WORKSPACE/test-reports -mkdir $WORKSPACE/test-reports -cp -r @svn.basedir.local(a)/jbossws-tests/output/reports/*.xml $WORKSPACE/test-reports - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop -</command> - </hudson.tasks.Shell> - </builders> - <publishers class="vector"> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults>test-reports/*.xml</testResults> - </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> - <recipients>@hudson.mail.recipients@</recipients> - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> - </publishers> - <buildWrappers class="vector"/> - <scm class="hudson.scm.NullSCM"/> - <canRoam>true</canRoam> - <disabled>false</disabled> - <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> - <description> - Build and test the local jbossws-(a)version.id@ against AS-5.0 - - Local SVN dir: @svn.basedir.local@ - </description> - <keepDependencies>false</keepDependencies> - <properties/> - <actions class="vector"/> -</project> \ No newline at end of file Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml (from rev 2129, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml) =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml (rev 0) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -0,0 +1,77 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=JBWS-Local-Tests-AS-5.0 +SVNBASENAME=(a)svn.basename@ +WORKSPACE=`pwd` +SVNBASEDIR=(a)svn.basedir.local@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ +ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE" + +# +# stop jbossas +# +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop + +# +# deploy to jboss +# +cd $SVNBASEDIR/build +ant $ENVIRONMENT clean deploy-jboss50 + +# +# start jbossas +# +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start + +# +# execute tests +# +cd $SVNBASEDIR/jbossws-tests +ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out +cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u + +# +# copy the test reports +# +rm -rf $WORKSPACE/test-reports +mkdir $WORKSPACE/test-reports +cp -r @svn.basedir.local(a)/jbossws-tests/output/reports/*.xml $WORKSPACE/test-reports + +# +# stop jbossas +# +$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>test-reports/*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients>@hudson.mail.recipients@</recipients> + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>false</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.NullSCM"/> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <description> + Build and test the local jbossws-(a)version.id@ against AS-5.0 + + Local SVN dir: @svn.basedir.local@ + </description> + <keepDependencies>false</keepDependencies> + <properties/> + <actions class="vector"/> +</project> \ No newline at end of file Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -1,4 +1,3 @@ -<<<<<<< .working <?xml version='1.0' encoding='UTF-8'?> <project> <builders class="vector"> @@ -32,85 +31,6 @@ # # build jbossws samples # -ant $ENVIRONMENT clean build-samples - -# -# start jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start - -# -# execute samples -# -cd $SVNBASEDIR/build/output/jbossws-samples-(a)version.id@ -cp ant.properties.example ant.properties -ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out -cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop -</command> - </hudson.tasks.Shell> - </builders> - <publishers class="vector"> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults>@svn.basename@/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml</testResults> - </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> - <recipients>@hudson.mail.recipients@</recipients> - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> - </publishers> - <buildWrappers class="vector"/> - <scm class="hudson.scm.SubversionSCM"> - <modules>@svn.url@</modules> - <useUpdate>true</useUpdate> - </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> - <description>Build and test jbossws-(a)version.id@ against AS-4.0</description> - <keepDependencies>false</keepDependencies> - <properties/> - <actions class="vector"/> -</project>======= -<?xml version='1.0' encoding='UTF-8'?> -<project> - <builders class="vector"> - <hudson.tasks.Shell> - <command> -# -# Module settings -# -MODULE=JBWS-Samples-AS-4.0 -WORKSPACE=`pwd` -SVNBASEDIR=$WORKSPACE/(a)svn.basename@ -JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3 -JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 -JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ -TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat -ENVIRONMENT="-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE" - -JBOSS_INSTANCE=$JBOSS40_INSTANCE - -# -# copy ant.properties -# -cd $SVNBASEDIR/build -cp ant.properties.example ant.properties - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop - -# -# build jbossws samples -# ant $ENVIRONMENT clean deploy-jboss40 build-samples # @@ -156,4 +76,4 @@ <keepDependencies>false</keepDependencies> <properties/> <actions class="vector"/> -</project>>>>>>>> .merge-rechts.r2111 +</project> \ No newline at end of file Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -1,4 +1,3 @@ -<<<<<<< .working <?xml version='1.0' encoding='UTF-8'?> <project> <builders class="vector"> @@ -32,85 +31,6 @@ # # build jbossws samples # -ant $ENVIRONMENT clean build-samples - -# -# start jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start - -# -# execute samples -# -cd $SVNBASEDIR/build/output/jbossws-samples-(a)version.id@ -cp ant.properties.example ant.properties -ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out -cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop -</command> - </hudson.tasks.Shell> - </builders> - <publishers class="vector"> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults>@svn.basename@/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml</testResults> - </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> - <recipients>@hudson.mail.recipients@</recipients> - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> - </publishers> - <buildWrappers class="vector"/> - <scm class="hudson.scm.SubversionSCM"> - <modules>@svn.url@</modules> - <useUpdate>true</useUpdate> - </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> - <description>Build and test jbossws-(a)version.id@ against AS-4.2</description> - <keepDependencies>false</keepDependencies> - <properties/> - <actions class="vector"/> -</project>======= -<?xml version='1.0' encoding='UTF-8'?> -<project> - <builders class="vector"> - <hudson.tasks.Shell> - <command> -# -# Module settings -# -MODULE=JBWS-Samples-AS-4.2 -WORKSPACE=`pwd` -SVNBASEDIR=$WORKSPACE/(a)svn.basename@ -JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3 -JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 -JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ -TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat -ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE" - -JBOSS_INSTANCE=$JBOSS42_INSTANCE - -# -# copy ant.properties -# -cd $SVNBASEDIR/build -cp ant.properties.example ant.properties - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop - -# -# build jbossws samples -# ant $ENVIRONMENT clean deploy-jboss42 build-samples # @@ -156,4 +76,4 @@ <keepDependencies>false</keepDependencies> <properties/> <actions class="vector"/> -</project>>>>>>>> .merge-rechts.r2111 +</project> \ No newline at end of file Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -1,4 +1,3 @@ -<<<<<<< .working <?xml version='1.0' encoding='UTF-8'?> <project> <builders class="vector"> @@ -32,85 +31,6 @@ # # build jbossws samples # -ant $ENVIRONMENT clean build-samples - -# -# start jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start - -# -# execute samples -# -cd $SVNBASEDIR/build/output/jbossws-samples-(a)version.id@ -cp ant.properties.example ant.properties -ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out -cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop -</command> - </hudson.tasks.Shell> - </builders> - <publishers class="vector"> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults>@svn.basename@/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml</testResults> - </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> - <recipients>@hudson.mail.recipients@</recipients> - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> - </publishers> - <buildWrappers class="vector"/> - <scm class="hudson.scm.SubversionSCM"> - <modules>@svn.url@</modules> - <useUpdate>true</useUpdate> - </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> - <description>Build and test jbossws-(a)version.id@ against AS-5.0</description> - <keepDependencies>false</keepDependencies> - <properties/> - <actions class="vector"/> -</project>======= -<?xml version='1.0' encoding='UTF-8'?> -<project> - <builders class="vector"> - <hudson.tasks.Shell> - <command> -# -# Module settings -# -MODULE=JBWS-Samples-AS-5.0 -WORKSPACE=`pwd` -SVNBASEDIR=$WORKSPACE/(a)svn.basename@ -JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3 -JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 -JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ -TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat -ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE" - -JBOSS_INSTANCE=$JBOSS50_INSTANCE - -# -# copy ant.properties -# -cd $SVNBASEDIR/build -cp ant.properties.example ant.properties - -# -# stop jbossas -# -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop - -# -# build jbossws samples -# ant $ENVIRONMENT clean deploy-jboss50 build-samples # @@ -156,4 +76,4 @@ <keepDependencies>false</keepDependencies> <properties/> <actions class="vector"/> -</project>>>>>>>> .merge-rechts.r2111 +</project> \ No newline at end of file Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -1,4 +1,3 @@ -<<<<<<< .working <?xml version='1.0' encoding='UTF-8'?> <project> <builders class="vector"> @@ -10,79 +9,6 @@ MODULE=JBWS-Samples-TC-5.5 WORKSPACE=`pwd` SVNBASEDIR=$WORKSPACE/(a)svn.basename@ -TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat -ENVIRONMENT="-Djbossws.integration.target=tomcat -Dtomcat.home=$TOMCAT_INSTANCE" - -# -# copy ant.properties -# -cd $SVNBASEDIR/build -cp ant.properties.example ant.properties - -# -# stop tomcat -# -$TOMCAT_INSTANCE/bin/catalina.sh stop - -# -# deploy to jboss -# -ant $ENVIRONMENT clean deploy-tomcat - -# -# start jbossas -# -$TOMCAT_INSTANCE/bin/catalina.sh start -sleep 10 - -# -# execute tests -# -cd $SVNBASEDIR/jbossws-tests -ant $ENVIRONMENT tests-samples - -# -# stop tomcat -# -$TOMCAT_INSTANCE/bin/catalina.sh stop -</command> - </hudson.tasks.Shell> - </builders> - <publishers class="vector"> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults>@svn.basename(a)/jbossws-tests/output/reports/*.xml</testResults> - </hudson.tasks.junit.JUnitResultArchiver> - <hudson.tasks.Mailer> - <recipients>@hudson.mail.recipients@</recipients> - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> - </publishers> - <buildWrappers class="vector"/> - <scm class="hudson.scm.SubversionSCM"> - <modules>@svn.url@</modules> - <useUpdate>true</useUpdate> - </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> - <description>Build and test jbossws-(a)version.id@ against TC-5.5</description> - <keepDependencies>false</keepDependencies> - <properties/> - <actions class="vector"/> -</project>======= -<?xml version='1.0' encoding='UTF-8'?> -<project> - <builders class="vector"> - <hudson.tasks.Shell> - <command> -# -# Module settings -# -MODULE=JBWS-Samples-TC-5.5 -WORKSPACE=`pwd` -SVNBASEDIR=$WORKSPACE/(a)svn.basename@ JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3 JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ @@ -148,4 +74,4 @@ <keepDependencies>false</keepDependencies> <properties/> <actions class="vector"/> -</project>>>>>>>> .merge-rechts.r2111 +</project> \ No newline at end of file Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -38,7 +38,7 @@ # execute tests # cd $SVNBASEDIR/jbossws-tests -ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out +ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -40,7 +40,7 @@ # execute tests # cd $SVNBASEDIR/jbossws-tests -ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out +ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -38,7 +38,7 @@ # execute tests # cd $SVNBASEDIR/jbossws-tests -ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out +ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -38,7 +38,7 @@ # execute tests # cd $SVNBASEDIR/jbossws-tests -ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out +ant $ENVIRONMENT tests 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -39,7 +39,7 @@ # execute tests # cd $SVNBASEDIR/jbossws-tests -ant $ENVIRONMENT clean tests-samples 2>&1 | tee $WORKSPACE/tests.out +ant $ENVIRONMENT clean main tests-samples 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -14,7 +14,7 @@ <disabled>false</disabled> <enableRemoteTrigger>false</enableRemoteTrigger> <triggers class="vector"/> - <description>Build the relase matrix target container</description> + <description>Build the relase matrix target containers.</description> <keepDependencies>false</keepDependencies> <properties/> <actions class="vector"/> Modified: trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -1,4 +1,3 @@ -<<<<<<< .working <?xml version='1.0' encoding='UTF-8'?> <project> <builders class="vector"/> @@ -7,29 +6,6 @@ <childProjects> JBWS-Tests-AS-5.0, JBWS-Tests-AS-4.2, JBWS-Tests-AS-4.0, JBWS-Tests-AS-4.0-jdk14, JBWS-Tests-TC-5.5, JBAS-Tests-AS-5.0, JBAS-Tests-AS-4.2, JBAS-Tests-AS-4.0, JBAS-Tests-AS-4.0-jdk14, - JBWS-Samples-AS-5.0, JBWS-Samples-AS-4.2, JBWS-Samples-AS-4.0, JBWS-Samples-AS-4.0-jdk14, JBWS-Samples-TC-5.5 - </childProjects> - </hudson.tasks.BuildTrigger> - </publishers> - <buildWrappers class="vector"/> - <scm class="hudson.scm.NullSCM"/> - <canRoam>true</canRoam> - <disabled>false</disabled> - <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> - <description>Run the entire JBossWS relase matrix</description> - <keepDependencies>false</keepDependencies> - <properties/> - <actions class="vector"/> -</project>======= -<?xml version='1.0' encoding='UTF-8'?> -<project> - <builders class="vector"/> - <publishers class="vector"> - <hudson.tasks.BuildTrigger> - <childProjects> - JBWS-Tests-AS-5.0, JBWS-Tests-AS-4.2, JBWS-Tests-AS-4.0, JBWS-Tests-AS-4.0-jdk14, JBWS-Tests-TC-5.5, - JBAS-Tests-AS-5.0, JBAS-Tests-AS-4.2, JBAS-Tests-AS-4.0, JBAS-Tests-AS-4.0-jdk14, JBWS-Samples-AS-5.0, JBWS-Samples-AS-4.2, JBWS-Samples-AS-4.0, JBWS-Samples-TC-5.5 </childProjects> </hudson.tasks.BuildTrigger> @@ -44,4 +20,4 @@ <keepDependencies>false</keepDependencies> <properties/> <actions class="vector"/> -</project>>>>>>>> .merge-rechts.r2111 +</project> \ No newline at end of file Modified: trunk/build/hudson/hudson-home/jobs/TC-5.5/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/TC-5.5/config.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/hudson/hudson-home/jobs/TC-5.5/config.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -7,16 +7,22 @@ # Module settings # MODULE=TC-5.5 -HUDSON_HOME=(a)hudson.home@ WORKSPACE=`pwd` # # copy tomcat installation # -cp -r $HUDSON_HOME/../apache-tomcat $WORKSPACE -rm -rf $WORKSPACE/apache-tomcat/webapps/hudson.war +rm -rf $WORKSPACE/apache-tomcat +cp -r @hudson.home@/../apache-tomcat $WORKSPACE +rm -rf $WORKSPACE/apache-tomcat/webapps/hudson* rm -rf $WORKSPACE/apache-tomcat/work rm -rf $WORKSPACE/apache-tomcat/temp + +# +# copy tomcat config +# +cp $WORKSPACE/server.xml $WORKSPACE/apache-tomcat/conf +cp $WORKSPACE/tomcat-users.xml $WORKSPACE/apache-tomcat/conf </command> </hudson.tasks.Shell> </builders> Copied: trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace (from rev 2129, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/workspace) Deleted: trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace/server.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/workspace/server.xml 2007-01-26 08:50:02 UTC (rev 2129) +++ trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace/server.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -1,52 +0,0 @@ - -<Server port="8006" shutdown="SHUTDOWN"> - -  - <Listener className="org.apache.catalina.core.AprLifecycleListener"/> - <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"/> - <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"/> - <Listener className="org.apache.catalina.storeconfig.StoreConfigLifecycleListener"/> - -  - <GlobalNamingResources> - -  - <Environment name="simpleValue" type="java.lang.Integer" value="30"/> - -  - <Resource name="UserDatabase" auth="Container" type="org.apache.catalina.UserDatabase" description="User database that can be updated and saved" - factory="org.apache.catalina.users.MemoryUserDatabaseFactory" pathname="conf/tomcat-users.xml"/> - - </GlobalNamingResources> - -  - <Service name="Catalina"> - -  - <Connector port="8080" maxHttpHeaderSize="8192" maxThreads="150" minSpareThreads="25" maxSpareThreads="75" enableLookups="false" redirectPort="8443" acceptCount="100" - connectionTimeout="20000" disableUploadTimeout="true"/> - - -  - <Engine name="Catalina" defaultHost="localhost"> - -  - <Realm className="org.apache.catalina.realm.UserDatabaseRealm" resourceName="UserDatabase"/> - -  - <Host name="localhost" appBase="webapps" unpackWARs="true" autoDeploy="true" xmlValidation="false" xmlNamespaceAware="false"> - - </Host> - - </Engine> - - </Service> - -</Server> Copied: trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace/server.xml (from rev 2129, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/workspace/server.xml) =================================================================== --- trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace/server.xml (rev 0) +++ trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace/server.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -0,0 +1,52 @@ + +<Server port="8006" shutdown="SHUTDOWN"> + +  + <Listener className="org.apache.catalina.core.AprLifecycleListener"/> + <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"/> + <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"/> + <Listener className="org.apache.catalina.storeconfig.StoreConfigLifecycleListener"/> + +  + <GlobalNamingResources> + +  + <Environment name="simpleValue" type="java.lang.Integer" value="30"/> + +  + <Resource name="UserDatabase" auth="Container" type="org.apache.catalina.UserDatabase" description="User database that can be updated and saved" + factory="org.apache.catalina.users.MemoryUserDatabaseFactory" pathname="conf/tomcat-users.xml"/> + + </GlobalNamingResources> + +  + <Service name="Catalina"> + +  + <Connector port="8080" maxHttpHeaderSize="8192" maxThreads="150" minSpareThreads="25" maxSpareThreads="75" enableLookups="false" redirectPort="8443" acceptCount="100" + connectionTimeout="20000" disableUploadTimeout="true"/> + + +  + <Engine name="Catalina" defaultHost="localhost"> + +  + <Realm className="org.apache.catalina.realm.UserDatabaseRealm" resourceName="UserDatabase"/> + +  + <Host name="localhost" appBase="webapps" unpackWARs="true" autoDeploy="true" xmlValidation="false" xmlNamespaceAware="false"> + + </Host> + + </Engine> + + </Service> + +</Server> Deleted: trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml 2007-01-26 08:50:02 UTC (rev 2129) +++ trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -1,5 +0,0 @@ -<?xml version='1.0' encoding='utf-8'?> -<tomcat-users> - <role rolename="manager"/> - <user username="manager" password="manager" roles="manager"/> -</tomcat-users> Copied: trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml (from rev 2129, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml) =================================================================== --- trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml (rev 0) +++ trunk/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -0,0 +1,5 @@ +<?xml version='1.0' encoding='utf-8'?> +<tomcat-users> + <role rolename="manager"/> + <user username="manager" password="manager" roles="manager"/> +</tomcat-users> Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/build/version.properties 2007-01-26 10:59:18 UTC (rev 2132) @@ -5,8 +5,8 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-2.0 -version.id=1.2.0.GA -repository.id=1.2.0.GA +version.id=2.0.0.CR3 +repository.id=snapshot implementation.title=JBoss Web Services (JBossWS) implementation.url=http://www.jboss.org/products/jbossws Modified: trunk/integration-tomcat/build.xml =================================================================== --- trunk/integration-tomcat/build.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/integration-tomcat/build.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -144,12 +144,12 @@ <include name="xercesImpl.jar"/> </fileset> </copy> - <copy todir="${tomcat.common.dir}/lib" overwrite="true"> + <copy todir="${tomcat.common.lib}" overwrite="true"> <fileset dir="${core.output.lib.dir}"> + <include name="jbossws-core.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> </fileset> <fileset dir="${tomcat.output.lib.dir}"> <include name="jbossws-tomcat-integration.jar"/> Modified: trunk/jbossws-core/src/main/resources/samples/ant.properties.example =================================================================== --- trunk/jbossws-core/src/main/resources/samples/ant.properties.example 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/jbossws-core/src/main/resources/samples/ant.properties.example 2007-01-26 10:59:18 UTC (rev 2132) @@ -14,8 +14,8 @@ # Tomcat Home tomcat.home=/usr/java/tomcat -#tomcat.manager.username=manager -#tomcat.manager.password=manager +tomcat.manager.username=manager +tomcat.manager.password=manager # Force thirdparty HTTP get #force.thirdparty.get=true Modified: trunk/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml =================================================================== --- trunk/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -71,6 +71,7 @@ <pathelement location="${lib.dir}/jboss-jaxws.jar"/> <pathelement location="${lib.dir}/jboss-saaj.jar"/> <pathelement location="${lib.dir}/jbossws-client.jar"/> + <pathelement location="${lib.dir}/jbossws-tomcat-integration.jar"/> </path> <path id="compile.classpath"> Modified: trunk/jbossws-core/src/main/resources/samples/common/imported-build.xml =================================================================== --- trunk/jbossws-core/src/main/resources/samples/common/imported-build.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/jbossws-core/src/main/resources/samples/common/imported-build.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -37,19 +37,19 @@ </condition>  - <condition property="jbossws.integration.target.jboss"> + <condition property="integration.target.jboss"> <isset property="jboss.home"/> </condition> - <condition property="jbossws.integration.target.tomcat"> + <condition property="integration.target.tomcat"> <equals arg1="${jbossws.integration.target}" arg2="tomcat"/> </condition>  <condition property="endorsed.dirs" value="${jboss.home}/lib/endorsed"> - <isset property="jbossws.integration.target.jboss"/> + <isset property="integration.target.jboss"/> </condition> <condition property="endorsed.dirs" value="${tomcat.home}/common/endorsed"> - <isset property="jbossws.integration.target.tomcat"/> + <isset property="integration.target.tomcat"/> </condition>  - <target name="check-jboss"> + <target name="check-jboss" if="integration.target.jboss"> <available property="jboss.available" file="${jboss.home}/client/jboss-client.jar"/> <fail message="JBoss not available: ${jboss.home}" unless="jboss.available"/> @@ -123,15 +123,19 @@ <property name="jboss.server.deploy" value="${jboss.server}/deploy"/> <property name="jboss.server.lib" value="${jboss.server}/lib"/> +  + <property name="excludes-short-name" value="tests-jboss-excludes.txt"/> + <property name="excludesfile" value="${common.resources}/${excludes-short-name}"/> + </target>  - <target name="check-tomcat" if="jbossws.integration.target.tomcat"> + <target name="check-tomcat" if="integration.target.tomcat"> <available property="tomcat.available" file="${tomcat.home}/server/lib/catalina.jar"/> <condition property="cannot.use.tomcat"> <and> - <isset property="jbossws.integration.target.tomcat"/> + <isset property="integration.target.tomcat"/> <not> <isset property="tomcat.available"/> </not> @@ -139,12 +143,16 @@ </condition> <fail message="Tomcat not available: ${tomcat.home}" if="cannot.use.tomcat"/> +  + <property name="excludes-short-name" value="tests-tomcat-excludes.txt"/> + <property name="excludesfile" value="${common.resources}/${excludes-short-name}"/> + </target>  <target name="compile" depends="init,thirdparty" description="compile the sources"> - <javac destdir="${build.tests.dir}/classes" classpathref="compile.classpath" debug="on"> + <javac destdir="${build.tests.dir}/classes" classpathref="compile.classpath" debug="on" excludesfile="${excludesfile}"> <src path="${common.java}"/> <src path="${java.dir}"/> </javac> Copied: trunk/jbossws-core/src/main/resources/samples/common/tests-jboss-excludes.txt (from rev 2129, branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/tests-jboss-excludes.txt) =================================================================== --- trunk/jbossws-core/src/main/resources/samples/common/tests-jboss-excludes.txt (rev 0) +++ trunk/jbossws-core/src/main/resources/samples/common/tests-jboss-excludes.txt 2007-01-26 10:59:18 UTC (rev 2132) @@ -0,0 +1,2 @@ + +# Nothing to exclude Copied: trunk/jbossws-core/src/main/resources/samples/common/tests-tomcat-excludes.txt (from rev 2129, branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/tests-tomcat-excludes.txt) =================================================================== --- trunk/jbossws-core/src/main/resources/samples/common/tests-tomcat-excludes.txt (rev 0) +++ trunk/jbossws-core/src/main/resources/samples/common/tests-tomcat-excludes.txt 2007-01-26 10:59:18 UTC (rev 2132) @@ -0,0 +1,16 @@ + +# EJB/Injection excludes +org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.* +org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.* +org/jboss/test/ws/jaxrpc/samples/secureejb/*TestCase.* +org/jboss/test/ws/jaxws/samples/jsr181ejb/** +org/jboss/test/ws/jaxws/samples/retail/** + +# JBoss excludes +org/jboss/test/ws/jaxrpc/samples/dynamichandler/*TestCase.* +org/jboss/test/ws/jaxrpc/samples/wsbpel/** + +# TODO: Why are these excluded +# [JBWS-1471] - Remove unwanted tomcat excludes +org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.* +org/jboss/test/ws/jaxws/samples/wseventing/** Modified: trunk/jbossws-tests/build.xml =================================================================== --- trunk/jbossws-tests/build.xml 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/jbossws-tests/build.xml 2007-01-26 10:59:18 UTC (rev 2132) @@ -128,12 +128,13 @@ </condition>  - <condition property="excludes-short-name" value="tests-${jbossws.integration.target}-noejb3-excludes.txt"> - <not> + <condition property="excludes-short-name" value="tests-${jbossws.integration.target}-excludes.txt"> + <or> <available file="${jboss.client}/jboss-ejb3-client.jar"/> - </not> + <isset property="integration.target.tomcat"/> + </or> </condition> - <property name="excludes-short-name" value="tests-${jbossws.integration.target}-excludes.txt"/> + <property name="excludes-short-name" value="tests-${jbossws.integration.target}-noejb3-excludes.txt"/> <property name="excludesfile" value="${tests.resources.dir}/${excludes-short-name}"/> <echo/> @@ -150,7 +151,9 @@  - <target name="init" depends="prepare,thirdparty"> + <target name="init" depends="prepare,jboss-classpath,tomcat-classpath"/> + + <target name="common-classpath" depends="prepare,thirdparty">  <path id="jbossws.jars.classpath"> @@ -179,7 +182,9 @@ <pathelement location="${thirdparty.dir}/xmlunit1.0.jar"/> <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> </path> - + </target> + + <target name="jboss-classpath" depends="common-classpath" if="jbossws.integration.target.jboss">  <path id="test.client.classpath"> <path refid="jbossws.jars.classpath"/> @@ -200,6 +205,16 @@ </path> </target> + <target name="tomcat-classpath" depends="common-classpath" if="jbossws.integration.target.tomcat"> +  + <path id="test.client.classpath"> + <path refid="jbossws.jars.classpath"/> + <pathelement location="${tomcat.common.lib}/jbossws-thirdparty.jar"/> + <path refid="javac.classpath"/> + </path> + </target> + +    Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java 2007-01-26 10:59:18 UTC (rev 2132) @@ -23,23 +23,31 @@ // $Id: SysmonTestCase.java 1994 2007-01-18 12:54:34Z heiko.braun(a)jboss.com $ +import java.io.File; +import java.net.URISyntaxException; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; +import javax.xml.ws.addressing.AddressingProperties; + import junit.framework.Test; + import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.StubExt; import org.jboss.ws.extensions.addressing.AddressingClientUtil; import org.jboss.ws.extensions.eventing.EventingConstants; -import org.jboss.ws.extensions.eventing.jaxws.*; -import org.jboss.ws.core.StubExt; +import org.jboss.ws.extensions.eventing.jaxws.DeliveryType; +import org.jboss.ws.extensions.eventing.jaxws.EventSourceEndpoint; +import org.jboss.ws.extensions.eventing.jaxws.FilterType; +import org.jboss.ws.extensions.eventing.jaxws.GetStatus; +import org.jboss.ws.extensions.eventing.jaxws.Subscribe; +import org.jboss.ws.extensions.eventing.jaxws.SubscribeResponse; +import org.jboss.ws.extensions.eventing.jaxws.SubscriptionManagerEndpoint; +import org.jboss.ws.extensions.eventing.jaxws.Unsubscribe; -import javax.naming.InitialContext; -import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; -import javax.xml.ws.addressing.AddressingProperties; -import java.io.File; -import java.net.URISyntaxException; -import java.net.URL; - /** * Test the eventing example service. * @@ -69,23 +77,15 @@ if (subscriptionPort == null || managementPort == null) { - if (isTargetJBoss()) - { - URL wsdlURL = new File("resources/jaxws/samples/wseventing/WEB-INF/wsdl/sysmon.wsdl").toURL(); - QName defaultServiceName = new QName("http://schemas.xmlsoap.org/ws/2004/08/eventing", "EventingService"); + URL wsdlURL = new File("resources/jaxws/samples/wseventing/WEB-INF/wsdl/sysmon.wsdl").toURL(); + QName defaultServiceName = new QName("http://schemas.xmlsoap.org/ws/2004/08/eventing", "EventingService"); - Service service = Service.create(wsdlURL, defaultServiceName); - subscriptionPort = (EventSourceEndpoint)service.getPort(EventSourceEndpoint.class); - managementPort = (SubscriptionManagerEndpoint)service.getPort(SubscriptionManagerEndpoint.class); + Service service = Service.create(wsdlURL, defaultServiceName); + subscriptionPort = (EventSourceEndpoint)service.getPort(EventSourceEndpoint.class); + managementPort = (SubscriptionManagerEndpoint)service.getPort(SubscriptionManagerEndpoint.class); - ((StubExt)subscriptionPort).setConfigName("Standard WSAddressing Client"); - ((StubExt)managementPort).setConfigName("Standard WSAddressing Client"); - } - else - { - - throw new IllegalArgumentException("JBossAS is the only supported target"); - } + ((StubExt)subscriptionPort).setConfigName("Standard WSAddressing Client"); + ((StubExt)managementPort).setConfigName("Standard WSAddressing Client"); } } @@ -103,12 +103,9 @@ */ public void testUnsubscribe() throws Exception { - SubscribeResponse subscribeResponse = doSubscribe(null); //SysmonUtil.printSubscriptionDetails(subscribeResponse); - String subscriptionID = subscribeResponse.getSubscriptionId(); - // addressing correlation AddressingProperties unsubscribeProps = SysmonUtil.buildFollowupProperties(subscribeResponse, EventingConstants.UNSUBSCRIBE_ACTION, eventSourceURI); SysmonUtil.setRequestProperties((BindingProvider)managementPort, unsubscribeProps); @@ -117,9 +114,12 @@ AddressingProperties getStatusProps = SysmonUtil.buildFollowupProperties(subscribeResponse, EventingConstants.GET_STATUS_ACTION, eventSourceURI); SysmonUtil.setRequestProperties((BindingProvider)managementPort, getStatusProps); - try { + try + { managementPort.getStatusOp(new GetStatus()); - } catch (Exception e) { + } + catch (Exception e) + { // Ignore return; } Modified: trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt =================================================================== --- trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-01-26 10:55:16 UTC (rev 2131) +++ trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-01-26 10:59:18 UTC (rev 2132) @@ -1,12 +1,24 @@ +# Always excludes +org/jboss/test/ws/interop/** org/jboss/test/ws/jaxrpc/benchmark/** +org/jboss/test/ws/jaxws/benchmark/** + +# EJB/Injection excludes org/jboss/test/ws/jaxrpc/jbws1011/** -org/jboss/test/ws/jaxrpc/samples/dynamichandler/** -org/jboss/test/ws/jaxrpc/samples/jmstransport/** -org/jboss/test/ws/jaxrpc/samples/jsr109ejb/** -org/jboss/test/ws/jaxrpc/samples/secureejb/** -org/jboss/test/ws/jaxrpc/samples/wsbpel/** -org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.* -org/jboss/test/ws/jaxws/context/WebServiceContextEJBTestCase* +org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.* +org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.* +org/jboss/test/ws/jaxrpc/samples/secureejb/*TestCase.* +org/jboss/test/ws/jaxws/context/WebServiceContextEJBTestCase.* org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.* org/jboss/test/ws/jaxws/samples/jsr181ejb/** org/jboss/test/ws/jaxws/samples/retail/** +org/jboss/test/ws/jaxws/webserviceref/** + +# JBoss excludes +org/jboss/test/ws/jaxrpc/samples/dynamichandler/*TestCase.* +org/jboss/test/ws/jaxrpc/samples/wsbpel/** + +# TODO: Why are these excluded +# [JBWS-1471] - Remove unwanted tomcat excludes +org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.* +org/jboss/test/ws/jaxws/samples/wseventing/**

17 years, 11 months

1
0
0 / 0

JBossWS SVN: r2131 - trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-01-26 05:55:16 -0500 (Fri, 26 Jan 2007) New Revision: 2131 Removed: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/ServiceDecorator.java Log: Remove stale code Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/ServiceDecorator.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/ServiceDecorator.java 2007-01-26 10:55:00 UTC (rev 2130) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/ServiceDecorator.java 2007-01-26 10:55:16 UTC (rev 2131) @@ -1,121 +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.metadata.umdm.EndpointMetaData; -import org.jboss.ws.core.StubExt; - -import javax.xml.namespace.QName; -import javax.xml.ws.EndpointReference; -import javax.xml.ws.Service; -import javax.xml.ws.WebServiceFeature; -import javax.xml.ws.spi.ServiceDelegate; -import java.net.URL; -import java.util.HashMap; -import java.util.Map; - -/** - * Acts as a wrapper between clients and the JAX-WS API. - * Allows additional, propriatary API to be injected and core API calls - * to be decorated. - * - * @author Heiko.Braun(a)jboss.org - * @version $Id$ - * @since 21.12.2006 - */ -public class ServiceDecorator extends Service { - - public final static String CLIENT_CONF_NAME = "org.jboss.ws.jaxws.client.configName"; - public final static String CLIENT_CONF_FILE = "org.jboss.ws.jaxws.client.configFile"; - - private Map<String, Object> props = new HashMap<String, Object>(); - - private ServiceDelegate serviceDelegate; - - private Map getProps() - { - return props; - } - - public void setProperty(String key, Object value) - { - props.put(key, value); - } - - public Object getProperty(String key) - { - return props.get(key); - } - - public static ServiceDecorator newInstance(URL wsdlDocumentLocation, QName serviceName) - { - return new ServiceDecorator(wsdlDocumentLocation, serviceName); - } - - // ---------------------------------------------------------------------------- - // intercepted javax.xml.ws.Service invocations - - protected ServiceDecorator(URL wsdlDocumentLocation, QName serviceName) { - super(wsdlDocumentLocation, serviceName); - } - - public <T> T getPort(Class<T> serviceEndpointInterface) { - T port = super.getPort(serviceEndpointInterface); - decorateConfig((StubExt)port); - return port; - } - - public <T> T getPort(QName portName, Class<T> serviceEndpointInterface) { - T port = super.getPort(portName, serviceEndpointInterface); - decorateConfig((StubExt)port); - return port; - } - - public <T> T getPort(QName portName, Class<T> serviceEndpointInterface, WebServiceFeature... features) { - T port = super.getPort(portName, serviceEndpointInterface, features); - decorateConfig((StubExt)port); - return port; - } - - public <T> T getPort(Class<T> serviceEndpointInterface, WebServiceFeature... features) { - T port = super.getPort(serviceEndpointInterface, features); - decorateConfig((StubExt)port); - return port; - } - - public <T> T getPort(EndpointReference endpointReference, Class<T> serviceEndpointInterface, WebServiceFeature... features) { - T port = super.getPort(endpointReference, serviceEndpointInterface, features); - decorateConfig((StubExt)port); - return port; - } - - private void decorateConfig(StubExt stub) { - - EndpointMetaData epMetaData = stub.getEndpointMetaData(); - - if(props.containsKey(CLIENT_CONF_NAME)) - epMetaData.setConfigName((String)props.get(CLIENT_CONF_NAME)); - if(props.containsKey(CLIENT_CONF_FILE)) - epMetaData.setConfigFile((String)props.get(CLIENT_CONF_FILE)); - - } -}

17 years, 11 months

1
0
0 / 0

JBossWS SVN: r2130 - trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-01-26 05:55:00 -0500 (Fri, 26 Jan 2007) New Revision: 2130 Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java Log: Only force reconfiguration when the name changes. Simplify EMPD hirarchy Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java 2007-01-26 08:50:02 UTC (rev 2129) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java 2007-01-26 10:55:00 UTC (rev 2130) @@ -39,37 +39,14 @@ public ClientEndpointMetaData(ServiceMetaData service, QName qname, QName portTypeName, Type type) { super(service, qname, portTypeName, type); - } + super.configName = ConfigurationProvider.DEFAULT_CLIENT_CONFIG_NAME; - public String getConfigName() - { - String configName = super.getConfigName(); - if (configName == null) - { - configName = ConfigurationProvider.DEFAULT_CLIENT_CONFIG_NAME; - setConfigName(configName); - } - return configName; + if (type == Type.JAXRPC) + super.configFile = ConfigurationProvider.DEFAULT_JAXRPC_CLIENT_CONFIG_FILE; + else + super.configFile = ConfigurationProvider.DEFAULT_JAXWS_CLIENT_CONFIG_FILE; } - public String getConfigFile() - { - String configFile = super.getConfigFile(); - if (configFile == null) - { - if (getType() == Type.JAXRPC) - { - configFile = ConfigurationProvider.DEFAULT_JAXRPC_CLIENT_CONFIG_FILE; - } - else - { - configFile = ConfigurationProvider.DEFAULT_JAXWS_CLIENT_CONFIG_FILE; - } - setConfigFile(configFile); - } - return configFile; - } - public String toString() { StringBuilder buffer = new StringBuilder("\nClientEndpointMetaData:"); 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-01-26 08:50:02 UTC (rev 2129) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-01-26 10:55:00 UTC (rev 2130) @@ -90,9 +90,9 @@ // The REQUIRED name of the WSDL interface/portType private QName portTypeName; // The REQUIRED config-name - private String configName; + protected String configName; // The REQUIRED config-file - private String configFile; + protected String configFile; // The endpoint address private String endpointAddress; // The endpoint interface name @@ -645,7 +645,7 @@ public String getConfigFile() { - return configFile; + return this.configFile; } public void setConfigFile(String configFile) @@ -656,18 +656,23 @@ public String getConfigName() { - return configName; + return this.configName; } public void setConfigName(String configName) { - this.configName = configName; - this.config = null; + if(null == configName) + throw new IllegalArgumentException("Invalid config name: " + configName); - // notify observers - log.debug("Reconfiguration forced"); - this.configObservable.touch(); - this.configObservable.notifyObservers(configName); + if( !configName.equals(this.configName) ) + { + this.configName = configName; + this.config = null; + + // notify observers + log.debug("Reconfiguration forced, new config is '"+configName+"'"); + this.configObservable.doNotify(configName); + } } public List<Class> getRegisteredTypes() @@ -680,9 +685,10 @@ } class ConfigObservable extends Observable { - public void touch() - { + + public void doNotify(Object object) { setChanged(); - }; + notifyObservers(object); + } } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2007-01-26 08:50:02 UTC (rev 2129) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2007-01-26 10:55:00 UTC (rev 2130) @@ -66,6 +66,12 @@ public ServerEndpointMetaData(ServiceMetaData service, QName portName, QName portTypeName, Type type) { super(service, portName, portTypeName, type); + super.configName = ConfigurationProvider.DEFAULT_ENDPOINT_CONFIG_NAME; + + if (type == Type.JAXRPC) + configFile = ConfigurationProvider.DEFAULT_JAXRPC_ENDPOINT_CONFIG_FILE; + else + configFile = ConfigurationProvider.DEFAULT_JAXWS_ENDPOINT_CONFIG_FILE; } public String getLinkName() @@ -174,34 +180,6 @@ this.managedEndpointBean = managedEndpointBean; } - public String getConfigName() { - String configName = super.getConfigName(); - if (configName == null) - { - configName = ConfigurationProvider.DEFAULT_ENDPOINT_CONFIG_NAME; - setConfigName(configName); - } - return configName; - } - - public String getConfigFile() { - String configFile = super.getConfigFile(); - - if (configFile == null) - { - if (getType() == Type.JAXRPC) - { - configFile = ConfigurationProvider.DEFAULT_JAXRPC_ENDPOINT_CONFIG_FILE; - } - else - { - configFile = ConfigurationProvider.DEFAULT_JAXWS_ENDPOINT_CONFIG_FILE; - } - setConfigFile(configFile); - } - return configFile; - } - public String toString() { StringBuilder buffer = new StringBuilder("\nServerEndpointMetaData:");

17 years, 11 months

1
0
0 / 0

JBossWS SVN: r2129 - in branches/jbossws-1.2.0/build/hudson/hudson-home/jobs: JBWS-Local-Sanity-AS-5.0 and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-26 03:50:02 -0500 (Fri, 26 Jan 2007) New Revision: 2129 Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml Log: Add main to sanity test build Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml 2007-01-26 08:47:18 UTC (rev 2128) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml 2007-01-26 08:50:02 UTC (rev 2129) @@ -33,7 +33,7 @@ # execute tests # cd $SVNBASEDIR/jbossws-tests -ant $ENVIRONMENT tests-samples 2>&1 | tee $WORKSPACE/tests.out +ant $ENVIRONMENT main tests-samples 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml 2007-01-26 08:47:18 UTC (rev 2128) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml 2007-01-26 08:50:02 UTC (rev 2129) @@ -33,7 +33,7 @@ # execute tests # cd $SVNBASEDIR/jbossws-tests -ant $ENVIRONMENT tests-samples 2>&1 | tee $WORKSPACE/tests.out +ant $ENVIRONMENT main tests-samples 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u #

17 years, 11 months

1
0
0 / 0

JBossWS SVN: r2128 - branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-26 03:47:18 -0500 (Fri, 26 Jan 2007) New Revision: 2128 Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml Log: Fix jboss42.build Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml 2007-01-26 08:44:34 UTC (rev 2127) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml 2007-01-26 08:47:18 UTC (rev 2128) @@ -10,7 +10,7 @@ SVNBASENAME=(a)svn.basename@ WORKSPACE=`pwd` SVNBASEDIR=(a)svn.basedir.local@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss50.build(a)-ejb3 +JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" #

17 years, 11 months

1
0
0 / 0

JBossWS SVN: r2127 - in branches/jbossws-1.2.0/build/hudson/hudson-home: jobs and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-26 03:44:34 -0500 (Fri, 26 Jan 2007) New Revision: 2127 Added: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/ Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml Log: Add sanity tests-samples AS-4.2 Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml 2007-01-26 08:42:36 UTC (rev 2126) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml 2007-01-26 08:44:34 UTC (rev 2127) @@ -32,8 +32,8 @@ <owner reference="../../.."/> <jobNames class="tree-set"> <no-comparator/> - <string>JBWS-Local-Sanity-JAXWS-AS-5.0</string> - <string>JBWS-Local-Sanity-JAXRPC-AS-5.0</string> + <string>JBWS-Local-Sanity-AS-5.0</string> + <string>JBWS-Local-Sanity-AS-4.2</string> <string>JBWS-Local-Tests-AS-5.0</string> <string>JBWS-Local-Tests-AS-4.2</string> </jobNames> Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2 (from rev 2126, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0) Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml 2007-01-26 08:42:36 UTC (rev 2126) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml 2007-01-26 08:44:34 UTC (rev 2127) @@ -6,12 +6,12 @@ # # Module settings # -MODULE=JBWS-Local-Sanity-AS-5.0 +MODULE=JBWS-Local-Sanity-AS-4.2 SVNBASENAME=(a)svn.basename@ WORKSPACE=`pwd` SVNBASEDIR=(a)svn.basedir.local@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ -ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE" +JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss50.build(a)-ejb3 +ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" # # stop jbossas @@ -22,7 +22,7 @@ # deploy to jboss # cd $SVNBASEDIR/build -ant $ENVIRONMENT deploy-jboss50 +ant $ENVIRONMENT deploy-jboss42 # # start jbossas @@ -67,7 +67,7 @@ <enableRemoteTrigger>false</enableRemoteTrigger> <triggers class="vector"/> <description> - Build and test the local jbossws-(a)version.id@ against AS-5.0 + Build and test the local jbossws-(a)version.id@ against AS-4.2 Local SVN dir: @svn.basedir.local@ </description>

17 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits January 2007