JBossWS SVN: r14377 - in stack/cxf/trunk/modules/server/src/main: java/org/jboss/wsf/stack/cxf/deployment and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-05-11 12:52:29 -0400 (Wed, 11 May 2011)
New Revision: 14377
Removed:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/CXFServletClassProvider.java
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as7.xml
Log:
[JBWS-3279] Unifying CXFServletExt
Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java 2011-05-11 16:25:33 UTC (rev 14376)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java 2011-05-11 16:52:29 UTC (rev 14377)
@@ -1,136 +0,0 @@
-/*
- * 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.wsf.stack.cxf;
-
-import java.io.IOException;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.resource.ResourceManager;
-import org.apache.cxf.transport.servlet.AbstractHTTPServlet;
-import org.apache.cxf.transport.servlet.ServletContextResourceResolver;
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.deployment.ServletDelegate;
-import org.jboss.wsf.stack.cxf.configuration.BusHolder;
-import org.jboss.wsf.stack.cxf.transport.ServletHelper;
-
-/**
- * An extension to the CXFNonSpringServlet
- *
- * @author alessio.soldano(a)jboss.com
- * @since 16-Jun-2010
- *
- */
-public class CXFNonSpringServletExt extends AbstractHTTPServlet implements ServletDelegate
-{
- protected Endpoint endpoint;
- protected Bus bus;
-
- @Override
- public void init(ServletConfig sc) throws ServletException {
- super.init(sc);
- loadBus(sc);
- }
-
- protected void loadBus(ServletConfig servletConfig) throws ServletException
- {
- //Init the Endpoint
- endpoint = ServletHelper.initEndpoint(servletConfig, getServletName());
-
- //keep the bus created during deployment and update it with the information coming from the servlet config
- updateAvailableBusWithServletInfo(servletConfig);
-
- //register the InstrumentManagementImpl
- ServletHelper.registerInstrumentManger(bus, getServletContext());
- }
-
- private void updateAvailableBusWithServletInfo(ServletConfig servletConfig)
- {
- BusHolder holder = endpoint.getService().getDeployment().getAttachment(BusHolder.class);
- //set the bus from deployment into the CXF servlet and assign it to the current thread (do not touch the default bus!)
- bus = holder.getBus();
- BusFactory.setThreadDefaultBus(bus);
- //update the resource manager adding the ServletContextResourceResolver that was to be added by CXF servlet
- ResourceManager resourceManager = bus.getExtension(ResourceManager.class);
- resourceManager.addResourceResolver(new ServletContextResourceResolver(servletConfig.getServletContext()));
- }
-
- @Override
- protected void invoke(HttpServletRequest req, HttpServletResponse res) throws ServletException
- {
- ServletHelper.callRequestHandler(req, res, getServletContext(), bus, endpoint);
- }
-
- @Override
- public void destroy()
- {
- ServletHelper.callPreDestroy(endpoint);
- }
-
- @Override
- public void doHead(HttpServletRequest request, HttpServletResponse response, ServletContext context)
- throws ServletException, IOException
- {
- this.doHead(request, response);
- }
-
- @Override
- public void doGet(HttpServletRequest request, HttpServletResponse response, ServletContext context)
- throws ServletException, IOException
- {
- this.doGet(request, response);
- }
-
- @Override
- public void doPost(HttpServletRequest request, HttpServletResponse response, ServletContext context)
- throws ServletException, IOException
- {
- this.doPost(request, response);
- }
-
- @Override
- public void doPut(HttpServletRequest request, HttpServletResponse response, ServletContext context)
- throws ServletException, IOException
- {
- this.doPut(request, response);
- }
-
- @Override
- public void doDelete(HttpServletRequest request, HttpServletResponse response, ServletContext context)
- throws ServletException, IOException
- {
- this.doDelete(request, response);
- }
-
- @Override
- public void service(HttpServletRequest request, HttpServletResponse response, ServletContext context)
- throws ServletException, IOException
- {
- this.service(request, response);
- }
-}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2011-05-11 16:25:33 UTC (rev 14376)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2011-05-11 16:52:29 UTC (rev 14377)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * 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.
*
@@ -21,7 +21,23 @@
*/
package org.jboss.wsf.stack.cxf;
+import java.io.IOException;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.resource.ResourceManager;
+import org.apache.cxf.transport.servlet.AbstractHTTPServlet;
+import org.apache.cxf.transport.servlet.ServletContextResourceResolver;
+import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.ServletDelegate;
+import org.jboss.wsf.stack.cxf.configuration.BusHolder;
+import org.jboss.wsf.stack.cxf.transport.ServletHelper;
/**
* An extension to the CXF servlet
@@ -31,7 +47,91 @@
*
* @since 21-Apr-2007
*/
-public class CXFServletExt extends CXFNonSpringServletExt implements ServletDelegate
+public class CXFServletExt extends AbstractHTTPServlet implements ServletDelegate
{
+ protected Endpoint endpoint;
+ protected Bus bus;
+ @Override
+ public void init(ServletConfig sc) throws ServletException {
+ super.init(sc);
+ loadBus(sc);
+ }
+
+ protected void loadBus(ServletConfig servletConfig) throws ServletException
+ {
+ //Init the Endpoint
+ endpoint = ServletHelper.initEndpoint(servletConfig, getServletName());
+
+ //keep the bus created during deployment and update it with the information coming from the servlet config
+ updateAvailableBusWithServletInfo(servletConfig);
+
+ //register the InstrumentManagementImpl
+ ServletHelper.registerInstrumentManger(bus, getServletContext());
+ }
+
+ private void updateAvailableBusWithServletInfo(ServletConfig servletConfig)
+ {
+ BusHolder holder = endpoint.getService().getDeployment().getAttachment(BusHolder.class);
+ //set the bus from deployment into the CXF servlet and assign it to the current thread (do not touch the default bus!)
+ bus = holder.getBus();
+ BusFactory.setThreadDefaultBus(bus);
+ //update the resource manager adding the ServletContextResourceResolver that was to be added by CXF servlet
+ ResourceManager resourceManager = bus.getExtension(ResourceManager.class);
+ resourceManager.addResourceResolver(new ServletContextResourceResolver(servletConfig.getServletContext()));
+ }
+
+ @Override
+ protected void invoke(HttpServletRequest req, HttpServletResponse res) throws ServletException
+ {
+ ServletHelper.callRequestHandler(req, res, getServletContext(), bus, endpoint);
+ }
+
+ @Override
+ public void destroy()
+ {
+ ServletHelper.callPreDestroy(endpoint);
+ }
+
+ @Override
+ public void doHead(HttpServletRequest request, HttpServletResponse response, ServletContext context)
+ throws ServletException, IOException
+ {
+ this.doHead(request, response);
+ }
+
+ @Override
+ public void doGet(HttpServletRequest request, HttpServletResponse response, ServletContext context)
+ throws ServletException, IOException
+ {
+ this.doGet(request, response);
+ }
+
+ @Override
+ public void doPost(HttpServletRequest request, HttpServletResponse response, ServletContext context)
+ throws ServletException, IOException
+ {
+ this.doPost(request, response);
+ }
+
+ @Override
+ public void doPut(HttpServletRequest request, HttpServletResponse response, ServletContext context)
+ throws ServletException, IOException
+ {
+ this.doPut(request, response);
+ }
+
+ @Override
+ public void doDelete(HttpServletRequest request, HttpServletResponse response, ServletContext context)
+ throws ServletException, IOException
+ {
+ this.doDelete(request, response);
+ }
+
+ @Override
+ public void service(HttpServletRequest request, HttpServletResponse response, ServletContext context)
+ throws ServletException, IOException
+ {
+ this.service(request, response);
+ }
}
Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/CXFServletClassProvider.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/CXFServletClassProvider.java 2011-05-11 16:25:33 UTC (rev 14376)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/CXFServletClassProvider.java 2011-05-11 16:52:29 UTC (rev 14377)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, 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.wsf.stack.cxf.deployment;
-
-import org.jboss.wsf.spi.deployment.ServletClassProvider;
-import org.jboss.wsf.stack.cxf.client.util.SpringUtils;
-
-public class CXFServletClassProvider implements ServletClassProvider
-{
-
- @Override
- public String getServletClassName()
- {
- return SpringUtils.isSpringAvailable() ? "org.jboss.wsf.stack.cxf.CXFServletExt" : "org.jboss.wsf.stack.cxf.CXFNonSpringServletExt";
- }
-
-}
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2011-05-11 16:25:33 UTC (rev 14376)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2011-05-11 16:52:29 UTC (rev 14377)
@@ -42,8 +42,8 @@
<property name="contextProperties">
<map keyClass="java.lang.String" valueClass="java.lang.String">
<entry>
- <key>stack.transport.class.provider</key>
- <value>org.jboss.wsf.stack.cxf.deployment.CXFServletClassProvider</value>
+ <key>stack.transport.class</key>
+ <value>org.jboss.wsf.stack.cxf.CXFServletExt</value>
</entry>
</map>
</property>
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as7.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as7.xml 2011-05-11 16:25:33 UTC (rev 14376)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as7.xml 2011-05-11 16:52:29 UTC (rev 14377)
@@ -29,8 +29,8 @@
<property name="contextProperties" class="java.util.HashMap">
<map keyClass="java.lang.String" valueClass="java.lang.String">
<entry>
- <key>stack.transport.class.provider</key>
- <value>org.jboss.wsf.stack.cxf.deployment.CXFServletClassProvider</value>
+ <key>stack.transport.class</key>
+ <value>org.jboss.wsf.stack.cxf.CXFServletExt</value>
</entry>
</map>
</property>
14 years, 8 months
JBossWS SVN: r14376 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-05-11 12:25:33 -0400 (Wed, 11 May 2011)
New Revision: 14376
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java
Log:
Properly reset ClassLoader extension in client test bus; see CXF-3497
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java 2011-05-11 16:06:08 UTC (rev 14375)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java 2011-05-11 16:25:33 UTC (rev 14376)
@@ -51,10 +51,33 @@
protected void setUp() throws Exception {
defaultBus = BusFactory.getDefaultBus(false);
super.setUp();
+ Bus threadBus = BusFactory.getThreadDefaultBus(false);
+ if (threadBus != null)
+ {
+ ClassLoader busLoader = threadBus.getExtension(ClassLoader.class);
+ ClassLoader origLoader = this.getOriginalClassLoader();
+ //overwrite the ClassLoader extension with the new TCCL, to allow CXF seeing the client side archives
+ if (busLoader != null && busLoader == origLoader)
+ {
+ threadBus.setExtension(Thread.currentThread().getContextClassLoader(), ClassLoader.class);
+ }
+ }
}
@Override
protected void tearDown() throws Exception {
+ Bus threadBus = BusFactory.getThreadDefaultBus(false);
+ if (threadBus != null)
+ {
+ ClassLoader busLoader = threadBus.getExtension(ClassLoader.class);
+ ClassLoader origLoader = this.getOriginalClassLoader();
+ //restore the ClassLoader extension to the orig loader
+ if (busLoader != null && busLoader == Thread.currentThread().getContextClassLoader())
+ {
+ threadBus.setExtension(origLoader, ClassLoader.class);
+ }
+ }
+
try
{
Bus afterTestsDefaultBus = BusFactory.getDefaultBus(false);
14 years, 8 months
JBossWS SVN: r14375 - shared-testsuite/trunk/src/main/java/org/jboss/wsf/test.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-05-11 12:06:08 -0400 (Wed, 11 May 2011)
New Revision: 14375
Modified:
shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java
Log:
Allow for getting the orig classloader from jbossws test setup
Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java
===================================================================
--- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2011-05-11 13:33:26 UTC (rev 14374)
+++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2011-05-11 16:06:08 UTC (rev 14375)
@@ -159,6 +159,11 @@
Thread.currentThread().setContextClassLoader(originalClassLoader);
}
}
+
+ protected ClassLoader getOriginalClassLoader()
+ {
+ return originalClassLoader;
+ }
public MBeanServerConnection getServer() throws NamingException
{
14 years, 8 months
JBossWS SVN: r14374 - in shared-testsuite/trunk: testsuite/src/test/ant-import and 8 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-05-11 09:33:26 -0400 (Wed, 11 May 2011)
New Revision: 14374
Modified:
shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java
shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2529/JBWS2529TestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2701/JBWS2701TestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java
Log:
removing Metro & AS5 integration related stuff
Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java
===================================================================
--- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2011-05-11 12:53:19 UTC (rev 14373)
+++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2011-05-11 13:33:26 UTC (rev 14374)
@@ -201,60 +201,26 @@
return JBossWSTestHelper.getServer();
}
- public static boolean isTargetJBoss5()
- {
- return JBossWSTestHelper.isTargetJBoss5();
- }
-
- public static boolean isTargetJBoss51()
- {
- return JBossWSTestHelper.isTargetJBoss51();
- }
-
- public static boolean isTargetJBoss50()
- {
- return JBossWSTestHelper.isTargetJBoss50();
- }
-
public static boolean isTargetJBoss6()
{
return JBossWSTestHelper.isTargetJBoss6();
}
- public static boolean isTargetJBoss61()
- {
- return JBossWSTestHelper.isTargetJBoss61();
- }
-
- public static boolean isTargetJBoss60()
- {
- return JBossWSTestHelper.isTargetJBoss60();
- }
-
public static boolean isIntegrationNative()
{
return JBossWSTestHelper.isIntegrationNative();
}
- public static boolean isIntegrationMetro()
- {
- return JBossWSTestHelper.isIntegrationMetro();
- }
-
public static boolean isIntegrationCXF()
{
return JBossWSTestHelper.isIntegrationCXF();
}
- /** Deploy the given archive
- */
public static void deploy(String archive) throws Exception
{
JBossWSTestHelper.deploy(archive);
}
- /** Undeploy the given archive
- */
public static void undeploy(String archive) throws Exception
{
JBossWSTestHelper.undeploy(archive);
@@ -298,7 +264,7 @@
/** Get the client's env context for a given name.
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
protected static InitialContext getInitialContext(String clientName) throws NamingException
{
InitialContext iniCtx = new InitialContext();
Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
--- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2011-05-11 12:53:19 UTC (rev 14373)
+++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2011-05-11 13:33:26 UTC (rev 14374)
@@ -62,7 +62,6 @@
private static final String SYSPROP_JBOSS_BIND_ADDRESS = "jboss.bind.address";
private static final String SYSPROP_TEST_ARCHIVE_DIRECTORY = "test.archive.directory";
private static final String SYSPROP_TEST_RESOURCES_DIRECTORY = "test.resources.directory";
- private static final boolean DEPLOY_PROCESS_ENABLED = !Boolean.getBoolean("test.disable.deployment");
private static final Deployer DEPLOYER;
private static MBeanServerConnection server;
@@ -83,76 +82,30 @@
*/
public static void deploy(String archive) throws Exception
{
- if ( DEPLOY_PROCESS_ENABLED )
- {
- URL archiveURL = getArchiveFile(archive).toURI().toURL();
- DEPLOYER.deploy(archiveURL);
- }
+ URL archiveURL = getArchiveFile(archive).toURI().toURL();
+ DEPLOYER.deploy(archiveURL);
}
/** Undeploy the given archive
*/
public static void undeploy(String archive) throws Exception
{
- if ( DEPLOY_PROCESS_ENABLED )
- {
- URL archiveURL = getArchiveFile(archive).toURI().toURL();
- DEPLOYER.undeploy(archiveURL);
- }
+ URL archiveURL = getArchiveFile(archive).toURI().toURL();
+ DEPLOYER.undeploy(archiveURL);
}
- /** True, if -Djbossws.integration.target=jboss5x */
- public static boolean isTargetJBoss5()
- {
- return isTargetJBoss51() || isTargetJBoss50();
- }
-
- /** True, if -Djbossws.integration.target=jboss50x */
- public static boolean isTargetJBoss50()
- {
- String target = getIntegrationTarget();
- return target.startsWith("jboss50");
- }
-
- /** True, if -Djbossws.integration.target=jboss51x */
- public static boolean isTargetJBoss51()
- {
- String target = getIntegrationTarget();
- return target.startsWith("jboss51");
- }
-
- /** True, if -Djbossws.integration.target=jboss6x */
public static boolean isTargetJBoss6()
{
- return isTargetJBoss61() || isTargetJBoss60();
+ String target = getIntegrationTarget();
+ return target.startsWith("jboss6");
}
- /** True, if -Djbossws.integration.target=jboss60x */
- public static boolean isTargetJBoss60()
- {
- String target = getIntegrationTarget();
- return target.startsWith("jboss60");
- }
-
- /** True, if -Djbossws.integration.target=jboss61x */
- public static boolean isTargetJBoss61()
- {
- String target = getIntegrationTarget();
- return target.startsWith("jboss61");
- }
-
public static boolean isIntegrationNative()
{
String vendor = getImplementationVendor();
return vendor.toLowerCase().indexOf("jboss") != -1;
}
- public static boolean isIntegrationMetro()
- {
- String vendor = getImplementationVendor();
- return vendor.toLowerCase().indexOf("sun") != -1;
- }
-
public static boolean isIntegrationCXF()
{
String vendor = getImplementationVendor();
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2011-05-11 12:53:19 UTC (rev 14373)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2011-05-11 13:33:26 UTC (rev 14374)
@@ -15,12 +15,6 @@
<target name="tests-prepare" depends="prepare">
<!-- Define jboss.home -->
- <condition property="jboss.home" value="${jboss501.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss501"/>
- </condition>
- <condition property="jboss.home" value="${jboss510.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss510"/>
- </condition>
<condition property="jboss.home" value="${jboss600.home}">
<equals arg1="${jbossws.integration.target}" arg2="jboss600"/>
</condition>
@@ -111,7 +105,7 @@
</tstamp>
</target>
- <target name="tests-classpath" depends="tests-classpath-jboss70,tests-classpath-jboss60,tests-classpath-jboss51,tests-classpath-jboss50">
+ <target name="tests-classpath" depends="tests-classpath-jboss70,tests-classpath-jboss60">
<path id="tests.javac.classpath">
<path refid="ws.stack.classpath"/>
<path refid="integration.target.javac.classpath"/>
@@ -122,166 +116,6 @@
</path>
</target>
- <target name="tests-classpath-jboss50" depends="tests-prepare" if="jbossws.integration.jboss50">
-
- <path id="integration.target.javac.classpath">
- <pathelement location="${jboss.client}/activation.jar"/>
- <pathelement location="${jboss.client}/jaxws-tools.jar"/>
- <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/>
- <pathelement location="${jboss.client}/jboss-appclient.jar"/>
- <pathelement location="${jboss.client}/jboss-common-core.jar"/>
- <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
- <pathelement location="${jboss.client}/jboss-ejb3-ext-api.jar"/>
- <pathelement location="${jboss.client}/jboss-logging-spi.jar"/>
- <pathelement location="${jboss.client}/jboss-metadata.jar"/>
- <pathelement location="${jboss.client}/jboss-remoting.jar"/>
- <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/>
- <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
- <pathelement location="${jboss.client}/jbossxb.jar"/>
- <pathelement location="${jboss.client}/mail.jar"/>
- <pathelement location="${jboss.client}/stax-api.jar"/>
- <pathelement location="${jboss.client}/wsdl4j.jar"/>
- <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/>
- <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
- <pathelement location="${jboss.server.lib}/servlet-api.jar"/>
- </path>
-
- <!--
- The 's.client.classpath' contains jars that are available in the target container's client directory.
- There jars apply to all supported stacks. It MUST NOT contains jars from a local thirdparty dir.
-
- The 'ws.stack.classpath' contains jars that come with a specific stack distribution.
- The 's.extra.classpath' contains stack specific jars that are needed to run the stack specific tests.
- -->
- <path id="integration.target.client.classpath">
- <pathelement location="${jboss.client}/activation.jar"/>
- <pathelement location="${jboss.client}/javassist.jar"/>
- <pathelement location="${jboss.client}/jaxb-api.jar"/>
- <pathelement location="${jboss.client}/jaxb-impl.jar"/>
- <pathelement location="${jboss.client}/jaxb-xjc.jar"/>
- <pathelement location="${jboss.client}/jaxws-tools.jar"/>
- <pathelement location="${jboss.client}/jboss-appclient.jar"/>
- <pathelement location="${jboss.client}/jboss-container-metadata.jar"/>
- <pathelement location="${jboss.client}/jboss-ejb3-ext-api.jar"/>
- <pathelement location="${jboss.client}/jboss-metadata.jar"/>
- <pathelement location="${jboss.client}/jboss-remoting.jar"/>
- <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/>
- <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
- <pathelement location="${jboss.client}/jbossxb.jar"/>
- <pathelement location="${jboss.client}/jbossall-client.jar"/>
- <pathelement location="${jboss.client}/jaxws-tools.jar"/>
- <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/>
- <pathelement location="${jboss.client}/log4j.jar"/>
- <pathelement location="${jboss.client}/mail.jar"/>
- <pathelement location="${jboss.client}/stax-api.jar"/>
- <pathelement location="${jboss.client}/trove.jar"/>
- <pathelement location="${jboss.client}/jboss-javaee.jar"/>
- <!-- FIXME jars should be available in the client dir -->
- <pathelement location="${jboss.lib}/jboss-aop-jdk50.jar"/>
- <pathelement location="${jboss.lib}/jboss-classloader.jar"/>
- <pathelement location="${jboss.lib}/jboss-classloading.jar"/>
- <pathelement location="${jboss.lib}/jboss-classloading-vfs.jar"/>
- <pathelement location="${jboss.lib}/jboss-container.jar"/>
- <pathelement location="${jboss.lib}/jboss-dependency.jar"/>
- <pathelement location="${jboss.lib}/jboss-vfs.jar"/>
- <pathelement location="${jboss.lib}/jboss-kernel.jar"/>
- <pathelement location="${jboss.lib}/jboss-reflect.jar"/>
- <pathelement location="${jboss.server.lib}/jboss.jar"/>
- <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
- <pathelement location="${jboss.server.lib}/jbossws-native-core.jar"/> <!-- For jaxrpc tests -->
- <pathelement location="${jboss.server.lib}/hibernate3.jar"/>
- <pathelement location="${jboss.server.lib}/jnpserver.jar"/>
- <pathelement location="${jboss.server.lib}/jboss-ejb3-core.jar"/>
- <pathelement location="${jboss.server.lib}/hibernate-core.jar"/>
- <pathelement location="${jboss.server.lib}/netty.jar"/> <!-- For jaxrpc tests -->
- <pathelement location="${jboss.server.lib}/servlet-api.jar"/>
- <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/>
- <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/>
- <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/>
- <pathelement location="${tools.jar}"/>
- </path>
- </target>
-
- <target name="tests-classpath-jboss51" depends="tests-prepare" if="jbossws.integration.jboss51">
-
- <path id="integration.target.javac.classpath">
- <pathelement location="${jboss.client}/activation.jar"/>
- <pathelement location="${jboss.client}/jaxws-tools.jar"/>
- <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/>
- <pathelement location="${jboss.client}/jboss-appclient.jar"/>
- <pathelement location="${jboss.client}/jboss-common-core.jar"/>
- <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
- <pathelement location="${jboss.client}/jboss-ejb3-ext-api.jar"/>
- <pathelement location="${jboss.client}/jboss-logging-spi.jar"/>
- <pathelement location="${jboss.client}/jboss-metadata.jar"/>
- <pathelement location="${jboss.client}/jboss-remoting.jar"/>
- <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/>
- <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
- <pathelement location="${jboss.client}/jbossxb.jar"/>
- <pathelement location="${jboss.client}/mail.jar"/>
- <pathelement location="${jboss.client}/stax-api.jar"/>
- <pathelement location="${jboss.client}/wsdl4j.jar"/>
- <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/>
- <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
- <pathelement location="${jboss.server.lib}/servlet-api.jar"/>
- </path>
-
- <!--
- The 's.client.classpath' contains jars that are available in the target container's client directory.
- There jars apply to all supported stacks. It MUST NOT contains jars from a local thirdparty dir.
-
- The 'ws.stack.classpath' contains jars that come with a specific stack distribution.
- The 's.extra.classpath' contains stack specific jars that are needed to run the stack specific tests.
- -->
- <path id="integration.target.client.classpath">
- <pathelement location="${jboss.client}/activation.jar"/>
- <pathelement location="${jboss.client}/javassist.jar"/>
- <pathelement location="${jboss.client}/jaxb-api.jar"/>
- <pathelement location="${jboss.client}/jaxb-impl.jar"/>
- <pathelement location="${jboss.client}/jaxb-xjc.jar"/>
- <pathelement location="${jboss.client}/jaxws-tools.jar"/>
- <pathelement location="${jboss.client}/jboss-appclient.jar"/>
- <pathelement location="${jboss.client}/jboss-container-metadata.jar"/>
- <pathelement location="${jboss.client}/jboss-ejb3-ext-api.jar"/>
- <pathelement location="${jboss.client}/jboss-metadata.jar"/>
- <pathelement location="${jboss.client}/jboss-remoting.jar"/>
- <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/>
- <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
- <pathelement location="${jboss.client}/jbossxb.jar"/>
- <pathelement location="${jboss.client}/jbossall-client.jar"/>
- <pathelement location="${jboss.client}/jaxws-tools.jar"/>
- <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/>
- <pathelement location="${jboss.client}/log4j.jar"/>
- <pathelement location="${jboss.client}/mail.jar"/>
- <pathelement location="${jboss.client}/stax-api.jar"/>
- <pathelement location="${jboss.client}/trove.jar"/>
- <pathelement location="${jboss.client}/jboss-javaee.jar"/>
- <!-- FIXME jars should be available in the client dir -->
- <pathelement location="${jboss.lib}/jboss-aop-jdk50.jar"/>
- <pathelement location="${jboss.lib}/jboss-classloader.jar"/>
- <pathelement location="${jboss.lib}/jboss-classloading.jar"/>
- <pathelement location="${jboss.lib}/jboss-classloading-vfs.jar"/>
- <pathelement location="${jboss.lib}/jboss-container.jar"/>
- <pathelement location="${jboss.lib}/jboss-dependency.jar"/>
- <pathelement location="${jboss.lib}/jboss-vfs.jar"/>
- <pathelement location="${jboss.lib}/jboss-kernel.jar"/>
- <pathelement location="${jboss.lib}/jboss-reflect.jar"/>
- <pathelement location="${jboss.server.lib}/jboss.jar"/>
- <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
- <pathelement location="${jboss.server.lib}/jbossws-native-core.jar"/> <!-- For jaxrpc tests -->
- <pathelement location="${jboss.server.lib}/hibernate3.jar"/>
- <pathelement location="${jboss.server.lib}/jnpserver.jar"/>
- <pathelement location="${jboss.server.lib}/jboss-ejb3-core.jar"/>
- <pathelement location="${jboss.server.lib}/hibernate-core.jar"/>
- <pathelement location="${jboss.server.lib}/netty.jar"/> <!-- For jaxrpc tests -->
- <pathelement location="${jboss.server.lib}/servlet-api.jar"/>
- <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/>
- <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/>
- <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/>
- <pathelement location="${tools.jar}"/>
- </path>
- </target>
-
<target name="tests-classpath-jboss60" depends="tests-prepare" if="jbossws.integration.jboss60">
<path id="integration.target.javac.classpath">
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2011-05-11 12:53:19 UTC (rev 14373)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2011-05-11 13:33:26 UTC (rev 14374)
@@ -74,10 +74,6 @@
{
stackName = "cxf";
}
- else if (isIntegrationMetro())
- {
- stackName = "metro";
- }
else if (isIntegrationNative())
{
stackName = "native";
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2529/JBWS2529TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2529/JBWS2529TestCase.java 2011-05-11 12:53:19 UTC (rev 14373)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2529/JBWS2529TestCase.java 2011-05-11 13:33:26 UTC (rev 14374)
@@ -86,7 +86,7 @@
String command = JBOSS_HOME + FS + "bin" + FS + "wsprovide" + EXT + " -k -w -o " + absOutput + " --classpath " + CLASSES_DIR + " " + ENDPOINT_CLASS;
executeCommand(command, "wsprovide");
- File wsdl = new File(destDir, isIntegrationMetro() || isIntegrationCXF() ? "JBWS2529EndpointService_schema1.xsd" : "JBWS2529EndpointService.wsdl");
+ File wsdl = new File(destDir, isIntegrationCXF() ? "JBWS2529EndpointService_schema1.xsd" : "JBWS2529EndpointService.wsdl");
Element root = DOMUtils.parse(new FileInputStream(wsdl));
QName schemaQName = new QName(XML_SCHEMA_NS,"schema");
Element schema = null;
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2701/JBWS2701TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2701/JBWS2701TestCase.java 2011-05-11 12:53:19 UTC (rev 14373)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2701/JBWS2701TestCase.java 2011-05-11 13:33:26 UTC (rev 14374)
@@ -51,10 +51,6 @@
public void testWSDL() throws Exception
{
URL url = new URL(endpointAddress + "?wsdl");
- if (isIntegrationMetro())
- {
- url = new URL(endpointAddress + "?xsd=1");
- }
BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
String line = br.readLine();
StringBuilder sb = new StringBuilder();
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java 2011-05-11 12:53:19 UTC (rev 14373)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java 2011-05-11 13:33:26 UTC (rev 14374)
@@ -64,7 +64,7 @@
public void testServletAccess() throws Exception
{
- boolean clCheck = !(isTargetJBoss5() || isTargetJBoss6());
+ boolean clCheck = !isTargetJBoss6();
URL url = new URL("http://" + getServerHost() + ":8080/jaxws-jbws3223-servlet?param=hello-world&clCheck=" + clCheck);
BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
assertEquals("hello-world", br.readLine());
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java 2011-05-11 12:53:19 UTC (rev 14373)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java 2011-05-11 13:33:26 UTC (rev 14374)
@@ -71,12 +71,6 @@
public void testMessageContextProperties() throws Exception
{
- if (isIntegrationMetro())
- {
- System.out.println("FIXME: [JBWS-2204] Implement Metro standard message context properties");
- return;
- }
-
String retStr = port.testMessageContextProperties();
assertEquals("pass", retStr);
}
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java 2011-05-11 12:53:19 UTC (rev 14373)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java 2011-05-11 13:33:26 UTC (rev 14374)
@@ -70,12 +70,6 @@
public void testMessageContextProperties() throws Exception
{
- if (isIntegrationMetro())
- {
- System.out.println("FIXME: [JBWS-2204] Implement Metro standard message context properties");
- return;
- }
-
String retStr = port.testMessageContextProperties();
assertEquals("pass", retStr);
}
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java 2011-05-11 12:53:19 UTC (rev 14373)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java 2011-05-11 13:33:26 UTC (rev 14374)
@@ -88,11 +88,6 @@
private void assertCookies() throws Exception
{
- if (isIntegrationMetro())
- {
- System.out.println("FIXME: [JBWS-1671] Metro client handler cannot set mime header");
- return;
- }
if (isIntegrationCXF())
{
System.out.println("FIXME: [CXF-1507] CXF client handler cannot set mime header");
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java 2011-05-11 12:53:19 UTC (rev 14373)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java 2011-05-11 13:33:26 UTC (rev 14374)
@@ -43,7 +43,6 @@
protected String origLog4jConf;
protected String oldCPProp;
protected boolean integrationNative = false;
- protected boolean integrationMetro = false;
protected boolean integrationCXF = false;
private static final String LOG4J_CONF = "log4j.configuration";
@@ -72,14 +71,13 @@
if (list.contains(StackConfigurable.class.getName()))
{
clazz.getMethod("setIsNative", boolean.class).invoke(delegate, integrationNative);
- clazz.getMethod("setIsMetro", boolean.class).invoke(delegate, integrationMetro);
clazz.getMethod("setIsCXF", boolean.class).invoke(delegate, integrationCXF);
}
}
protected void setupClasspath() throws Exception
{
- if (!(integrationCXF || integrationMetro || integrationNative))
+ if (!(integrationCXF || integrationNative))
{
//the integration stack is not set yet, doing it before mangling with the classpath
readIntegrationStack();
@@ -155,7 +153,6 @@
protected void readIntegrationStack()
{
this.integrationNative = isIntegrationNative();
- this.integrationMetro = isIntegrationMetro();
this.integrationCXF = isIntegrationCXF();
}
}
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java 2011-05-11 12:53:19 UTC (rev 14373)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java 2011-05-11 13:33:26 UTC (rev 14374)
@@ -280,13 +280,6 @@
*/
public void testMessageStream() throws Exception
{
-
- if(isIntegrationMetro())
- {
- System.out.println("FIXME: [JBWS-1777] WSProvide output is not correctly redirected");
- return;
- }
-
ByteArrayOutputStream bout = new ByteArrayOutputStream();
PrintStream pout = new PrintStream(bout);
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2011-05-11 12:53:19 UTC (rev 14373)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2011-05-11 13:33:26 UTC (rev 14374)
@@ -86,12 +86,6 @@
@SuppressWarnings("unchecked")
public void testGetRecordsByOperation() throws Exception
{
- if (isIntegrationMetro())
- {
- //The WSDL_OPERATION ctx property is required for the operation filter to work
- System.out.println("FIXME: [JBWS-2204] Implement Metro standard message context properties");
- return;
- }
Endpoint port = getPort();
MBeanServerConnection server = getServer();
ObjectName oname = new ObjectName(endpointObjectName + ",recordProcessor=MemoryBufferRecorder");
@@ -155,12 +149,6 @@
@SuppressWarnings("unchecked")
public void testGetMatchingRecords() throws Exception
{
- if (isIntegrationMetro())
- {
- //The WSDL_OPERATION ctx property is required for the operation filter to work
- System.out.println("FIXME: [JBWS-2204] Implement Metro standard message context properties");
- return;
- }
Endpoint port = getPort();
MBeanServerConnection server = getServer();
ObjectName oname = new ObjectName(endpointObjectName + ",recordProcessor=MemoryBufferRecorder");
@@ -187,12 +175,6 @@
@SuppressWarnings("unchecked")
public void testAddRemoveFilter() throws Exception
{
- if (isIntegrationMetro())
- {
- //The WSDL_OPERATION ctx property is required for the operation filter to work
- System.out.println("FIXME: [JBWS-2204] Implement Metro standard message context properties");
- return;
- }
Endpoint port = getPort();
MBeanServerConnection server = getServer();
ObjectName oname = new ObjectName(endpointObjectName + ",recordProcessor=MemoryBufferRecorder");
14 years, 8 months
JBossWS SVN: r14373 - in stack/native/trunk/modules: core/src/main/java/org/jboss/ws/metadata/builder and 16 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-05-11 08:53:19 -0400 (Wed, 11 May 2011)
New Revision: 14373
Removed:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/eventing/
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java
stack/native/trunk/modules/core/src/main/resources/schema/eventing_200408.xsd
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wseventing/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/soap/req5.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/wsdl11/inherit/eventing.wsdl
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/wsdl11/inherit/eventing.xsd
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/wsdl11/inherit/wind_inherit.wsdl
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/wseventing/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wseventing/
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
stack/native/trunk/modules/core/src/main/resources/META-INF/jbossws-entities.properties
stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as6.xml
stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java
stack/native/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3294] removing obsolete/unsupported WS-Eventing from Native
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2011-05-11 09:03:34 UTC (rev 14372)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2011-05-11 12:53:19 UTC (rev 14373)
@@ -47,9 +47,6 @@
import org.jboss.ws.core.soap.Use;
import org.jboss.ws.extensions.addressing.AddressingPropertiesImpl;
import org.jboss.ws.extensions.addressing.metadata.AddressingOpMetaExt;
-import org.jboss.ws.extensions.eventing.EventingConstants;
-import org.jboss.ws.extensions.eventing.EventingUtils;
-import org.jboss.ws.extensions.eventing.metadata.EventingEpMetaExt;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.FaultMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
@@ -498,44 +495,6 @@
}
}
- protected void processEndpointMetaDataExtensions(EndpointMetaData epMetaData, WSDLDefinitions wsdlDefinitions)
- {
- for (WSDLInterface wsdlInterface : wsdlDefinitions.getInterfaces())
- {
- WSDLProperty eventSourceProp = wsdlInterface.getProperty(Constants.WSDL_PROPERTY_EVENTSOURCE);
- if (eventSourceProp != null && epMetaData instanceof ServerEndpointMetaData)
- {
- ServerEndpointMetaData sepMetaData = (ServerEndpointMetaData)epMetaData;
- String eventSourceNS = wsdlInterface.getName().getNamespaceURI() + "/" + wsdlInterface.getName().getLocalPart();
-
- // extract the schema model
- JBossXSModel schemaModel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes());
- String[] notificationSchema = EventingUtils.extractNotificationSchema(schemaModel);
-
- // extract the root element NS
- String notificationRootElementNS = null;
- WSDLInterfaceOperation wsdlInterfaceOperation = wsdlInterface.getOperations()[0];
- if (wsdlInterfaceOperation.getOutputs().length > 0)
- {
- WSDLInterfaceOperationOutput wsdlInterfaceOperationOutput = wsdlInterfaceOperation.getOutputs()[0];
- notificationRootElementNS = wsdlInterfaceOperationOutput.getElement().getNamespaceURI();
- }
- else
- {
- // WSDL operation of an WSDL interface that is marked as an event source
- // requires to carry an output message.
- throw new WSException("Unable to resolve eventing root element NS. No operation output found at " + wsdlInterfaceOperation.getName());
- }
-
- EventingEpMetaExt ext = new EventingEpMetaExt(EventingConstants.NS_EVENTING);
- ext.setEventSourceNS(eventSourceNS);
- ext.setNotificationSchema(notificationSchema);
- ext.setNotificationRootElementNS(notificationRootElementNS);
- sepMetaData.addExtension(ext);
- }
- }
- }
-
/** Process operation meta data extensions. */
protected void processOpMetaExtensions(OperationMetaData opMetaData, WSDLInterfaceOperation wsdlOperation)
{
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2011-05-11 09:03:34 UTC (rev 14372)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2011-05-11 12:53:19 UTC (rev 14373)
@@ -217,7 +217,6 @@
}
}
- processEndpointMetaDataExtensions(epMetaData, wsdlDefinitions);
setupOperationsFromWSDL(epMetaData, wsdlEndpoint, seiMapping);
setupHandlers(serviceRefMetaData, portName, epMetaData);
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2011-05-11 09:03:34 UTC (rev 14372)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2011-05-11 12:53:19 UTC (rev 14373)
@@ -212,9 +212,6 @@
if (seiMapping == null)
log.warn("Cannot obtain SEI mapping for: " + seiName);
- // process endpoint meta extension
- processEndpointMetaDataExtensions(sepMetaData, wsdlDefinitions);
-
// Setup the endpoint operations
setupOperationsFromWSDL(sepMetaData, wsdlEndpoint, seiMapping);
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2011-05-11 09:03:34 UTC (rev 14372)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2011-05-11 12:53:19 UTC (rev 14373)
@@ -226,7 +226,6 @@
log.warn("@SOAPMessageHandlers is deprecated as of JAX-WS 2.0 with no replacement.");
MetaDataBuilder.replaceAddressLocation(sepMetaData);
- processEndpointMetaDataExtensions(sepMetaData, wsdlDefinitions);
// init service endpoint id
ObjectName sepID = MetaDataBuilder.createServiceEndpointID(dep, sepMetaData);
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2011-05-11 09:03:34 UTC (rev 14372)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2011-05-11 12:53:19 UTC (rev 14373)
@@ -757,13 +757,6 @@
destInterface.addProperty(new WSDLProperty(Constants.WSDL_PROPERTY_POLICYURIS, policyURIsProp.getLocalPart()));
}
- // eventing extensions
- QName eventSourceProp = (QName)srcPortType.getExtensionAttribute(Constants.WSDL_ATTRIBUTE_WSE_EVENTSOURCE);
- if (eventSourceProp != null && eventSourceProp.getLocalPart().equals(Boolean.TRUE.toString()))
- {
- destInterface.addProperty(new WSDLProperty(Constants.WSDL_PROPERTY_EVENTSOURCE, eventSourceProp.getLocalPart()));
- }
-
// documentation
Element documentationElement = srcPortType.getDocumentationElement();
if (documentationElement != null && documentationElement.getTextContent() != null)
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java 2011-05-11 09:03:34 UTC (rev 14372)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java 2011-05-11 12:53:19 UTC (rev 14373)
@@ -1,90 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, 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.wsf.stack.jbws;
-
-import org.jboss.ws.extensions.eventing.EventingConstants;
-import org.jboss.ws.extensions.eventing.deployment.EventingEndpointDeployment;
-import org.jboss.ws.extensions.eventing.metadata.EventingEpMetaExt;
-import org.jboss.ws.extensions.eventing.mgmt.SubscriptionManagerFactory;
-import org.jboss.ws.extensions.eventing.mgmt.SubscriptionManagerMBean;
-import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
-import org.jboss.ws.common.integration.AbstractDeploymentAspect;
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.Endpoint;
-
-/**
- * A deployer that creates event sources and register them with the
- * subscripion manager when a service endpoint is created.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 25-Apr-2007
- */
-public class EventingDeploymentAspect extends AbstractDeploymentAspect
-{
- @Override
- public void start(Deployment dep)
- {
- for (Endpoint ep : dep.getService().getEndpoints())
- {
- ServerEndpointMetaData sepMetaData = ep.getAttachment(ServerEndpointMetaData.class);
- if (sepMetaData == null)
- throw new IllegalStateException("Cannot obtain endpoint meta data");
-
- EventingEpMetaExt ext = (EventingEpMetaExt)sepMetaData.getExtension(EventingConstants.NS_EVENTING);
- if (ext != null)
- {
- // Currently several endpoints may belong to an event source deployment.
- // Therefore we have to avoid duplicate registrations
- // Actually there should be a 1:n mapping of event source NS to endpoints.
- // See also http://jira.jboss.org/jira/browse/JBWS-770
-
- // create pending incomplete event source
- EventingEndpointDeployment desc = new EventingEndpointDeployment(ext.getEventSourceNS(), ext.getNotificationSchema(), ext.getNotificationRootElementNS());
- desc.setEndpointAddress(sepMetaData.getEndpointAddress());
- desc.setPortName(sepMetaData.getPortName());
-
- SubscriptionManagerFactory factory = SubscriptionManagerFactory.getInstance();
- SubscriptionManagerMBean manager = factory.getSubscriptionManager();
- manager.registerEventSource(desc);
- }
- }
- }
-
- @Override
- public void stop(Deployment dep)
- {
- for (Endpoint ep : dep.getService().getEndpoints())
- {
- ServerEndpointMetaData sepMetaData = ep.getAttachment(ServerEndpointMetaData.class);
- if (sepMetaData == null)
- throw new IllegalStateException("Cannot obtain endpoint meta data");
-
- EventingEpMetaExt ext = (EventingEpMetaExt)sepMetaData.getExtension(EventingConstants.NS_EVENTING);
- if (ext != null)
- {
- SubscriptionManagerFactory factory = SubscriptionManagerFactory.getInstance();
- SubscriptionManagerMBean manager = factory.getSubscriptionManager();
- manager.removeEventSource(ext.getEventSourceURI());
- }
- }
- }
-}
Modified: stack/native/trunk/modules/core/src/main/resources/META-INF/jbossws-entities.properties
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/META-INF/jbossws-entities.properties 2011-05-11 09:03:34 UTC (rev 14372)
+++ stack/native/trunk/modules/core/src/main/resources/META-INF/jbossws-entities.properties 2011-05-11 12:53:19 UTC (rev 14373)
@@ -5,7 +5,6 @@
http\://java.sun.com/xml/ns/javaee=schema/javaee_web_services_1_2.xsd
http\://www.w3.org/2005/08/addressing=schema/ws-addr-2006-03.xsd
http\://www.w3.org/2007/02/addressing/metadata=schema/ws-addr-metadata-2007-02.xsd
-http\://schemas.xmlsoap.org/ws/2004/08/eventing=schema/eventing_200408.xsd
http\://www.w3.org/2002/06/soap-encoding=schema/soap-encoding_200206.xsd
http\://schemas.xmlsoap.org/soap/encoding/=schema/soap-encoding_1_1.xsd
http\://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd=schema/j2ee_web_services_client_1_1.xsd
Modified: stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as6.xml
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as6.xml 2011-05-11 09:03:34 UTC (rev 14372)
+++ stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as6.xml 2011-05-11 12:53:19 UTC (rev 14373)
@@ -7,11 +7,6 @@
<property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
</bean>
- <!-- A subscription manager for WS-Eventing -->
- <bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager">
- <property name="bindAddress">${jboss.bind.address}</property>
- </bean>
-
<!-- This should actually be in the stack-agnostic config file, it's here to avoid installing a CI -->
<bean name="WSDescriptorParser" class="org.jboss.ws.common.deployment.WebservicesDescriptorParserImpl">
<property name="descriptorName">webservices.xml</property>
@@ -60,10 +55,6 @@
</property>
</bean>
- <bean name="WSNativeEventingDeploymentAspect" class="org.jboss.wsf.stack.jbws.EventingDeploymentAspect">
- <property name="requires">UnifiedMetaDataModel</property>
- </bean>
-
<bean name="WSNativePublishContractDeploymentAspect" class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect">
<property name="requires">UnifiedMetaDataModel, JAXBIntros</property>
<property name="provides">PublishedContract</property>
Deleted: stack/native/trunk/modules/core/src/main/resources/schema/eventing_200408.xsd
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/schema/eventing_200408.xsd 2011-05-11 09:03:34 UTC (rev 14372)
+++ stack/native/trunk/modules/core/src/main/resources/schema/eventing_200408.xsd 2011-05-11 12:53:19 UTC (rev 14373)
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-(c) 2004 BEA Systems Inc., Computer Associates International, Inc., International Business Machines Corporation, Microsoft Corporation, Inc, Sun Microsystems, Inc., and TIBCO Software Inc. All rights reserved.
-
-BEA Systems Inc., Computer Associates International, Inc., International Business Machines Corporation, Microsoft Corporation, Inc, Sun Microsystems, Inc, and TIBCO Software Inc (collectively, the "Authors") hereby grant you permission to copy and display the WS-Eventing Specification (the "Specification", which includes WSDL and schema documents), in any medium without fee or royalty, provided that you include the following on ALL copies of the Specification, that you make:
-
-1. A link or URL to the WS-Eventing Specification at one of the Authors' websites
-2. The copyright notice as shown in the WS-Eventing Specification.
-
-BEA, CA, IBM, Microsoft, Sun and TIBCO (collectively, the "Authors") each agree to grant you a license, under royalty-free and otherwise reasonable, non-discriminatory terms and conditions, to their respective essential patent claims that they deem necessary to implement the Specification.
-
-THE SPECIFICATION IS PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE SPECIFICATION ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THE SPECIFICATION.
-
-The name and trademarks of the Authors may NOT be used in any manner, including advertising or publicity pertaining to the Specification or its contents without specific, written prior permission. Title to copyright in the Specification will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
--->
-<xs:schema targetNamespace="http://schemas.xmlsoap.org/ws/2004/08/eventing"
- xmlns:tns="http://schemas.xmlsoap.org/ws/2004/08/eventing"
- xmlns:wsa="http://www.w3.org/2005/08/addressing"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified"
- blockDefault="#all">
-
- <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-
- <!--xs:import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="wsaddr.xsd"/-->
- <xs:import namespace="http://www.w3.org/2005/08/addressing"/>
-
- <!-- Types and global elements -->
- <xs:complexType name="DeliveryType" mixed="true">
- <xs:sequence>
- <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:attribute name="Mode" type="xs:anyURI" use="optional"/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:complexType>
-
- <xs:element name="NotifyTo" type="wsa:EndpointReferenceType"/>
-
- <xs:simpleType name="NonNegativeDurationType">
- <xs:restriction base="xs:duration">
- <xs:minInclusive value="P0Y0M0DT0H0M0S"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name="ExpirationType">
- <xs:union memberTypes="xs:dateTime tns:NonNegativeDurationType"/>
- </xs:simpleType>
-
- <xs:complexType name="FilterType" mixed="true">
- <xs:sequence>
- <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:attribute name="Dialect" type="xs:anyURI" use="optional"/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:complexType>
-
- <xs:complexType name="LanguageSpecificStringType">
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute ref="xml:lang"/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <!-- Subscribe request -->
- <xs:element name="Subscribe">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="EndTo" type="wsa:EndpointReferenceType" minOccurs="0"/>
- <xs:element name="Delivery" type="tns:DeliveryType"/>
- <xs:element name="Expires" type="tns:ExpirationType" minOccurs="0"/>
- <xs:element name="Filter" type="tns:FilterType" minOccurs="0"/>
- <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="Identifier" type="xs:anyURI"/>
-
- <!-- Subscribe response -->
- <xs:element name="SubscribeResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="SubscriptionManager" type="wsa:EndpointReferenceType"/>
- <xs:element name="Expires" type="tns:ExpirationType"/>
- <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:complexType>
- </xs:element>
-
- <!-- Used in a fault if there's an unsupported dialect -->
- <xs:element name="SupportedDialect" type="xs:anyURI"/>
-
- <!-- Used in a fault if there's an unsupported delivery mode -->
- <xs:element name="SupportedDeliveryMode" type="xs:anyURI"/>
-
- <!-- Renew request -->
- <xs:element name="Renew">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Expires" type="tns:ExpirationType" minOccurs="0"/>
- <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:complexType>
- </xs:element>
-
- <!-- Renew response -->
- <xs:element name="RenewResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Expires" type="tns:ExpirationType" minOccurs="0"/>
- <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:complexType>
- </xs:element>
-
- <!-- GetStatus request -->
- <xs:element name="GetStatus">
- <xs:complexType>
- <xs:sequence>
- <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:complexType>
- </xs:element>
-
- <!-- GetStatus response -->
- <xs:element name="GetStatusResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Expires" type="tns:ExpirationType" minOccurs="0"/>
- <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:complexType>
- </xs:element>
-
- <!-- Unsubscribe request -->
- <xs:element name="Unsubscribe">
- <xs:complexType>
- <xs:sequence>
- <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:complexType>
- </xs:element>
-
- <!-- count(/s:Envelope/s:Body/*) = 0 for Unsubscribe response -->
-
- <!-- SubscriptionEnd message -->
- <xs:element name="SubscriptionEnd">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="SubscriptionManager" type="wsa:EndpointReferenceType"/>
- <xs:element name="Code" type="tns:OpenSubscriptionEndCodeType"/>
- <xs:element name="Reason" type="tns:LanguageSpecificStringType" minOccurs="0" maxOccurs="unbounded"/>
- <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:complexType>
- </xs:element>
-
- <xs:simpleType name="SubscriptionEndCodeType">
- <xs:restriction base="xs:QName">
- <xs:enumeration value="tns:DeliveryFailure"/>
- <xs:enumeration value="tns:SourceShuttingDown"/>
- <xs:enumeration value="tns:SourceCancelling"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name="OpenSubscriptionEndCodeType">
- <xs:union memberTypes="tns:SubscriptionEndCodeType xs:QName"/>
- </xs:simpleType>
-
- <xs:attribute name="EventSource" type="xs:boolean"/>
-
-</xs:schema>
\ No newline at end of file
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-05-11 09:03:34 UTC (rev 14372)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-05-11 12:53:19 UTC (rev 14373)
@@ -914,20 +914,6 @@
</classes>
</war>
- <!-- jaxws-wseventing -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-wseventing.war" webxml="${tests.output.dir}/test-resources/jaxws/wseventing/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/ws/eventing/*.class" />
- <include name="org/jboss/test/ws/jaxws/wseventing/*.class" />
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxws/wseventing/WEB-INF">
- <include name="wsdl/**" />
- </webinf>
- <manifest>
- <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/>
- </manifest>
- </war>
-
</target>
</project>
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2011-05-11 09:03:34 UTC (rev 14372)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2011-05-11 12:53:19 UTC (rev 14373)
@@ -268,29 +268,6 @@
prefix="WEB-INF/wsdl"/>
</war>
- <!-- jaxws-samples-wseventing -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wseventing.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/wseventing/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/samples/wseventing/Sysmon**.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wseventing/WEB-INF">
- <include name="wsdl/jboss-web.xml"/>
- <include name="wsdl/sysmon.wsdl"/>
- <include name="wsdl/ws-eventing.wsdl"/>
- <include name="wsdl/ws-eventing.xsd"/>
- <include name="wsdl/ws-addr.xsd"/>
- </webinf>
- <manifest>
- <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/>
- </manifest>
- </war>
- <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wseventing-sink.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/samples/wseventing/EventSink*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wseventing/SystemStatus.class"/>
- </fileset>
- </jar>
-
<!-- jaxws-samples-wssecurity-encrypt -->
<war warfile="${tests.output.dir}/test-libs/jaxws-samples-wssecurity-encrypt.war"
webxml="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/WEB-INF/web.xml">
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java 2011-05-11 09:03:34 UTC (rev 14372)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java 2011-05-11 12:53:19 UTC (rev 14373)
@@ -30,7 +30,6 @@
import org.jboss.test.ws.tools.validation.WSDLValidator;
import org.jboss.ws.common.Constants;
-import org.jboss.ws.extensions.eventing.EventingConstants;
import org.jboss.ws.metadata.wsdl.WSDLBinding;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.metadata.wsdl.WSDLEndpoint;
@@ -152,32 +151,6 @@
assertEquals(new QName(TARGET_NAMESPACE, "SimpleUserType"), childPart.getType());
}
-
- public void testEventSourceBinding() throws Exception
- {
- URL wsdlFile = getResourceURL("common/wsdl11/inherit/wind_inherit.wsdl");
-
- WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
- WSDLDefinitions wsdlDefinitions = factory.parse(wsdlFile);
-
- WSDLService service = wsdlDefinitions.getService(new QName("http://schemas.xmlsoap.org/ws/2004/08/eventing", "EventingService"));
- assertNotNull(service);
- WSDLEndpoint[] endpoints = service.getEndpoints();
- for (int i = 0; i < endpoints.length; i++)
- {
- WSDLEndpoint ep = endpoints[i];
- assertEquals(EventingConstants.NS_EVENTING, ep.getName().getNamespaceURI());
- }
-
- WSDLInterface warningsInterface = wsdlDefinitions.getInterface(new QName(wsdlDefinitions.getTargetNamespace(), "Warnings"));
- assertNotNull("Event source port type not parsed", warningsInterface);
- assertEquals(warningsInterface.getName().getNamespaceURI(), "http://www.example.org/oceanwatch");
-
- WSDLInterface eventSourceInterface = wsdlDefinitions.getInterface(new QName("http://schemas.xmlsoap.org/ws/2004/08/eventing", "EventSource"));
- assertNotNull(eventSourceInterface);
- assertEquals(eventSourceInterface.getName().getNamespaceURI(), EventingConstants.NS_EVENTING);
- }
-
public void testSwaMessages() throws Exception
{
URL wsdlFile = getResourceURL("common/wsdl11/SwaTestService.wsdl");
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/soap/req5.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/soap/req5.xml 2011-05-11 09:03:34 UTC (rev 14372)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/soap/req5.xml 2011-05-11 12:53:19 UTC (rev 14373)
@@ -1,11 +0,0 @@
-<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
- <env:Header xmlns:wsa='http://www.w3.org/2005/08/addressing'>
- <wsa:To>http://www.jboss.org/sysmon/SystemInfo</wsa:To>
- <wsa:Action>http://schemas.xmlsoap.org/ws/2004/08/eventing/Unsubscribe</wsa:Action>
- <wsa:MessageID>urn:uuid:69eb1744-c779-49b7-88f8-d58d0b01c85c</wsa:MessageID>
- <wse:Identifier wsa:IsReferenceParameter='true' xmlns:wse='http://schemas.xmlsoap.org/ws/2004/08/eventing'>urn:jbwse:6eda352-a0de-4260-b804-1a9623e50b82</wse:Identifier>
- </env:Header>
- <env:Body>
- <ns1:Unsubscribe xmlns:ns1='http://schemas.xmlsoap.org/ws/2004/08/eventing' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'/>
- </env:Body>
-</env:Envelope>
\ No newline at end of file
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/wsdl11/inherit/eventing.wsdl
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/wsdl11/inherit/eventing.wsdl 2011-05-11 09:03:34 UTC (rev 14372)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/wsdl11/inherit/eventing.wsdl 2011-05-11 12:53:19 UTC (rev 14373)
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<wsdl:definitions
- targetNamespace='http://schemas.xmlsoap.org/ws/2004/08/eventing'
- xmlns:wse='http://schemas.xmlsoap.org/ws/2004/08/eventing'
- xmlns:wsa10='http://www.w3.org/2005/08/addressing'
- xmlns:wsdl='http://schemas.xmlsoap.org/wsdl/'
- xmlns:xs='http://www.w3.org/2001/XMLSchema'
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-
- <wsdl:types>
- <xs:schema targetNamespace='http://schemas.xmlsoap.org/ws/2004/08/eventing'>
- <xs:include schemaLocation='eventing.xsd'/>
- </xs:schema>
- </wsdl:types>
-
- <wsdl:message name='SubscribeMsg'>
- <wsdl:part name='body' element='wse:Subscribe'/>
- </wsdl:message>
- <wsdl:message name='SubscribeResponseMsg'>
- <wsdl:part name='body' element='wse:SubscribeResponse'/>
- </wsdl:message>
-
- <wsdl:message name='RenewMsg'>
- <wsdl:part name='body' element='wse:Renew'/>
- </wsdl:message>
- <wsdl:message name='RenewResponseMsg'>
- <wsdl:part name='body' element='wse:RenewResponse'/>
- </wsdl:message>
-
- <wsdl:message name='GetStatusMsg'>
- <wsdl:part name='body' element='wse:GetStatus'/>
- </wsdl:message>
- <wsdl:message name='GetStatusResponseMsg'>
- <wsdl:part name='body' element='wse:GetStatusResponse'/>
- </wsdl:message>
-
- <wsdl:message name='UnsubscribeMsg'>
- <wsdl:part name='body' element='wse:Unsubscribe'/>
- </wsdl:message>
- <wsdl:message name='UnsubscribeResponseMsg'/>
-
- <wsdl:message name='SubscriptionEnd'>
- <wsdl:part name='body' element='wse:SubscriptionEnd'/>
- </wsdl:message>
-
- <wsdl:portType name='EventSource'>
- <wsdl:operation name='SubscribeOp'>
- <wsdl:input message='wse:SubscribeMsg' wsa10:Action='http://schemas.xmlsoap.org/ws/2004/08/eventing/Subscribe'/>
- <wsdl:output message='wse:SubscribeResponseMsg' wsa10:Action='http://schemas.xmlsoap.org/ws/2004/08/eventing/SubscribeResponse'/>
- </wsdl:operation>
- <wsdl:operation name='SubscriptionEnd'>
- <wsdl:output message='wse:SubscriptionEnd'/>
- </wsdl:operation>
- </wsdl:portType>
-
- <wsdl:portType name='SubscriptionManager'>
- <wsdl:operation name='RenewOp'>
- <wsdl:input message='wse:RenewMsg' wsa10:Action='http://schemas.xmlsoap.org/ws/2004/08/eventing/Renew'/>
- <wsdl:output message='wse:RenewResponseMsg' wsa10:Action='http://schemas.xmlsoap.org/ws/2004/08/eventing/RenewResponse'/>
- </wsdl:operation>
- <wsdl:operation name='GetStatusOp'>
- <wsdl:input message='wse:GetStatusMsg' wsa10:Action='http://schemas.xmlsoap.org/ws/2004/08/eventing/GetStatus'/>
- <wsdl:output message='wse:GetStatusResponseMsg' wsa10:Action='http://schemas.xmlsoap.org/ws/2004/08/eventing/GetStatusResponse'/>
- </wsdl:operation>
- <wsdl:operation name='UnsubscribeOp'>
- <wsdl:input message='wse:UnsubscribeMsg' wsa10:Action='http://schemas.xmlsoap.org/ws/2004/08/eventing/Unsubscribe'/>
- <wsdl:output message='wse:UnsubscribeResponseMsg' wsa10:Action='http://schemas.xmlsoap.org/ws/2004/08/eventing/UnsubscribeResponse'/>
- </wsdl:operation>
- </wsdl:portType>
-
- <wsdl:binding name="EventSourceBinding" type="wse:EventSource">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="SubscribeOp">
- <soap:operation soapAction=""/>
- <wsdl:input>
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="SubscriptionEnd">
- <soap:operation soapAction=""/>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
-
- <wsdl:binding name="SubscriptionManagerBinding" type="wse:SubscriptionManager">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="GetStatusOp">
- <soap:operation soapAction=""/>
- <wsdl:input>
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
-
- <wsdl:operation name="RenewOp">
- <soap:operation soapAction=""/>
- <wsdl:input>
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
-
- <wsdl:operation name="UnsubscribeOp">
- <soap:operation soapAction=""/>
- <wsdl:input>
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
-
- <wsdl:service name="EventingService">
- <wsdl:port name="EventSourcePort" binding="wse:EventSourceBinding">
- <soap:address location="http://@jboss.bind.address@:8080/jbossws-test-eventing/ws4ee/EventSourcePortType"/>
- </wsdl:port>
- <wsdl:port name="SubscriptionManagerPort" binding="wse:SubscriptionManagerBinding">
- <soap:address location="http://@jboss.bind.address@:8080/jbossws-test-eventing/ws4ee/SubscriptionManagerPortType"/>
- </wsdl:port>
- </wsdl:service>
-
-</wsdl:definitions>
\ No newline at end of file
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/wsdl11/inherit/eventing.xsd
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/wsdl11/inherit/eventing.xsd 2011-05-11 09:03:34 UTC (rev 14372)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/wsdl11/inherit/eventing.xsd 2011-05-11 12:53:19 UTC (rev 14373)
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xs:schema
- targetNamespace="http://schemas.xmlsoap.org/ws/2004/08/eventing"
- xmlns:tns="http://schemas.xmlsoap.org/ws/2004/08/eventing"
- xmlns:wsa="http://www.w3.org/2005/08/addressing"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified"
- attributeFormDefault="unqualified"
- blockDefault="#all">
-
- <!--TODO Parser complains about this
-xs:import namespace="http://www.w3.org/XML/1998/namespace"
- schemaLocation="http://www.w3.org/2001/xml.xsd"/-->
-
- <xs:import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="wsaddr.xsd"/>
-
- <!-- Types and global elements -->
- <xs:complexType name="DeliveryType" mixed="true">
- <xs:sequence>
- <!--xs:any namespace="##any" processContents="lax"
- minOccurs="0" maxOccurs="unbounded" /-->
- <xs:element name="NotifyTo" type="wsa:EndpointReferenceType" minOccurs="0" maxOccurs="1"/>
- </xs:sequence>
- <xs:attribute name="Mode" type="xs:anyURI" use="optional"/>
- <!--xs:anyAttribute namespace="##other" processContents="lax" /-->
- </xs:complexType>
-
- <!--xs:element name="NotifyTo" type="wsa:EndpointReferenceType" /-->
-
- <xs:simpleType name="NonNegativeDurationType">
- <xs:restriction base="xs:duration">
- <xs:minInclusive value="P0Y0M0DT0H0M0S"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name="ExpirationType">
- <xs:union memberTypes="xs:dateTime tns:NonNegativeDurationType"/>
- </xs:simpleType>
-
- <xs:complexType name="FilterType" mixed="true">
- <!--xs:sequence>
- <xs:any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded" />
- </xs:sequence-->
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="Dialect" type="xs:anyURI" use="optional"/>
- </xs:extension>
- </xs:simpleContent>
-
- <!--xs:anyAttribute namespace="##other" processContents="lax" /-->
- </xs:complexType>
-
- <xs:complexType name="LanguageSpecificStringType">
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <!-- TODO Parser complains about this
- xs:attribute ref="xml:lang" /-->
- <!--xs:anyAttribute namespace="##other" processContents="lax" /-->
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:element name="Subscribe">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="EndTo" type="wsa:EndpointReferenceType"
- minOccurs="0"/>
- <xs:element name="Delivery" type="tns:DeliveryType"/>
- <xs:element name="Expires" type="xs:dateTime" minOccurs="0"/>
- <xs:element name="Filter" type="tns:FilterType" minOccurs="0"/>
- <!--xs:any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded" /-->
- </xs:sequence>
- <!--xs:anyAttribute namespace="##other" processContents="lax" /-->
- </xs:complexType>
- </xs:element>
-
- <xs:element name="Identifier" type="xs:anyURI"/>
-
- <xs:element name="SubscribeResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="SubscriptionManager"
- type="wsa:EndpointReferenceType"/>
- <xs:element name="Expires" type="xs:dateTime"/>
-
- <!--xs:element name="Expires" type="tns:ExpirationType" /-->
- <!--xs:any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded" /-->
- </xs:sequence>
- <!--xs:anyAttribute namespace="##other" processContents="lax" /-->
- </xs:complexType>
- </xs:element>
-
- <!-- Used in a fault if there's an unsupported dialect -->
- <xs:element name="SupportedDialect" type="xs:anyURI"/>
-
- <!-- Used in a fault if there's an unsupported delivery mode -->
- <xs:element name="SupportedDeliveryMode" type="xs:anyURI"/>
-
- <!-- Renew request -->
- <xs:element name="Renew">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Expires" type="xs:dateTime" minOccurs="0"/>
- <!--xs:any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded" /-->
- </xs:sequence>
- <!--xs:anyAttribute namespace="##other" processContents="lax" /-->
- </xs:complexType>
- </xs:element>
-
- <!-- Renew response -->
- <xs:element name="RenewResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Expires" type="xs:dateTime" minOccurs="0"/>
- <!--xs:any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded" /-->
- </xs:sequence>
- <!--xs:anyAttribute namespace="##other" processContents="lax" /-->
- </xs:complexType>
- </xs:element>
-
- <!-- GetStatus request -->
- <xs:element name="GetStatus">
- <xs:complexType>
- <xs:sequence>
- <!--xs:any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded" /-->
- </xs:sequence>
- <!--xs:anyAttribute namespace="##other" processContents="lax" /-->
- </xs:complexType>
- </xs:element>
-
- <!-- GetStatus response -->
- <xs:element name="GetStatusResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Expires" type="xs:dateTime" minOccurs="0"/>
- <!--xs:any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded" /-->
- </xs:sequence>
- <!--xs:anyAttribute namespace="##other" processContents="lax" /-->
- </xs:complexType>
- </xs:element>
-
- <!-- Unsubscribe request -->
- <xs:element name="Unsubscribe">
- <xs:complexType>
- <xs:sequence>
- <!--xs:any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded" /-->
- </xs:sequence>
- <!--xs:anyAttribute namespace="##other" processContents="lax" /-->
- </xs:complexType>
- </xs:element>
-
- <!-- count(/s:Envelope/s:Body/*) = 0 for Unsubscribe response -->
- <!-- SubscriptionEnd message -->
- <xs:element name="SubscriptionEnd">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="SubscriptionManager"
- type="wsa:EndpointReferenceType"/>
- <xs:element name="Code" type="tns:OpenSubscriptionEndCodeType"/>
- <xs:element name="Reason" type="tns:LanguageSpecificStringType"
- minOccurs="0" maxOccurs="unbounded"/>
- <!--xs:any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded" /-->
- </xs:sequence>
- <!--xs:anyAttribute namespace="##other" processContents="lax" /-->
- </xs:complexType>
- </xs:element>
-
- <xs:simpleType name="SubscriptionEndCodeType">
- <xs:restriction base="xs:QName">
- <xs:enumeration value="tns:DeliveryFailure"/>
- <xs:enumeration value="tns:SourceShuttingDown"/>
- <xs:enumeration value="tns:SourceCancelling"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name="OpenSubscriptionEndCodeType">
- <xs:union memberTypes="tns:SubscriptionEndCodeType xs:QName"/>
- </xs:simpleType>
-
- <xs:attribute name="EventSource" type="xs:boolean"/>
-
-</xs:schema>
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/wsdl11/inherit/wind_inherit.wsdl
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/wsdl11/inherit/wind_inherit.wsdl 2011-05-11 09:03:34 UTC (rev 14372)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/wsdl11/inherit/wind_inherit.wsdl 2011-05-11 12:53:19 UTC (rev 14373)
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<wsdl:definitions
- targetNamespace="http://www.example.org/oceanwatch"
- xmlns:tns="http://www.example.org/oceanwatch"
- xmlns:wse='http://schemas.xmlsoap.org/ws/2004/08/eventing'
- xmlns:wsdl='http://schemas.xmlsoap.org/wsdl/'
- xmlns:wsa10='http://www.w3.org/2005/08/addressing'
- xmlns:xs='http://www.w3.org/2001/XMLSchema'
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-
- <wsdl:import
- namespace='http://schemas.xmlsoap.org/ws/2004/08/eventing'
- location='eventing.wsdl' />
-
- <wsdl:types>
-
- <xs:schema
- targetNamespace="http://www.example.org/oceanwatch"
- elementFormDefault="qualified"
- blockDefault="#all">
- <xs:element name="WindReport">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Date" type="xs:string"/>
- <xs:element name="Time" type="xs:string"/>
- <xs:element name="Speed" type="xs:string"/>
- <xs:element name="Location" type="xs:string"/>
- <xs:element name="County" type="xs:string"/>
- <xs:element name="State" type="xs:string"/>
- <xs:element name="Lat" type="xs:string"/>
- <xs:element name="Long" type="xs:string"/>
- <xs:element name="Comments" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:schema>
-
- </wsdl:types>
-
- <wsdl:portType name='Warnings' wse:EventSource='true'>
- <wsdl:operation name='WindOp'>
- <wsdl:output message='tns:WindMsg'/>
- </wsdl:operation>
- </wsdl:portType>
-
- <wsdl:binding name="WarningsBinding" type="tns:Warnings">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="WindOp">
- <soap:operation soapAction=""/>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
-
-</wsdl:definitions>
\ No newline at end of file
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-05-11 09:03:34 UTC (rev 14372)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-05-11 12:53:19 UTC (rev 14373)
@@ -732,8 +732,6 @@
<phase>test-compile</phase>
<configuration>
<testExcludes>
- <!-- WSEventing still depends on JBoss Remoting -->
- <exclude>org/jboss/test/ws/jaxws/wseventing/**</exclude>
<!-- EJB3 client API dependencies -->
<exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude>
<exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude>
@@ -847,10 +845,6 @@
<!-- # [JBWS-3240] Rewrite tests relying on $JBOSS_HOME/server/default/tmp/jbossws folder existence -->
<exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/**</exclude>
- <!-- # [JBWS-3244] resuscitate WS-Eventing -->
- <exclude>org/jboss/test/ws/jaxws/wseventing/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/wseventing/**</exclude>
-
<!-- # [JBWS-3246] Resuscitate JSON -->
<exclude>org/jboss/test/ws/jaxws/json/JsonTestCase*</exclude>
14 years, 8 months
JBossWS SVN: r14372 - in stack/cxf/tags/jbossws-cxf-4.0.0.Beta1: modules/addons and 11 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-05-11 05:03:34 -0400 (Wed, 11 May 2011)
New Revision: 14372
Added:
stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/README
Modified:
stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/addons/pom.xml
stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/addons/transports/http/httpserver/pom.xml
stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/client/pom.xml
stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/dist/management/pom.xml
stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/dist/pom.xml
stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/endorsed/pom.xml
stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/resources/pom.xml
stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/server/pom.xml
stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/testsuite/cxf-spring-tests/pom.xml
stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/testsuite/cxf-tests/pom.xml
stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/testsuite/pom.xml
stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/testsuite/shared-tests/pom.xml
stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/pom.xml
Log:
Updating poms
Added: stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/README
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/README (rev 0)
+++ stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/README 2011-05-11 09:03:34 UTC (rev 14372)
@@ -0,0 +1 @@
+Due to implicit dependency on jbossws-native for jaxrpc functionalities, you need to deploy the corresponding (4.0.0.Beta1) jbossws-native release to JBoss AS 6 before deploying this version of jbossws-cxf and successfully run testsuites.
Modified: stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/addons/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/addons/pom.xml 2011-05-11 08:48:03 UTC (rev 14371)
+++ stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/addons/pom.xml 2011-05-11 09:03:34 UTC (rev 14372)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/addons/transports/http/httpserver/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/addons/transports/http/httpserver/pom.xml 2011-05-11 08:48:03 UTC (rev 14371)
+++ stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/addons/transports/http/httpserver/pom.xml 2011-05-11 09:03:34 UTC (rev 14372)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-addons</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/client/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/client/pom.xml 2011-05-11 08:48:03 UTC (rev 14371)
+++ stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/client/pom.xml 2011-05-11 09:03:34 UTC (rev 14372)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/dist/management/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/dist/management/pom.xml 2011-05-11 08:48:03 UTC (rev 14371)
+++ stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/dist/management/pom.xml 2011-05-11 09:03:34 UTC (rev 14372)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<!-- Build -->
Modified: stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/dist/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/dist/pom.xml 2011-05-11 08:48:03 UTC (rev 14371)
+++ stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/dist/pom.xml 2011-05-11 09:03:34 UTC (rev 14372)
@@ -4,12 +4,12 @@
<name>JBoss Web Services - Stack CXF Distrubiton</name>
<artifactId>jbossws-cxf-dist</artifactId>
<packaging>pom</packaging>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta1</version>
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/endorsed/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/endorsed/pom.xml 2011-05-11 08:48:03 UTC (rev 14371)
+++ stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/endorsed/pom.xml 2011-05-11 09:03:34 UTC (rev 14372)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/resources/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/resources/pom.xml 2011-05-11 08:48:03 UTC (rev 14371)
+++ stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/resources/pom.xml 2011-05-11 09:03:34 UTC (rev 14372)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/server/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/server/pom.xml 2011-05-11 08:48:03 UTC (rev 14371)
+++ stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/server/pom.xml 2011-05-11 09:03:34 UTC (rev 14372)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/testsuite/cxf-spring-tests/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/testsuite/cxf-spring-tests/pom.xml 2011-05-11 08:48:03 UTC (rev 14371)
+++ stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/testsuite/cxf-spring-tests/pom.xml 2011-05-11 09:03:34 UTC (rev 14372)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta1</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/testsuite/cxf-tests/pom.xml 2011-05-11 08:48:03 UTC (rev 14371)
+++ stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/testsuite/cxf-tests/pom.xml 2011-05-11 09:03:34 UTC (rev 14372)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta1</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/testsuite/pom.xml 2011-05-11 08:48:03 UTC (rev 14371)
+++ stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/testsuite/pom.xml 2011-05-11 09:03:34 UTC (rev 14372)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/testsuite/shared-tests/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/testsuite/shared-tests/pom.xml 2011-05-11 08:48:03 UTC (rev 14371)
+++ stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/modules/testsuite/shared-tests/pom.xml 2011-05-11 09:03:34 UTC (rev 14372)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta1</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/pom.xml 2011-05-11 08:48:03 UTC (rev 14371)
+++ stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/pom.xml 2011-05-11 09:03:34 UTC (rev 14372)
@@ -18,20 +18,20 @@
<packaging>pom</packaging>
<description>JBossWS CXF stack</description>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta1</version>
<!-- Parent -->
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-parent</artifactId>
- <version>1.0.10-SNAPSHOT</version>
+ <version>1.0.9.GA</version>
</parent>
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/trunk</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf-4....</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/tags/jbossws-cxf-4.0.0...</url>
</scm>
<!-- Modules -->
@@ -45,11 +45,11 @@
<!-- Properties -->
<properties>
- <jbossws.spi.version>2.0.0-SNAPSHOT</jbossws.spi.version>
- <jbossws.common.version>2.0.0-SNAPSHOT</jbossws.common.version>
- <jbossws.common.tools.version>1.0.0-SNAPSHOT</jbossws.common.tools.version>
- <jbossws.shared.testsuite.version>4.0.0-SNAPSHOT</jbossws.shared.testsuite.version>
- <jbossws.jboss600.version>4.0.0-SNAPSHOT</jbossws.jboss600.version>
+ <jbossws.spi.version>2.0.0.Beta1</jbossws.spi.version>
+ <jbossws.common.version>2.0.0.Beta1</jbossws.common.version>
+ <jbossws.common.tools.version>1.0.0.Beta1</jbossws.common.tools.version>
+ <jbossws.shared.testsuite.version>4.0.0.Beta1</jbossws.shared.testsuite.version>
+ <jbossws.jboss600.version>4.0.0.Beta1</jbossws.jboss600.version>
<!-- JBWS-2505 -->
<!-- START -->
<!--
@@ -57,7 +57,7 @@
-->
<!-- END -->
<jboss700.version>7.0.0.Beta4-SNAPSHOT</jboss700.version>
- <cxf.version>2.4.1-SNAPSHOT</cxf.version>
+ <cxf.version>2.4.0</cxf.version>
<cxf.asm.version>3.3</cxf.asm.version>
<cxf.xjcplugins.version>2.3.2</cxf.xjcplugins.version>
<fastinfoset.api.version>1.2.7</fastinfoset.api.version>
14 years, 8 months
JBossWS SVN: r14371 - in stack/native/tags/jbossws-native-4.0.0.Beta1: modules/client and 9 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-05-11 04:48:03 -0400 (Wed, 11 May 2011)
New Revision: 14371
Modified:
stack/native/tags/jbossws-native-4.0.0.Beta1/modules/client/pom.xml
stack/native/tags/jbossws-native-4.0.0.Beta1/modules/core/pom.xml
stack/native/tags/jbossws-native-4.0.0.Beta1/modules/dist/management/pom.xml
stack/native/tags/jbossws-native-4.0.0.Beta1/modules/dist/pom.xml
stack/native/tags/jbossws-native-4.0.0.Beta1/modules/endorsed/pom.xml
stack/native/tags/jbossws-native-4.0.0.Beta1/modules/resources/pom.xml
stack/native/tags/jbossws-native-4.0.0.Beta1/modules/services/pom.xml
stack/native/tags/jbossws-native-4.0.0.Beta1/modules/testsuite/native-tests/pom.xml
stack/native/tags/jbossws-native-4.0.0.Beta1/modules/testsuite/pom.xml
stack/native/tags/jbossws-native-4.0.0.Beta1/modules/testsuite/shared-tests/pom.xml
stack/native/tags/jbossws-native-4.0.0.Beta1/pom.xml
Log:
Updating poms
Modified: stack/native/tags/jbossws-native-4.0.0.Beta1/modules/client/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-4.0.0.Beta1/modules/client/pom.xml 2011-05-11 08:47:16 UTC (rev 14370)
+++ stack/native/tags/jbossws-native-4.0.0.Beta1/modules/client/pom.xml 2011-05-11 08:48:03 UTC (rev 14371)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-4.0.0.Beta1/modules/core/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-4.0.0.Beta1/modules/core/pom.xml 2011-05-11 08:47:16 UTC (rev 14370)
+++ stack/native/tags/jbossws-native-4.0.0.Beta1/modules/core/pom.xml 2011-05-11 08:48:03 UTC (rev 14371)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-4.0.0.Beta1/modules/dist/management/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-4.0.0.Beta1/modules/dist/management/pom.xml 2011-05-11 08:47:16 UTC (rev 14370)
+++ stack/native/tags/jbossws-native-4.0.0.Beta1/modules/dist/management/pom.xml 2011-05-11 08:48:03 UTC (rev 14371)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-4.0.0.Beta1/modules/dist/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-4.0.0.Beta1/modules/dist/pom.xml 2011-05-11 08:47:16 UTC (rev 14370)
+++ stack/native/tags/jbossws-native-4.0.0.Beta1/modules/dist/pom.xml 2011-05-11 08:48:03 UTC (rev 14371)
@@ -5,12 +5,12 @@
<name>JBoss Web Services - Stack Native Distribution</name>
<artifactId>jbossws-native-dist</artifactId>
<packaging>pom</packaging>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta1</version>
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-4.0.0.Beta1/modules/endorsed/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-4.0.0.Beta1/modules/endorsed/pom.xml 2011-05-11 08:47:16 UTC (rev 14370)
+++ stack/native/tags/jbossws-native-4.0.0.Beta1/modules/endorsed/pom.xml 2011-05-11 08:48:03 UTC (rev 14371)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-4.0.0.Beta1/modules/resources/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-4.0.0.Beta1/modules/resources/pom.xml 2011-05-11 08:47:16 UTC (rev 14370)
+++ stack/native/tags/jbossws-native-4.0.0.Beta1/modules/resources/pom.xml 2011-05-11 08:48:03 UTC (rev 14371)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-4.0.0.Beta1/modules/services/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-4.0.0.Beta1/modules/services/pom.xml 2011-05-11 08:47:16 UTC (rev 14370)
+++ stack/native/tags/jbossws-native-4.0.0.Beta1/modules/services/pom.xml 2011-05-11 08:48:03 UTC (rev 14371)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-4.0.0.Beta1/modules/testsuite/native-tests/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-4.0.0.Beta1/modules/testsuite/native-tests/pom.xml 2011-05-11 08:47:16 UTC (rev 14370)
+++ stack/native/tags/jbossws-native-4.0.0.Beta1/modules/testsuite/native-tests/pom.xml 2011-05-11 08:48:03 UTC (rev 14371)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-testsuite</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta1</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-4.0.0.Beta1/modules/testsuite/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-4.0.0.Beta1/modules/testsuite/pom.xml 2011-05-11 08:47:16 UTC (rev 14370)
+++ stack/native/tags/jbossws-native-4.0.0.Beta1/modules/testsuite/pom.xml 2011-05-11 08:48:03 UTC (rev 14371)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-4.0.0.Beta1/modules/testsuite/shared-tests/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-4.0.0.Beta1/modules/testsuite/shared-tests/pom.xml 2011-05-11 08:47:16 UTC (rev 14370)
+++ stack/native/tags/jbossws-native-4.0.0.Beta1/modules/testsuite/shared-tests/pom.xml 2011-05-11 08:48:03 UTC (rev 14371)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-testsuite</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta1</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-4.0.0.Beta1/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-4.0.0.Beta1/pom.xml 2011-05-11 08:47:16 UTC (rev 14370)
+++ stack/native/tags/jbossws-native-4.0.0.Beta1/pom.xml 2011-05-11 08:48:03 UTC (rev 14371)
@@ -18,20 +18,20 @@
<packaging>pom</packaging>
<description>JBossWS Native stack</description>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta1</version>
<!-- Parent -->
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-parent</artifactId>
- <version>1.0.10-SNAPSHOT</version>
+ <version>1.0.9.GA</version>
</parent>
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/trunk</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/tags/jbossws-...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/tags/jbossws-nat...</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/tags/jbossws-native...</url>
</scm>
<!-- Modules -->
@@ -45,11 +45,11 @@
<!-- Properties -->
<properties>
- <jbossws.spi.version>2.0.0-SNAPSHOT</jbossws.spi.version>
- <jbossws.common.version>2.0.0-SNAPSHOT</jbossws.common.version>
- <jbossws.common.tools.version>1.0.0-SNAPSHOT</jbossws.common.tools.version>
- <jbossws.shared.testsuite.version>4.0.0-SNAPSHOT</jbossws.shared.testsuite.version>
- <jbossws.jboss600.version>4.0.0-SNAPSHOT</jbossws.jboss600.version>
+ <jbossws.spi.version>2.0.0.Beta1</jbossws.spi.version>
+ <jbossws.common.version>2.0.0.Beta1</jbossws.common.version>
+ <jbossws.common.tools.version>1.0.0.Beta1</jbossws.common.tools.version>
+ <jbossws.shared.testsuite.version>4.0.0.Beta1</jbossws.shared.testsuite.version>
+ <jbossws.jboss600.version>4.0.0.Beta1</jbossws.jboss600.version>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
14 years, 8 months
JBossWS SVN: r14370 - in shared-testsuite/tags/jbossws-shared-testsuite-4.0.0.Beta1: src/main/java and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-05-11 04:47:16 -0400 (Wed, 11 May 2011)
New Revision: 14370
Removed:
shared-testsuite/tags/jbossws-shared-testsuite-4.0.0.Beta1/src/main/java/pom.xml
Modified:
shared-testsuite/tags/jbossws-shared-testsuite-4.0.0.Beta1/pom.xml
Log:
Updating pom
Modified: shared-testsuite/tags/jbossws-shared-testsuite-4.0.0.Beta1/pom.xml
===================================================================
--- shared-testsuite/tags/jbossws-shared-testsuite-4.0.0.Beta1/pom.xml 2011-05-11 08:38:34 UTC (rev 14369)
+++ shared-testsuite/tags/jbossws-shared-testsuite-4.0.0.Beta1/pom.xml 2011-05-11 08:47:16 UTC (rev 14370)
@@ -6,24 +6,24 @@
<artifactId>jbossws-shared-testsuite</artifactId>
<description>JBossWS Stack Agnostic Testsuite</description>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Beta1</version>
<!-- Parent -->
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-parent</artifactId>
- <version>1.0.10-SNAPSHOT</version>
+ <version>1.0.9.GA</version>
</parent>
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/shared-testsuite/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/shared-testsuite/trunk</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/shared-testsuite/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/shared-testsuite/tags/jbos...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/shared-testsuite/tags/jbossws...</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/shared-testsuite/tags/jbossws-sh...</url>
</scm>
<properties>
- <jbossws.common.version>2.0.0-SNAPSHOT</jbossws.common.version>
+ <jbossws.common.version>2.0.0.Beta1</jbossws.common.version>
<jboss.logging.version>2.0.5.GA</jboss.logging.version>
<junit.version>3.8.2</junit.version>
</properties>
Deleted: shared-testsuite/tags/jbossws-shared-testsuite-4.0.0.Beta1/src/main/java/pom.xml
===================================================================
--- shared-testsuite/tags/jbossws-shared-testsuite-4.0.0.Beta1/src/main/java/pom.xml 2011-05-11 08:38:34 UTC (rev 14369)
+++ shared-testsuite/tags/jbossws-shared-testsuite-4.0.0.Beta1/src/main/java/pom.xml 2011-05-11 08:47:16 UTC (rev 14370)
@@ -1,86 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <name>JBoss Web Services - Stack Agnostic Test Suite</name>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-shared-testsuite</artifactId>
- <description>JBossWS Stack Agnostic Testsuite</description>
-
- <version>4.0.0-SNAPSHOT</version>
-
- <!-- Parent -->
- <parent>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-parent</artifactId>
- <version>1.0.10-SNAPSHOT</version>
- </parent>
-
- <!-- Source Control Management -->
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/shared-testsuite/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/shared-testsuite/trunk</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/shared-testsuite/trunk</url>
- </scm>
-
- <properties>
- <jbossws.common.version>2.0.0-SNAPSHOT</jbossws.common.version>
- <jboss.logging.version>2.0.5.GA</jboss.logging.version>
- <junit.version>3.8.2</junit.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-common</artifactId>
- <version>${jbossws.common.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>${jboss.logging.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <!-- Plugins -->
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/test/scripts/assembly-testsuite.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-8</version>
- <configuration>
- <scmCommentPrefix>[${jira.issue}] :</scmCommentPrefix>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
14 years, 8 months
JBossWS SVN: r14369 - stack/cxf/tags.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-05-11 04:38:34 -0400 (Wed, 11 May 2011)
New Revision: 14369
Added:
stack/cxf/tags/jbossws-cxf-4.0.0.Beta1/
Log:
Tagging jbossws-cxf-4.0.0.Beta1
14 years, 8 months
JBossWS SVN: r14368 - shared-testsuite/trunk/src/main/java.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-05-11 04:34:32 -0400 (Wed, 11 May 2011)
New Revision: 14368
Removed:
shared-testsuite/trunk/src/main/java/pom.xml
Log:
Removing useless file
Deleted: shared-testsuite/trunk/src/main/java/pom.xml
===================================================================
--- shared-testsuite/trunk/src/main/java/pom.xml 2011-05-11 08:26:08 UTC (rev 14367)
+++ shared-testsuite/trunk/src/main/java/pom.xml 2011-05-11 08:34:32 UTC (rev 14368)
@@ -1,86 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <name>JBoss Web Services - Stack Agnostic Test Suite</name>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-shared-testsuite</artifactId>
- <description>JBossWS Stack Agnostic Testsuite</description>
-
- <version>4.0.0-SNAPSHOT</version>
-
- <!-- Parent -->
- <parent>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-parent</artifactId>
- <version>1.0.10-SNAPSHOT</version>
- </parent>
-
- <!-- Source Control Management -->
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/shared-testsuite/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/shared-testsuite/trunk</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/shared-testsuite/trunk</url>
- </scm>
-
- <properties>
- <jbossws.common.version>2.0.0-SNAPSHOT</jbossws.common.version>
- <jboss.logging.version>2.0.5.GA</jboss.logging.version>
- <junit.version>3.8.2</junit.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-common</artifactId>
- <version>${jbossws.common.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>${jboss.logging.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <!-- Plugins -->
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/test/scripts/assembly-testsuite.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-8</version>
- <configuration>
- <scmCommentPrefix>[${jira.issue}] :</scmCommentPrefix>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
14 years, 8 months