JBossWS SVN: r14704 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-07-19 06:02:00 -0400 (Tue, 19 Jul 2011)
New Revision: 14704
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
updating excludes
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-07-19 09:57:12 UTC (rev 14703)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-07-19 10:02:00 UTC (rev 14704)
@@ -1041,7 +1041,7 @@
<!-- TODO: tests using org.jboss.ejb3.client.ClientLauncher -->
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
- <!-- # [JBWS-3234] JNDI over RMI not available on AS7 -->
+ <!-- # [AS7-1338] Remote JNDI support for AS7 -->
<exclude>org/jboss/test/ws/jaxrpc/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/serviceref/**</exclude>
13 years, 6 months
JBossWS SVN: r14703 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-07-19 05:57:12 -0400 (Tue, 19 Jul 2011)
New Revision: 14703
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
update excludes
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-07-19 09:05:46 UTC (rev 14702)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-07-19 09:57:12 UTC (rev 14703)
@@ -828,7 +828,7 @@
<!-- JAXR not available -->
<exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
- <!-- # [JBWS-3234] JNDI over RMI not available on AS7 -->
+ <!-- # [AS7-1338] Remote JNDI support for AS7 -->
<exclude>org/jboss/test/ws/jaxrpc/**</exclude>
<exclude>org/jboss/test/ws/benchmark/jaxrpc/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude>
13 years, 6 months
JBossWS SVN: r14702 - spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/publish.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-07-19 05:05:46 -0400 (Tue, 19 Jul 2011)
New Revision: 14702
Added:
spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/publish/Context.java
Modified:
spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/publish/EndpointPublisher.java
Log:
Updating spi for supporting deployment of multiple endpoints in the same context
Added: spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/publish/Context.java
===================================================================
--- spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/publish/Context.java (rev 0)
+++ spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/publish/Context.java 2011-07-19 09:05:46 UTC (rev 14702)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
+ * as indicated by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * 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,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.wsf.spi.publish;
+
+import java.util.List;
+
+import org.jboss.wsf.spi.deployment.Endpoint;
+
+public class Context {
+ private final String context;
+ private final List<Endpoint> endpoints;
+
+ public Context(String context, List<Endpoint> endpoints) {
+ this.endpoints = endpoints;
+ this.context = context;
+ }
+
+ public String getContext() {
+ return context;
+ }
+
+ public List<Endpoint> getEndpoints() {
+ return endpoints;
+ }
+}
Modified: spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/publish/EndpointPublisher.java
===================================================================
--- spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/publish/EndpointPublisher.java 2011-07-19 09:05:22 UTC (rev 14701)
+++ spi/branches/asoldano/src/main/java/org/jboss/wsf/spi/publish/EndpointPublisher.java 2011-07-19 09:05:46 UTC (rev 14702)
@@ -18,7 +18,7 @@
*/
package org.jboss.wsf.spi.publish;
-import org.jboss.wsf.spi.deployment.Endpoint;
+import java.util.Map;
/**
* EndpointPublisher defines the interface for facilities allowing to publish/destroy
@@ -28,7 +28,7 @@
*/
public interface EndpointPublisher
{
- public Endpoint publish(String className, ClassLoader loader, String context, String urlPattern) throws Exception;
+ public Context publish(String contextRoot, ClassLoader loader, Map<String, String> urlPatternToClassNameMap) throws Exception;
- public void destroy(Endpoint endpoint) throws Exception;
+ public void destroy(Context context) throws Exception;
}
13 years, 6 months
JBossWS SVN: r14701 - shared-testsuite/branches/asoldano/testsuite/src/test/java/org/jboss/test/ws/publish.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-07-19 05:05:22 -0400 (Tue, 19 Jul 2011)
New Revision: 14701
Added:
shared-testsuite/branches/asoldano/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl2.java
Modified:
shared-testsuite/branches/asoldano/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java
Log:
Updating testcase for deployment of multiple endpoints in the same context
Added: shared-testsuite/branches/asoldano/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl2.java
===================================================================
--- shared-testsuite/branches/asoldano/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl2.java (rev 0)
+++ shared-testsuite/branches/asoldano/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl2.java 2011-07-19 09:05:22 UTC (rev 14701)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.test.ws.publish;
+
+import javax.jws.WebService;
+
+import org.jboss.logging.Logger;
+
+@WebService(serviceName="EndpointService", portName="EndpointPort", endpointInterface = "org.jboss.test.ws.publish.Endpoint")
+public class EndpointImpl2
+{
+ // Provide logging
+ private static Logger log = Logger.getLogger(EndpointImpl2.class);
+
+ public String echo(String input)
+ {
+ log.info("echo (2): " + input);
+ return input;
+ }
+}
Modified: shared-testsuite/branches/asoldano/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java
===================================================================
--- shared-testsuite/branches/asoldano/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java 2011-07-18 18:09:54 UTC (rev 14700)
+++ shared-testsuite/branches/asoldano/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java 2011-07-19 09:05:22 UTC (rev 14701)
@@ -26,9 +26,11 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.URL;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import java.util.ServiceLoader;
import javax.servlet.ServletException;
@@ -41,6 +43,7 @@
import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.publish.Context;
import org.jboss.wsf.spi.publish.EndpointPublisher;
import org.jboss.wsf.spi.publish.EndpointPublisherFactory;
@@ -58,31 +61,30 @@
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
{
- Endpoint ep = null;
+ Context ctx = null;
EndpointPublisher publisher = null;
try
{
- //deploy endpoint
+ //deploy endpoints
ClassLoader loader = ClassLoaderProvider.getDefaultProvider().getWebServiceSubsystemClassLoader();
EndpointPublisherFactory factory = ServiceLoader.load(EndpointPublisherFactory.class, loader).iterator().next();
publisher = factory.newEndpointPublisher("default-host");
- ep = publisher.publish("org.jboss.test.ws.publish.EndpointImpl", Thread.currentThread().getContextClassLoader(), "ep-publish-test", "/pattern");
- System.out.println("State: " + ep.getState());
- System.out.println("Address: " + ep.getAddress());
- System.out.println("TargetBeanClass: " + ep.getTargetBeanClass());
+ Map<String,String> map = new HashMap<String, String>();
+ map.put("/pattern", "org.jboss.test.ws.publish.EndpointImpl");
+ map.put("/pattern2", "org.jboss.test.ws.publish.EndpointImpl2");
- //call endpoint
- URL wsdlURL = new URL("http://localhost:8080/ep-publish-test/pattern?wsdl");
- QName serviceName = new QName("http://publish.ws.test.jboss.org/", "EndpointService");
- Service service = Service.create(wsdlURL, serviceName);
- org.jboss.test.ws.publish.Endpoint port = service.getPort(org.jboss.test.ws.publish.Endpoint.class);
- String result = port.echo("Foo");
- if (!"Foo".equals(result))
- {
- throw new Exception("Expected 'Foo' but got '" + result + "'");
+ ctx = publisher.publish("ep-publish-test", Thread.currentThread().getContextClassLoader(), map);
+ for (Endpoint ep : ctx.getEndpoints()) {
+ System.out.println("State: " + ep.getState());
+ System.out.println("Address: " + ep.getAddress());
+ System.out.println("TargetBeanClass: " + ep.getTargetBeanClass());
}
+ //call endpoint
+ invoke(new URL("http://localhost:8080/ep-publish-test/pattern?wsdl"));
+ invoke(new URL("http://localhost:8080/ep-publish-test/pattern2?wsdl"));
+
res.getWriter().print("1");
}
catch (Exception e)
@@ -92,12 +94,12 @@
}
finally
{
- if (ep != null && publisher != null)
+ if (ctx != null && publisher != null)
{
try
{
- //undeploy endpoint
- publisher.destroy(ep);
+ //undeploy endpoints
+ publisher.destroy(ctx);
}
catch (Exception e)
{
@@ -107,4 +109,15 @@
}
}
}
+
+ private static void invoke(URL wsdlURL) throws Exception {
+ QName serviceName = new QName("http://publish.ws.test.jboss.org/", "EndpointService");
+ Service service = Service.create(wsdlURL, serviceName);
+ org.jboss.test.ws.publish.Endpoint port = service.getPort(org.jboss.test.ws.publish.Endpoint.class);
+ String result = port.echo("Foo");
+ if (!"Foo".equals(result))
+ {
+ throw new Exception("Expected 'Foo' but got '" + result + "'");
+ }
+ }
}
13 years, 6 months
JBossWS SVN: r14700 - in common/trunk/src/main: java/org/jboss/ws/common/monitoring and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-07-18 14:09:54 -0400 (Mon, 18 Jul 2011)
New Revision: 14700
Added:
common/trunk/src/main/java/org/jboss/ws/common/monitoring/CommonRecordProcessorFactory.java
common/trunk/src/main/resources/
common/trunk/src/main/resources/META-INF/
common/trunk/src/main/resources/META-INF/services/
common/trunk/src/main/resources/META-INF/services/org.jboss.ws.api.monitoring.RecordProcessorFactory
Log:
[JBWS-3330] Adding jbossws-common record processor factory
Added: common/trunk/src/main/java/org/jboss/ws/common/monitoring/CommonRecordProcessorFactory.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/monitoring/CommonRecordProcessorFactory.java (rev 0)
+++ common/trunk/src/main/java/org/jboss/ws/common/monitoring/CommonRecordProcessorFactory.java 2011-07-18 18:09:54 UTC (rev 14700)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.common.monitoring;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.jboss.ws.api.monitoring.RecordProcessor;
+import org.jboss.ws.api.monitoring.RecordProcessorFactory;
+
+/**
+ * JBossWS-Common factory of record processors: includes the LogRecorder
+ * and the MemoryBufferRecorder.
+ *
+ * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a>
+ * @since 18-Jul-2011
+ */
+public class CommonRecordProcessorFactory implements RecordProcessorFactory
+{
+ public List<RecordProcessor> newRecordProcessors() {
+ List<RecordProcessor> list = new LinkedList<RecordProcessor>();
+ list.add(new LogRecorder());
+ list.add(new MemoryBufferRecorder());
+ return list;
+ }
+}
Added: common/trunk/src/main/resources/META-INF/services/org.jboss.ws.api.monitoring.RecordProcessorFactory
===================================================================
--- common/trunk/src/main/resources/META-INF/services/org.jboss.ws.api.monitoring.RecordProcessorFactory (rev 0)
+++ common/trunk/src/main/resources/META-INF/services/org.jboss.ws.api.monitoring.RecordProcessorFactory 2011-07-18 18:09:54 UTC (rev 14700)
@@ -0,0 +1 @@
+org.jboss.ws.common.monitoring.CommonRecordProcessorFactory
\ No newline at end of file
13 years, 6 months
JBossWS SVN: r14699 - api/trunk/src/main/java/org/jboss/ws/api/monitoring.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-07-18 14:09:25 -0400 (Mon, 18 Jul 2011)
New Revision: 14699
Added:
api/trunk/src/main/java/org/jboss/ws/api/monitoring/RecordProcessorFactory.java
Log:
[JBWS-3330] Adding RecordProcessorFactory
Added: api/trunk/src/main/java/org/jboss/ws/api/monitoring/RecordProcessorFactory.java
===================================================================
--- api/trunk/src/main/java/org/jboss/ws/api/monitoring/RecordProcessorFactory.java (rev 0)
+++ api/trunk/src/main/java/org/jboss/ws/api/monitoring/RecordProcessorFactory.java 2011-07-18 18:09:25 UTC (rev 14699)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.api.monitoring;
+
+import java.util.List;
+
+/**
+ * Factory of record processors
+ *
+ * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a>
+ * @since 18-Jul-2011
+ */
+public interface RecordProcessorFactory
+{
+ public List<RecordProcessor> newRecordProcessors();
+}
13 years, 6 months
JBossWS SVN: r14698 - in stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices: server/integration/main and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-07-18 14:08:44 -0400 (Mon, 18 Jul 2011)
New Revision: 14698
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml
Log:
[JBWS-3330] Fixing some dependencies
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-07-18 17:12:37 UTC (rev 14697)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-07-18 18:08:44 UTC (rev 14698)
@@ -52,7 +52,7 @@
<module name="org.jboss.logging"/>
<module name="org.jboss.common-core" />
<module name="org.jboss.ws.api" />
- <module name="org.jboss.ws.common" />
+ <module name="org.jboss.ws.common" services="import" />
<module name="org.jboss.ws.spi" />
<module name="org.picketbox" />
</dependencies>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-07-18 17:12:37 UTC (rev 14697)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-07-18 18:08:44 UTC (rev 14698)
@@ -35,7 +35,7 @@
<module name="com.sun.xml.bind" services="export" export="true"/>
<module name="org.jboss.ws.api" export="true"/>
<module name="org.jboss.ws.spi" export="true"/>
- <module name="org.jboss.ws.common" export="true"/>
+ <module name="org.jboss.ws.common" services="import" export="true"/>
<module name="org.jboss.ws.jaxws-client" services="export" export="true">
<imports>
<include path="META-INF/cxf"/>
13 years, 6 months
JBossWS SVN: r14697 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-07-18 13:12:37 -0400 (Mon, 18 Jul 2011)
New Revision: 14697
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java
Log:
[JBWS-3329] Adding handlers protocol binding filtering + moving config handlers addition just before finishing the publishing endpoint
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java 2011-07-18 09:09:48 UTC (rev 14696)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java 2011-07-18 17:12:37 UTC (rev 14697)
@@ -27,9 +27,12 @@
import java.util.List;
import java.util.Map;
import java.util.ResourceBundle;
+import java.util.StringTokenizer;
import javax.xml.namespace.QName;
import javax.xml.ws.handler.Handler;
+import javax.xml.ws.http.HTTPBinding;
+import javax.xml.ws.soap.SOAPBinding;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
@@ -58,6 +61,15 @@
private static final ResourceBundle bundle = BundleUtils.getBundle(EndpointImpl.class);
private WSDLFilePublisher wsdlPublisher;
private CommonConfig config;
+
+ private static Map<String, String> bindingIDs = new HashMap<String, String>();
+ static {
+ bindingIDs.put(SOAPBinding.SOAP11HTTP_BINDING, "##SOAP11_HTTP");
+ bindingIDs.put(SOAPBinding.SOAP12HTTP_BINDING, "##SOAP12_HTTP");
+ bindingIDs.put(SOAPBinding.SOAP11HTTP_MTOM_BINDING, "##SOAP11_HTTP_MTOM");
+ bindingIDs.put(SOAPBinding.SOAP12HTTP_MTOM_BINDING, "##SOAP12_HTTP_MTOM");
+ bindingIDs.put(HTTPBinding.HTTP_BINDING, "##XML_HTTP");
+ }
public EndpointImpl(Object implementor)
{
@@ -76,7 +88,7 @@
super.doPublish(addr);
//allow for configuration so that the wsdlPublisher can be set be the JBossWSCXFConfigurer
configureObject(this);
- sortConfigHandlers();
+ setupConfigHandlers();
//publish the wsdl to data/wsdl
publishContractToFilesystem();
}
@@ -106,17 +118,9 @@
getProperties().putAll(epConfProps);
}
}
- @SuppressWarnings("rawtypes")
- List<Handler> handlers = convertToHandlers(config.getPreHandlerChains());
- handlers.addAll(convertToHandlers(config.getPostHandlerChains()));
- if (!handlers.isEmpty())
- {
- if (getHandlers() != null)
- {
- handlers.addAll(getHandlers());
- }
- setHandlers(handlers);
- }
+ //handlers config is done later, as when this methods is called getBinding() can't
+ //be used without messing with the servlet destinations due to the endpoint address
+ //not having been rewritten yet.
}
}
@@ -126,29 +130,31 @@
List<Handler> handlers = new LinkedList<Handler>();
if (handlerChains != null && !handlerChains.isEmpty())
{
+ final String protocolBinding = bindingIDs.get(getBinding().getBindingID());
for (UnifiedHandlerChainMetaData handlerChain : handlerChains)
{
- if (handlerChain.getPortNamePattern() != null || handlerChain.getProtocolBindings() != null
- || handlerChain.getServiceNamePattern() != null)
+ if (handlerChain.getPortNamePattern() != null || handlerChain.getServiceNamePattern() != null)
{
Logger.getLogger(this.getClass()).warn(BundleUtils.getMessage(bundle, "FILTERS_NOT_SUPPORTED"));
}
- for (UnifiedHandlerMetaData uhmd : handlerChain.getHandlers())
- {
- if (uhmd.getInitParams() != null && !uhmd.getInitParams().isEmpty())
+ if (matchProtocolBinding(protocolBinding, handlerChain.getProtocolBindings())) {
+ for (UnifiedHandlerMetaData uhmd : handlerChain.getHandlers())
{
- Logger.getLogger(this.getClass()).warn(BundleUtils.getMessage(bundle, "INIT_PARAMS_NOT_SUPPORTED"));
- }
- Object h = newInstance(uhmd.getHandlerClass());
- if (h != null)
- {
- if (h instanceof Handler)
+ if (uhmd.getInitParams() != null && !uhmd.getInitParams().isEmpty())
{
- handlers.add((Handler)h);
+ Logger.getLogger(this.getClass()).warn(BundleUtils.getMessage(bundle, "INIT_PARAMS_NOT_SUPPORTED"));
}
- else
+ Object h = newInstance(uhmd.getHandlerClass());
+ if (h != null)
{
- throw new RuntimeException(BundleUtils.getMessage(bundle, "NOT_HANDLER_INSTANCE", h));
+ if (h instanceof Handler)
+ {
+ handlers.add((Handler)h);
+ }
+ else
+ {
+ throw new RuntimeException(BundleUtils.getMessage(bundle, "NOT_HANDLER_INSTANCE", h));
+ }
}
}
}
@@ -157,6 +163,19 @@
return handlers;
}
+ private static boolean matchProtocolBinding(String currentProtocolBinding, String handlerChainProtocolBindings) {
+ if (handlerChainProtocolBindings == null)
+ return true;
+ List<String> protocolBindings = new LinkedList<String>();
+ if (handlerChainProtocolBindings != null) {
+ StringTokenizer st = new StringTokenizer(handlerChainProtocolBindings, " ", false);
+ while (st.hasMoreTokens()) {
+ protocolBindings.add(st.nextToken());
+ }
+ }
+ return protocolBindings.contains(currentProtocolBinding);
+ }
+
private static Object newInstance(String className)
{
try
@@ -173,51 +192,18 @@
}
}
- /**
- * JBWS-3282: sort handlers -> [PRE][ENDPOINT][POST]
- * This is required after endpoint.doPublish() as that processes @HandlerChain
- * and adds endpoint handlers after those specified before publishing
- * (including post ones, if any).
- */
@SuppressWarnings("rawtypes")
- protected void sortConfigHandlers()
+ protected void setupConfigHandlers()
{
- if (config != null)
- {
- //we need to move POST handlers to the end of the list
- if (config.getPostHandlerChains() != null)
- {
- List<String> postHandlerNames = new LinkedList<String>();
- for (UnifiedHandlerChainMetaData uhcm : config.getPostHandlerChains())
- {
- for (UnifiedHandlerMetaData uhm : uhcm.getHandlers())
- {
- postHandlerNames.add(uhm.getHandlerClass());
- }
- }
- if (!postHandlerNames.isEmpty())
- {
- List<Handler> newHandlers = new LinkedList<Handler>();
- List<Handler> postHandlers = new LinkedList<Handler>();
- List<Handler> handlers = getBinding().getHandlerChain();
- for (Handler h : handlers)
- {
- if (postHandlerNames.contains(h.getClass().getName()))
- {
- postHandlers.add(h);
- }
- else
- {
- newHandlers.add(h);
- }
- }
- newHandlers.addAll(postHandlers);
- getBinding().setHandlerChain(newHandlers);
- }
- }
+ if (config != null) {
+ List<Handler> handlers = convertToHandlers(config.getPreHandlerChains()); //PRE
+ handlers.addAll(getBinding().getHandlerChain()); //ENDPOINT
+ handlers.addAll(convertToHandlers(config.getPostHandlerChains())); //POST
+ getBinding().setHandlerChain(handlers);
}
}
+
/**
* Publish the contract to a file using the configured wsdl publisher
*
13 years, 6 months
JBossWS SVN: r14696 - in hudson/trunk/hudson-home/jobs: NATIVE-ALL and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-07-18 05:09:48 -0400 (Mon, 18 Jul 2011)
New Revision: 14696
Added:
hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.1.0-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.1.0-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.1.0-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.1.0-SUN-JDK-6/config.xml
hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.1.0-SUN-JDK-6/
hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.1.0-SUN-JDK-6/config.xml
Modified:
hudson/trunk/hudson-home/jobs/NATIVE-ALL/config.xml
hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml
Log:
Add native jboss710 jobs
Modified: hudson/trunk/hudson-home/jobs/NATIVE-ALL/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-ALL/config.xml 2011-07-18 08:09:57 UTC (rev 14695)
+++ hudson/trunk/hudson-home/jobs/NATIVE-ALL/config.xml 2011-07-18 09:09:48 UTC (rev 14696)
@@ -15,6 +15,12 @@
, NATIVE-BINDIST-AS-7.0.0-SUN-JDK-6
, NATIVE-SRCDIST-AS-7.0.0-SUN-JDK-6
+
+, NATIVE-CORE-AS-7.1.0-SUN-JDK-6
+
+, NATIVE-BINDIST-AS-7.1.0-SUN-JDK-6
+
+, NATIVE-SRCDIST-AS-7.1.0-SUN-JDK-6
</childProjects>
<threshold>
<name>UNSTABLE</name>
Added: hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.1.0-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.1.0-SUN-JDK-6/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-7.1.0-SUN-JDK-6/config.xml 2011-07-18 09:09:48 UTC (rev 14696)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=NATIVE-BINDIST-AS-7.1.0-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=native
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-native
+TEST_OPTS=
+JBOSS_TARGET=jboss710
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.1.0/workspace/build/target/(a)hudson.jboss710.build@
+
+#
+# load test functions
+#
+. $SCRIPTS_DIR/jbossws-qa.sh
+
+#
+# execute binary distribution tests
+#
+binaryDistributionTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-native/target/jbossws-native-bin-dist/output/test-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-native-(a)version.id@ binary distribution against AS-7.1.0 with Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
Added: hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.1.0-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.1.0-SUN-JDK-6/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-7.1.0-SUN-JDK-6/config.xml 2011-07-18 09:09:48 UTC (rev 14696)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=NATIVE-CORE-AS-7.1.0-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=native
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-native
+TEST_OPTS="-Dinterop=true"
+JBOSS_TARGET=jboss710
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.1.0/workspace/build/target/(a)hudson.jboss710.build@
+
+#
+# load test functions
+#
+. $SCRIPTS_DIR/jbossws-qa.sh
+
+#
+# execute core tests
+#
+coreTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-native/**/target/surefire-reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-native-(a)version.id@ against @hudson.jboss710.build@ with Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
Modified: hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml 2011-07-18 08:09:57 UTC (rev 14695)
+++ hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml 2011-07-18 09:09:48 UTC (rev 14696)
@@ -11,6 +11,10 @@
, NATIVE-CORE-AS-7.0.0-SUN-JDK-6
, NATIVE-BINDIST-AS-7.0.0-SUN-JDK-6
+
+, NATIVE-CORE-AS-7.1.0-SUN-JDK-6
+
+, NATIVE-BINDIST-AS-7.1.0-SUN-JDK-6
</childProjects>
<threshold>
<name>UNSTABLE</name>
Added: hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.1.0-SUN-JDK-6/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.1.0-SUN-JDK-6/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-7.1.0-SUN-JDK-6/config.xml 2011-07-18 09:09:48 UTC (rev 14696)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=NATIVE-SRCDIST-AS-7.1.0-SUN-JDK-6
+
+WORKSPACE=`pwd`
+STACK_ID=native
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-native
+TEST_OPTS=
+JBOSS_TARGET=jboss710
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_CONFIG=(a)jboss.server.instance@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-7.1.0/workspace/build/target/(a)hudson.jboss710.build@
+
+#
+# load test functions
+#
+. $SCRIPTS_DIR/jbossws-qa.sh
+
+#
+# execute source distribution tests
+#
+sourceDistributionTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-native/target/jbossws-native-src-dist/modules/testsuite/**/target/surefire-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.native.url@</remote>
+ <local>stack-native</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-native-(a)version.id@ source distribution against AS-7.1.0 with Sun JDK 6</description>
+ <actions class="vector"/>
+</project>
13 years, 6 months
JBossWS SVN: r14695 - in stack/native/trunk: modules/core/src/main/scripts and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-07-18 04:09:57 -0400 (Mon, 18 Jul 2011)
New Revision: 14695
Modified:
stack/native/trunk/build.xml
stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml
stack/native/trunk/modules/dist/pom.xml
stack/native/trunk/modules/dist/src/main/distro/ant.properties.example
stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml
stack/native/trunk/modules/dist/src/main/distro/build-setup.xml
stack/native/trunk/modules/dist/src/main/distro/build.xml
stack/native/trunk/modules/testsuite/pom.xml
stack/native/trunk/pom.xml
Log:
Add jboss710 profile
Modified: stack/native/trunk/build.xml
===================================================================
--- stack/native/trunk/build.xml 2011-07-15 14:10:16 UTC (rev 14694)
+++ stack/native/trunk/build.xml 2011-07-18 08:09:57 UTC (rev 14695)
@@ -64,7 +64,11 @@
<isset property="profiles.profile.properties.jboss700.home"/>
</condition>
- <fail message="jboss home not set, use -Djboss600.home=value or -Djboss601.home=value or -Djboss700.home=value to set">
+ <condition property="jboss710.home" value="${profiles.profile.properties.jboss710.home}">
+ <isset property="profiles.profile.properties.jboss710.home"/>
+ </condition>
+
+ <fail message="jboss home not set, use -Djboss600.home=value or -Djboss601.home=value, -Djboss700.home=value or -Djboss710.home=value to set">
<condition>
<and>
<not>
@@ -76,6 +80,9 @@
<not>
<isset property="jboss700.home"/>
</not>
+ <not>
+ <isset property="jboss710.home"/>
+ </not>
</and>
</condition>
</fail>
@@ -84,6 +91,7 @@
<echo message="jboss600.home=${jboss600.home}"/>
<echo message="jboss601.home=${jboss601.home}"/>
<echo message="jboss700.home=${jboss700.home}"/>
+ <echo message="jboss710.home=${jboss710.home}"/>
</target>
<target name="init" depends="mvn-settings,prepare,os-init">
Modified: stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2011-07-15 14:10:16 UTC (rev 14694)
+++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2011-07-18 08:09:57 UTC (rev 14695)
@@ -31,6 +31,12 @@
tofile="${dest.dir}/jbossws-jboss700/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
/>
+ <copy
+ file="${src.dir}/jbossws-native-config-as7.xml"
+ tofile="${dest.dir}/jbossws-jboss710/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
+ />
+
+
</target>
</project>
Modified: stack/native/trunk/modules/dist/pom.xml
===================================================================
--- stack/native/trunk/modules/dist/pom.xml 2011-07-15 14:10:16 UTC (rev 14694)
+++ stack/native/trunk/modules/dist/pom.xml 2011-07-18 08:09:57 UTC (rev 14695)
@@ -175,6 +175,11 @@
out="${basedir}/target/exclude-file/test-excludes-jboss700.txt">
<param name="targetName" expression="jboss700" />
</xslt>
+ <xslt style="${basedir}/src/main/distro/test-exclude.xsl"
+ in="../testsuite/pom.xml"
+ out="${basedir}/target/exclude-file/test-excludes-jboss710.txt">
+ <param name="targetName" expression="jboss710" />
+ </xslt>
</tasks>
</configuration>
<goals>
Modified: stack/native/trunk/modules/dist/src/main/distro/ant.properties.example
===================================================================
--- stack/native/trunk/modules/dist/src/main/distro/ant.properties.example 2011-07-15 14:10:16 UTC (rev 14694)
+++ stack/native/trunk/modules/dist/src/main/distro/ant.properties.example 2011-07-18 08:09:57 UTC (rev 14695)
@@ -6,8 +6,9 @@
jboss600.home=(a)jboss600.home@
jboss601.home=(a)jboss601.home@
jboss700.home=(a)jboss700.home@
+jboss710.home=(a)jboss710.home@
-# The JBoss server under test. This can be [jboss600|jboss601|jboss700]
+# The JBoss server under test. This can be [jboss600|jboss601|jboss700|jboss710]
jbossws.integration.target=jboss601
# The JBoss settings
Modified: stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml
===================================================================
--- stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-07-15 14:10:16 UTC (rev 14694)
+++ stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-07-18 08:09:57 UTC (rev 14695)
@@ -142,6 +142,55 @@
<macro-undeploy-jbossws-modules targetdir="${jboss700.home}" defaultmodulesconf="${jbossws.default.modules.conf}"/>
</target>
+ <!-- ================================================================== -->
+ <!-- Prepare Deployment Structure JBoss-7.1.0 -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-structure-jboss710" depends="prepare-deploy">
+ <delete dir="${deploy.structure}"/>
+
+ <path id="jbossws-common.path">
+ <fileset dir="${deploy.artifacts.dir}">
+ <include name="**/jbossws-common-tools.jar"/>
+ </fileset>
+ </path>
+ <taskdef name="installModules" classname="org.jboss.ws.tools.ant.InstallModulesTask" classpathref="jbossws-common.path"/>
+
+ <antcall target="deploy-jbossws-native-modules" inheritall="false">
+ <param name="installserver" value="${deploy.structure}"/>
+ <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
+ </antcall>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment jboss710 -->
+ <!-- ================================================================== -->
+
+ <target name="target-jboss710">
+ <property name="jbossws.integration.target" value="jboss710"/>
+ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
+ </target>
+
+ <target name="deploy-jboss710" depends="undeploy-jboss710,deploy-structure-jboss710" description="Deploy jbossws to jboss710">
+ <fail message="Not available: ${jboss710.available.file}" unless="jboss710.available"/>
+ <copy todir="${jboss710.home}" overwrite="true" verbose="true">
+ <fileset dir="${deploy.structure}">
+ <exclude name="**/jboss/as/webservices/**/module.xml"/>
+ </fileset>
+ </copy>
+ <!-- Install org/jboss/as/webservices module.xml separately since it needs to reference libs already on the AS -->
+ <installModules targetDir="${jboss710.home}/modules">
+ <fileset dir="${deploy.structure}/modules">
+ <include name="**/jboss/as/webservices/**/module.xml"/>
+ </fileset>
+ </installModules>
+ </target>
+
+ <target name="undeploy-jboss710" depends="target-jboss710,init" description="Remove jbossws from jboss710">
+ <fail message="Not available: ${jboss710.available.file}" unless="jboss710.available"/>
+ <macro-undeploy-jbossws-modules targetdir="${jboss710.home}" defaultmodulesconf="${jbossws.default.modules.conf}"/>
+ </target>
+
<!-- ================================================================== -->
<!-- Create jbossws-deploy.conf and jbossws-server-deploy.conf -->
<!-- ================================================================== -->
Modified: stack/native/trunk/modules/dist/src/main/distro/build-setup.xml
===================================================================
--- stack/native/trunk/modules/dist/src/main/distro/build-setup.xml 2011-07-15 14:10:16 UTC (rev 14694)
+++ stack/native/trunk/modules/dist/src/main/distro/build-setup.xml 2011-07-18 08:09:57 UTC (rev 14695)
@@ -36,14 +36,18 @@
<property name="jboss601.server.deployers" value="${jboss601.server}/deployers"/>
<property name="jboss700.modules" value="${jboss700.home}/modules"/>
+ <property name="jboss710.modules" value="${jboss710.home}/modules"/>
<property name="jboss600.available.file" value="${jboss600.client}/jboss-client.jar"/>
<property name="jboss601.available.file" value="${jboss601.client}/jboss-client.jar"/>
<property name="jboss700.available.file" value="${jboss700.home}/jboss-modules.jar"/>
+ <property name="jboss710.available.file" value="${jboss710.home}/jboss-modules.jar"/>
+
<available property="jboss600.available" file="${jboss600.available.file}"/>
<available property="jboss601.available" file="${jboss601.available.file}"/>
<available property="jboss700.available" file="${jboss700.available.file}"/>
+ <available property="jboss710.available" file="${jboss710.available.file}"/>
<tstamp>
<format property="build.id" pattern="yyyyMMddHHmm"/>
Modified: stack/native/trunk/modules/dist/src/main/distro/build.xml
===================================================================
--- stack/native/trunk/modules/dist/src/main/distro/build.xml 2011-07-15 14:10:16 UTC (rev 14694)
+++ stack/native/trunk/modules/dist/src/main/distro/build.xml 2011-07-18 08:09:57 UTC (rev 14695)
@@ -56,6 +56,7 @@
<condition property="jbossws.integration.jboss70" value="true">
<or>
<equals arg1="${jbossws.integration.target}" arg2="jboss700"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss710"/>
</or>
</condition>
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-07-15 14:10:16 UTC (rev 14694)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-07-18 08:09:57 UTC (rev 14695)
@@ -678,12 +678,12 @@
<!--
Name: jboss700
- Descr: JBoss-7.0.0 specific options
+ Descr: JBoss-7.0.0.Final specific options
-->
<profile>
<id>jboss700</id>
<properties>
- <jboss.version>7.0.0.CR2-SNAPSHOT</jboss.version>
+ <jboss.version>7.0.0.Final</jboss.version>
<jbossws.integration.target>jboss700</jbossws.integration.target>
<endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs>
</properties>
@@ -843,6 +843,172 @@
</profile>
<!--
+ Name: jboss710
+ Descr: JBoss-7.1.0 specific options
+ -->
+ <profile>
+ <id>jboss710</id>
+ <properties>
+ <jboss.version>7.1.0.Alpha1-SNAPSHOT</jboss.version>
+ <jbossws.integration.target>jboss710</jbossws.integration.target>
+ <endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-webservices-tests-integration</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.naming</groupId>
+ <artifactId>jnp-client</artifactId>
+ <version>5.0.5.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.picketbox</groupId>
+ <artifactId>jbosssx-client</artifactId>
+ <version>3.0.0.CR2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ </dependency>
+ <!-- provides org.jboss.ejb3.annotation.SecurityDomain annotation -->
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-ext-api</artifactId>
+ <version>2.0.0-beta-1</version>
+ </dependency>
+ <!-- Apache XML security depends on Xalan impl classes :( -->
+ <dependency>
+ <groupId>apache-xalan</groupId>
+ <artifactId>serializer</artifactId>
+ <version>2.7.1.patch01-brew</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.1.patch01-brew</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <compilerArgument>-Djava.endorsed.dirs=${endorsed.dirs}</compilerArgument>
+ </configuration>
+ <executions>
+ <execution>
+ <id>default-testCompile</id>
+ <phase>test-compile</phase>
+ <configuration>
+ <testExcludes>
+ <!-- TODO: tests using org.jboss.ejb3.client.ClientLauncher -->
+ <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
+ </testExcludes>
+ </configuration>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${endorsed.dirs}</argLine>
+ <excludes>
+ <!--# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration-->
+ <exclude>org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*</exclude>
+
+ <!--# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored-->
+ <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude>
+
+ <!-- # [JBAS-8363] Virtual host issue in JBossWeb -->
+ <exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*</exclude>
+
+ <!-- # [JBWS-3150] This test causes hudson to freeze -->
+ <exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude>
+
+ <!-- # [JBAS-9188] Implement support for nested EJBs & WARs in .sar archives -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1854/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/dar/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/jmstransport/**</exclude>
+
+ <!-- # [JBWS-3252] Investigate WSA interop tests regression -->
+ <exclude>org/jboss/test/ws/interop/wsa/AddressingTestCase*</exclude>
+
+ <!-- ////////////////////////// -->
+ <!-- AS7 integration exclusions -->
+ <!-- ////////////////////////// -->
+
+ <!-- TODO: Injections support for WS components -->
+ <exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
+
+ <!-- TODO: Native webserviceref stuff -->
+ <exclude>org/jboss/test/ws/jaxws/jbws2307/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2527/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/advanced/retail/**</exclude>
+
+ <!-- # [JBWS-3308] Extends AS7 RemoteDeployer for supporting deployment of different security domains -->
+ <exclude>org/jboss/test/ws/jaxws/jbws2116/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase*</exclude>
+
+ <!-- TODO: EJB3 DD driven deployments -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1309/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude>
+
+ <!-- TODO: JMX client to AS7 server -->
+ <exclude>org/jboss/test/ws/management/recording/**</exclude>
+
+ <!-- TODO: will we support wars bundled in jars on AS7? -->
+ <exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>
+
+ <!-- [AS7-1101][AS7-1125] waiting for metadata upgrade in AS7 -->
+ <exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2957/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2999/**</exclude>
+
+ <!-- # [JBWS-3232] javax.naming.NameNotFoundException: Name 'service' not found in context 'env' -->
+ <exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude>
+
+ <!-- TODO: tests using org.jboss.ejb3.client.ClientLauncher -->
+ <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
+
+ <!-- JAXR not available -->
+ <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
+
+ <!-- # [JBWS-3234] JNDI over RMI not available on AS7 -->
+ <exclude>org/jboss/test/ws/jaxrpc/**</exclude>
+ <exclude>org/jboss/test/ws/benchmark/jaxrpc/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/serviceref/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
Name: no-jboss-bind-address
Descr: Set the default jboss.bind.address
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2011-07-15 14:10:16 UTC (rev 14694)
+++ stack/native/trunk/pom.xml 2011-07-18 08:09:57 UTC (rev 14695)
@@ -56,7 +56,7 @@
<jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version>
-->
<!-- END -->
- <jboss700.version>7.0.0.Beta4-SNAPSHOT</jboss700.version>
+ <jboss700.version>7.0.0.Final</jboss700.version>
<ant.version>1.7.1</ant.version>
<codehaus.jettison.version>1.0-RC2</codehaus.jettison.version>
<commons.logging.version>1.1.1</commons.logging.version>
@@ -570,6 +570,19 @@
</profile>
<!--
+ Name: jboss710
+ Descr: JBoss-7.1.0 specific options
+ -->
+ <profile>
+ <id>jboss710</id>
+ <properties>
+ <jbossws.integration.target>jboss710</jbossws.integration.target>
+ <jboss.home>${jboss710.home}</jboss.home>
+ </properties>
+ </profile>
+
+
+ <!--
Name: smoketest
Descr: Executes the smoke tests
-->
13 years, 6 months