JBossWS SVN: r9849 - spi/trunk/src/main/java/org/jboss/wsf/spi/deployment.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-04-21 12:12:51 -0400 (Tue, 21 Apr 2009)
New Revision: 9849
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java
Log:
[JBWS-2619] Extending ArchiveDeployment with additional metadata files
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java 2009-04-21 11:31:20 UTC (rev 9848)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java 2009-04-21 16:12:51 UTC (rev 9849)
@@ -23,6 +23,7 @@
import java.io.IOException;
import java.net.URL;
+import java.util.List;
/**
* A general web service deployment dep.
@@ -51,4 +52,10 @@
/** Get the URL for a given resource path */
URL getMetaDataFileURL(String resourcePath) throws IOException;
+
+ /** Get additional metadata files attached to the deployment **/
+ List<UnifiedVirtualFile> getMetadataFiles();
+
+ /** Set additional metadata files for this deployment **/
+ void setMetadataFiles(List<UnifiedVirtualFile> metadataFiles);
}
15 years, 5 months
- 1
- 0
JBossWS SVN: r9848 - framework/trunk/src/main/java/org/jboss/wsf/framework/deployment.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-21 07:31:20 -0400 (Tue, 21 Apr 2009)
New Revision: 9848
Removed:
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java
Log:
[JBWS-2612] removing AS 4x support
Deleted: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java 2009-04-21 10:46:04 UTC (rev 9847)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java 2009-04-21 11:31:20 UTC (rev 9848)
@@ -1,282 +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.framework.deployment;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-
-import org.dom4j.Document;
-import org.dom4j.DocumentHelper;
-import org.dom4j.Element;
-import org.dom4j.io.OutputFormat;
-import org.dom4j.io.XMLWriter;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
-import org.jboss.wsf.spi.annotation.WebContext;
-import org.jboss.wsf.spi.deployment.ArchiveDeployment;
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.deployment.SecurityHandler;
-import org.jboss.wsf.spi.deployment.WSFDeploymentException;
-import org.jboss.wsf.spi.management.ServerConfig;
-import org.jboss.wsf.spi.management.ServerConfigFactory;
-import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData;
-
-/**
- * A deployer that generates a webapp for an EJB endpoint
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 25-Apr-2007
- */
-public class WebAppGeneratorDeploymentAspect extends DeploymentAspect
-{
- private SecurityHandler securityHandlerEJB21;
- private SecurityHandler securityHandlerEJB3;
-
- public void setSecurityHandlerEJB21(SecurityHandler handler)
- {
- this.securityHandlerEJB21 = handler;
- }
-
- public void setSecurityHandlerEJB3(SecurityHandler handler)
- {
- this.securityHandlerEJB3 = handler;
- }
-
- @Override
- public void create(Deployment dep)
- {
- String typeStr = dep.getType().toString();
- if (typeStr.endsWith("EJB21"))
- {
- URL webAppURL = generatWebDeployment((ArchiveDeployment)dep, securityHandlerEJB21);
- dep.setProperty("org.jboss.ws.webapp.url", webAppURL);
- }
- else if (typeStr.endsWith("EJB3"))
- {
- URL webAppURL = generatWebDeployment((ArchiveDeployment)dep, securityHandlerEJB3);
- dep.setProperty("org.jboss.ws.webapp.url", webAppURL);
- }
- else
- {
- URL webAppURL = generatWebDeployment((ArchiveDeployment)dep, null);
- dep.setProperty("org.jboss.ws.webapp.url", webAppURL);
- }
- }
-
- protected URL generatWebDeployment(ArchiveDeployment dep, SecurityHandler securityHandler)
- {
- Document webDoc = createWebAppDescriptor(dep, securityHandler);
- Document jbossDoc = createJBossWebAppDescriptor(dep, securityHandler);
-
- File tmpWar = null;
- try
- {
- // TODO: recursive dependency, ohoh
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
- File tmpdir = new File(config.getServerTempDir().getCanonicalPath() + "/deploy");
-
- String deploymentName = dep.getCanonicalName().replace('/', '-');
- tmpWar = File.createTempFile(deploymentName, ".war", tmpdir);
- tmpWar.delete();
-
- File webInf = new File(tmpWar, "WEB-INF");
- webInf.mkdirs();
-
- File webXml = new File(webInf, "web.xml");
- FileWriter fw = new FileWriter(webXml);
- OutputFormat format = OutputFormat.createPrettyPrint();
- XMLWriter writer = new XMLWriter(fw, format);
- writer.write(webDoc);
- writer.close();
-
- File jbossWebXml = new File(webInf, "jboss-web.xml");
- fw = new FileWriter(jbossWebXml);
- writer = new XMLWriter(fw, format);
- writer.write(jbossDoc);
- writer.close();
-
- return tmpWar.toURL();
- }
- catch (IOException e)
- {
- throw new WSFDeploymentException("Failed to create webservice.war", e);
- }
- }
-
- protected Document createWebAppDescriptor(Deployment dep, SecurityHandler securityHandler)
- {
- Document document = DocumentHelper.createDocument();
- Element webApp = document.addElement("web-app");
-
- /*
- <servlet>
- <servlet-name>
- <servlet-class>
- </servlet>
- */
- for (Endpoint ep : dep.getService().getEndpoints())
- {
- Element servlet = webApp.addElement("servlet");
- servlet.addElement("servlet-name").addText(ep.getShortName());
- servlet.addElement("servlet-class").addText(ep.getTargetBeanName());
- }
-
- /*
- <servlet-mapping>
- <servlet-name>
- <url-pattern>
- </servlet-mapping>
- */
- ArrayList urlPatters = new ArrayList();
- for (Endpoint ep : dep.getService().getEndpoints())
- {
- Element servletMapping = webApp.addElement("servlet-mapping");
- servletMapping.addElement("servlet-name").addText(ep.getShortName());
- servletMapping.addElement("url-pattern").addText(ep.getURLPattern());
- }
-
- String authMethod = null;
-
- // Add web-app/security-constraint for each port component
- for (Endpoint ep : dep.getService().getEndpoints())
- {
- String ejbName = ep.getShortName();
-
- Boolean secureWSDLAccess = null;
- String transportGuarantee = null;
- String beanAuthMethod = null;
-
- WebContext anWebContext = (WebContext)ep.getTargetBeanClass().getAnnotation(WebContext.class);
- if (anWebContext != null)
- {
- if (anWebContext.authMethod().length() > 0)
- beanAuthMethod = anWebContext.authMethod();
- if (anWebContext.transportGuarantee().length() > 0)
- transportGuarantee = anWebContext.transportGuarantee();
- if (anWebContext.secureWSDLAccess())
- secureWSDLAccess = anWebContext.secureWSDLAccess();
- }
-
- EJBArchiveMetaData appMetaData = dep.getAttachment(EJBArchiveMetaData.class);
- if (appMetaData != null && appMetaData.getBeanByEjbName(ejbName) != null)
- {
- EJBMetaData bmd = appMetaData.getBeanByEjbName(ejbName);
- EJBSecurityMetaData smd = bmd.getSecurityMetaData();
- if (smd != null)
- {
- beanAuthMethod = smd.getAuthMethod();
- transportGuarantee = smd.getTransportGuarantee();
- secureWSDLAccess = smd.getSecureWSDLAccess();
- }
- }
-
- if (beanAuthMethod != null || transportGuarantee != null)
- {
- /*
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>TestUnAuthPort</web-resource-name>
- <url-pattern>/HSTestRoot/TestUnAuth/*</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>*</role-name>
- </auth-constraint>
- <user-data-constraint>
- <transport-guarantee>NONE</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
- */
- Element securityConstraint = webApp.addElement("security-constraint");
- Element wrc = securityConstraint.addElement("web-resource-collection");
- wrc.addElement("web-resource-name").addText(ejbName);
- wrc.addElement("url-pattern").addText(ep.getURLPattern());
- if (Boolean.TRUE.equals(secureWSDLAccess))
- {
- wrc.addElement("http-method").addText("GET");
- }
- wrc.addElement("http-method").addText("POST");
-
- // Optional auth-constraint
- if (beanAuthMethod != null)
- {
- // Only the first auth-method gives the war login-config/auth-method
- if (authMethod == null)
- authMethod = beanAuthMethod;
-
- Element authConstraint = securityConstraint.addElement("auth-constraint").addElement("role-name").addText("*");
- }
- // Optional user-data-constraint
- if (transportGuarantee != null)
- {
- Element userData = securityConstraint.addElement("user-data-constraint");
- userData.addElement("transport-guarantee").addText(transportGuarantee);
- }
- }
- }
-
- // Optional login-config/auth-method
- if (authMethod != null && securityHandler != null)
- {
- Element loginConfig = webApp.addElement("login-config");
- loginConfig.addElement("auth-method").addText(authMethod);
- loginConfig.addElement("realm-name").addText("EJBServiceEndpointServlet Realm");
-
- securityHandler.addSecurityRoles(webApp, dep);
- }
-
- return document;
- }
-
- protected Document createJBossWebAppDescriptor(Deployment dep, SecurityHandler securityHandler)
- {
- Document document = DocumentHelper.createDocument();
-
- /* Create a jboss-web
- <jboss-web>
- <security-domain>java:/jaas/cts</security-domain>
- <context-root>/ws/ejbN/</context-root>
- <virtual-host>some.domain.com</virtual-host>
- </jboss-web>
- */
- Element jbossWeb = document.addElement("jboss-web");
-
- if (securityHandler != null)
- securityHandler.addSecurityDomain(jbossWeb, dep);
-
- // Get the context root for this deployment
- String contextRoot = dep.getService().getContextRoot();
- if (contextRoot == null)
- throw new WSFDeploymentException("Cannot obtain context root");
-
- jbossWeb.addElement("context-root").addText(contextRoot);
-
- return document;
- }
-}
15 years, 5 months
- 1
- 0
JBossWS SVN: r9847 - stack/cxf/trunk/modules/resources/src/main/resources/bin.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-21 06:46:04 -0400 (Tue, 21 Apr 2009)
New Revision: 9847
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh
Log:
[JBWS-2612] fixing CXF tools
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2009-04-20 11:42:13 UTC (rev 9846)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2009-04-21 10:46:04 UTC (rev 9847)
@@ -25,14 +25,10 @@
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-framework.jar
rem shared jaxws libs
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxws-tools.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxws-rt.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/stax-api.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-impl.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-xjc.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/streambuffer.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/stax-ex.jar
rem stack specific libs
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-cxf-client.jar
@@ -60,7 +56,6 @@
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-wstx-msv-validation.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/geronimo-ws-metadata_2.0_spec.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-ejb3x.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-javaee.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/velocity.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/XmlSchema.jar
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2009-04-20 11:42:13 UTC (rev 9846)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2009-04-21 10:46:04 UTC (rev 9847)
@@ -74,14 +74,10 @@
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-framework.jar"
# shared jaxws libs
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxws-tools.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxws-rt.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/stax-api.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxb-api.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxb-impl.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxb-xjc.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/streambuffer.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/stax-ex.jar"
# Stack specific dependencies
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-cxf-client.jar"
@@ -109,7 +105,6 @@
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-wstx-msv-validation.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/geronimo-ws-metadata_2.0_spec.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxws-api.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-ejb3x.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-javaee.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/velocity.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/XmlSchema.jar"
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2009-04-20 11:42:13 UTC (rev 9846)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2009-04-21 10:46:04 UTC (rev 9847)
@@ -27,10 +27,6 @@
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxb-impl.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxb-xjc.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxws-tools.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxws-rt.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/streambuffer.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/stax-ex.jar
rem stack specific libs
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-cxf-client.jar
@@ -64,7 +60,6 @@
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/FastInfoset.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/geronimo-ws-metadata_2.0_spec.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-ejb3x.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-javaee.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/neethi.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/spring-beans.jar
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2009-04-20 11:42:13 UTC (rev 9846)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2009-04-21 10:46:04 UTC (rev 9847)
@@ -78,10 +78,6 @@
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxb-api.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxb-impl.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxb-xjc.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxws-tools.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxws-rt.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/streambuffer.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/stax-ex.jar"
# stack specific dependencies
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-cxf-client.jar"
@@ -115,7 +111,6 @@
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/FastInfoset.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/geronimo-ws-metadata_2.0_spec.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxws-api.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-ejb3x.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-javaee.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/neethi.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/spring-beans.jar"
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2009-04-20 11:42:13 UTC (rev 9846)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2009-04-21 10:46:04 UTC (rev 9847)
@@ -86,7 +86,6 @@
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/FastInfoset.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/geronimo-ws-metadata_2.0_spec.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar
-set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-ejb3x.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-javaee.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/neethi.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/spring-beans.jar
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2009-04-20 11:42:13 UTC (rev 9846)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2009-04-21 10:46:04 UTC (rev 9847)
@@ -113,7 +113,6 @@
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/FastInfoset.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/geronimo-ws-metadata_2.0_spec.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxws-api.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-ejb3x.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-javaee.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/neethi.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/spring-beans.jar"
15 years, 5 months
- 1
- 0
JBossWS SVN: r9846 - in stack/native/trunk: modules/core and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-20 07:42:13 -0400 (Mon, 20 Apr 2009)
New Revision: 9846
Added:
stack/native/trunk/modules/resources/src/main/resources/resources/default-deploy.conf
Removed:
stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf
stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf
stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt
Modified:
stack/native/trunk/build.xml
stack/native/trunk/modules/core/pom.xml
stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml
stack/native/trunk/modules/management/pom.xml
stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/native/trunk/modules/testsuite/pom.xml
stack/native/trunk/pom.xml
stack/native/trunk/profiles.xml.example
stack/native/trunk/src/main/distro/Install.txt
stack/native/trunk/src/main/distro/ant.properties.example
stack/native/trunk/src/main/distro/build-deploy.xml
stack/native/trunk/src/main/distro/build-setup.xml
stack/native/trunk/src/main/distro/build.xml
stack/native/trunk/src/main/scripts/assembly-bin-dist.xml
stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2612] removing AS 4x support
Modified: stack/native/trunk/build.xml
===================================================================
--- stack/native/trunk/build.xml 2009-04-20 11:11:00 UTC (rev 9845)
+++ stack/native/trunk/build.xml 2009-04-20 11:42:13 UTC (rev 9846)
@@ -25,8 +25,7 @@
<import file="${stack.distro.dir}/build-deploy.xml"/>
<import file="${stack.resources.dir}/resources/jbossws-deploy-macros.xml"/>
- <property name="jbossws.as4.default.deploy.conf" value="${stack.resources.dir}/resources/jbossws-as4-default-deploy.conf"/>
- <property name="jbossws.as5.default.deploy.conf" value="${stack.resources.dir}/resources/jbossws-as5-default-deploy.conf"/>
+ <property name="jbossws.default.deploy.conf" value="${stack.resources.dir}/resources/default-deploy.conf"/>
<property name="target.properties.file" value="${basedir}/target.properties"/>
<!-- ================================================================== -->
@@ -51,9 +50,6 @@
<arg value="help:effective-settings"/>
</exec>
<xmlproperty file="${stack.output.dir}/effective-settings.xml" keeproot="false"/>
- <condition property="jboss423.home" value="${profiles.profile.properties.jboss423.home}">
- <isset property="profiles.profile.properties.jboss423.home"/>
- </condition>
<condition property="jboss500.home" value="${profiles.profile.properties.jboss500.home}">
<isset property="profiles.profile.properties.jboss500.home"/>
</condition>
@@ -69,14 +65,12 @@
<!-- Loads the properties from the user profile -->
<xmlproperty file="${basedir}/profiles.xml" keeproot="false"/>
- <property name="jboss423.home" value="${profiles.profile.properties.jboss423.home}"/>
<property name="jboss500.home" value="${profiles.profile.properties.jboss500.home}"/>
<property name="jboss501.home" value="${profiles.profile.properties.jboss501.home}"/>
<property name="jboss510.home" value="${profiles.profile.properties.jboss510.home}"/>
<property name="jboss600.home" value="${profiles.profile.properties.jboss600.home}"/>
<echo/>
- <echo message="jboss423.home=${jboss423.home}"/>
<echo message="jboss500.home=${jboss500.home}"/>
<echo message="jboss501.home=${jboss501.home}"/>
<echo message="jboss510.home=${jboss510.home}"/>
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2009-04-20 11:11:00 UTC (rev 9845)
+++ stack/native/trunk/modules/core/pom.xml 2009-04-20 11:42:13 UTC (rev 9846)
@@ -192,14 +192,6 @@
<artifactItems>
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423</artifactId>
- <version>${jbossws.jboss423.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss423</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
<version>${jbossws.jboss500.version}</version>
<classifier>resources</classifier>
Modified: stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2009-04-20 11:11:00 UTC (rev 9845)
+++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2009-04-20 11:42:13 UTC (rev 9846)
@@ -27,18 +27,6 @@
<!-- Compile resource files -->
<target name="main" depends="init">
- <!-- Concat jbossws-jboss423/jbossws.beans -->
- <echo message="Concat jbossws-jboss423/jbossws.beans"/>
- <concat destfile="${project.build.resources.directory}/jbossws-jboss423/jbossws.beans/META-INF/jboss-beans.xml">
- <header trimleading="yes">
- <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
- xmlns="urn:jboss:bean-deployer"> </header>
- <fileset file="${project.resources.directory}/jbossws-native-config.xml"/>
- <fileset file="${project.build.resources.directory}/jbossws-jboss423/jbossws-jboss42-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
<!-- Concat jbossws-jboss500/jbossws.beans -->
<echo message="Concat jbossws-jboss500/jbossws.beans"/>
<concat destfile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/jboss-beans.xml">
Modified: stack/native/trunk/modules/management/pom.xml
===================================================================
--- stack/native/trunk/modules/management/pom.xml 2009-04-20 11:11:00 UTC (rev 9845)
+++ stack/native/trunk/modules/management/pom.xml 2009-04-20 11:42:13 UTC (rev 9846)
@@ -31,11 +31,6 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
<scope>provided</scope>
</dependency>
Added: stack/native/trunk/modules/resources/src/main/resources/resources/default-deploy.conf
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/default-deploy.conf (rev 0)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2009-04-20 11:42:13 UTC (rev 9846)
@@ -0,0 +1 @@
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native!
-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar
Deleted: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf 2009-04-20 11:11:00 UTC (rev 9845)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf 2009-04-20 11:42:13 UTC (rev 9846)
@@ -1 +0,0 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-native-jaxrpc.jar server/default/lib/jbossw!
s-native-jaxws-ext.jar server/default/lib/jbossws-native-jaxws.jar server/default/lib/jbossws-native-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar
Deleted: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf 2009-04-20 11:11:00 UTC (rev 9845)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf 2009-04-20 11:42:13 UTC (rev 9846)
@@ -1 +0,0 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native!
-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar
Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-04-20 11:11:00 UTC (rev 9845)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-04-20 11:42:13 UTC (rev 9846)
@@ -105,19 +105,6 @@
<!-- Deploy Lib -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-lib42">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.lib.patternset"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
<macrodef name="macro-deploy-jbossws-lib50">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -184,21 +171,6 @@
<!-- Deploy Client -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-client42">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.client.patternset"/>
- <include name="**/jbossws-(a){jbossid}.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
<macrodef name="macro-deploy-jbossws-client50">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -258,21 +230,6 @@
<!-- Deploy Server Lib -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-server-lib42">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.server.lib.patternset"/>
- <include name="**/jbossws-(a){jbossid}.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
<macrodef name="macro-deploy-jbossws-server-lib50">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -342,41 +299,6 @@
<!-- Deploy JBossWS Service -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-sar42">
- <attribute name="thirdpartydir"/>
- <attribute name="artifactsdir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.service.lib.patternset"/>
- <include name="**/jaxb-api.jar"/>
- <include name="**/jaxb-impl.jar"/>
- <include name="**/stax-api.jar"/>
- <include name="**/wstx.jar"/>
- </fileset>
- </copy>
- <unzip dest="@{targetdir}/jbossws-management.war">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-native-management.war"/>
- </fileset>
- </unzip>
- <copy todir="@{targetdir}/jbossws.beans">
- <fileset dir="@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans">
- <include name="META-INF/**"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/META-INF">
- <fileset dir="@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws-jboss42.sar/META-INF"/>
- <fileset dir="@{artifactsdir}/resources">
- <include name="standard-*-config.xml"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
<macrodef name="macro-deploy-jbossws-sar50">
<attribute name="thirdpartydir"/>
<attribute name="artifactsdir"/>
@@ -563,15 +485,6 @@
<available classname="java.io.Console" property="HAVE_JDK16_OR_ABOVE"/>
- <target name="deploy-jbossws-native42" depends="check-parameters,deploy-jbossws-endorsed">
- <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
- <macro-deploy-jbossws-client42 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-sar42 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
- </target>
-
<target name="deploy-jbossws-native50" depends="check-parameters">
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
<macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
@@ -619,42 +532,6 @@
<!-- Undeploy JBossWS -->
<!-- ================================================================== -->
- <macrodef name="macro-undeploy-jbossws42">
- <attribute name="defaultconf"/>
- <attribute name="targetdir"/>
- <sequential>
- <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/>
- <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
-
- <property name="jboss.server.home" value="@{targetdir}/../.."/>
- <property name="jboss.home" value="${jboss.server.home}/../.."/>
- <available property="jboss.undeploy.client" file="${jboss.home}/client"/>
- <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
-
- <!-- delete stale container integration jars -->
- <delete>
- <fileset dir="${jboss.server.home}">
- <include name="**/jbossws-jboss*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/client">
- <include name="jbossws-jboss*.jar"/>
- </fileset>
- </delete>
-
- <!-- delete content of last deployment -->
- <delete>
- <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/>
- </delete>
-
- <!-- delete jbossws.sar -->
- <delete dir="@{targetdir}"/>
-
- <!-- delete juddi-service.sar -->
- <delete dir="@{targetdir}/../juddi-service.sar"/>
-
- </sequential>
- </macrodef>
-
<macrodef name="macro-undeploy-jbossws50">
<attribute name="defaultconf"/>
<attribute name="targetdir"/>
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2009-04-20 11:11:00 UTC (rev 9845)
+++ stack/native/trunk/modules/testsuite/pom.xml 2009-04-20 11:42:13 UTC (rev 9846)
@@ -279,46 +279,6 @@
</profile>
<!--
- Name: jboss423
- Descr: JBoss-4.2.3 specific options
- -->
- <profile>
- <id>jboss423</id>
- <properties>
- <jboss.version>4.2.3.GA</jboss.version>
- <jbossws.integration.target>jboss423</jbossws.integration.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.client</groupId>
- <artifactId>jbossall-client</artifactId>
- <version>${jboss.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss423.txt</testExcludeFile>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss423.home}/lib/endorsed</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
Name: jboss500
Descr: JBoss-5.0.0 specific options
-->
Deleted: stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-04-20 11:11:00 UTC (rev 9845)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-04-20 11:42:13 UTC (rev 9846)
@@ -1,34 +0,0 @@
-# EJB3/Injection excludes
-org/jboss/test/ws/jaxws/samples/webserviceref/**
-org/jboss/test/ws/jaxws/webserviceref/**
-org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.*
-
-# Exclude endpoints with AS5 @SecurityDomain
-org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.*
-org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAAS5Endpoint.*
-org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMAS5Endpoint.*
-
-# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
-org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
-
-# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
-org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
-
-# [JBWS-2074] Resource injection in jaxws endpoints and handlers
-org/jboss/test/ws/jaxws/jbws2074/**
-
-# [JBWS-2240] PortComponent from jboss.xml descriptor is not parsed
-org/jboss/test/ws/jaxws/jbws2241/**
-org/jboss/test/ws/jaxws/jbws1309/**
-
-# [JBWS-2258] Fix EnumTestCase (fixed in AS trunk)
-org/jboss/test/ws/tools/enums/EnumTestCase.*
-
-# [JBWS-2307] Stub properties not propagated through service-ref (fixed in AS 5.x and above)
-org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.*
-
-# [JBWS-2491] Enable JAXWS 2.1 WebServiceContext methods
-org/jboss/test/ws/jaxws/jbws2257/**
-
-# [JBWS-2527] BeanFactory not initialized or already closed (fixed on AS 5.x and above)
-org/jboss/test/ws/jaxws/jbws2527/**
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2009-04-20 11:11:00 UTC (rev 9845)
+++ stack/native/trunk/pom.xml 2009-04-20 11:42:13 UTC (rev 9846)
@@ -50,7 +50,6 @@
<jbossws.common.version>1.0.11-SNAPSHOT</jbossws.common.version>
<jbossws.framework.version>3.2.0-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.1.1.GA</jbossws.spi.version>
- <jbossws.jboss423.version>3.1.1.GA</jbossws.jboss423.version>
<jbossws.jboss500.version>3.1.1.GA</jbossws.jboss500.version>
<jbossws.jboss501.version>3.1.1.GA</jbossws.jboss501.version>
<!-- [JBWS-2505] -->
@@ -110,18 +109,6 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423</artifactId>
- <version>${jbossws.jboss423.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423</artifactId>
- <version>${jbossws.jboss423.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
<version>${jbossws.jboss500.version}</version>
</dependency>
@@ -466,18 +453,6 @@
</profile>
<!--
- Name: jboss423
- Descr: JBoss-4.2.3 specific options
- -->
- <profile>
- <id>jboss423</id>
- <properties>
- <jbossws.integration.target>jboss423</jbossws.integration.target>
- <jboss.home>${jboss423.home}</jboss.home>
- </properties>
- </profile>
-
- <!--
Name: jboss500
Descr: JBoss-5.0.0 specific options
-->
Modified: stack/native/trunk/profiles.xml.example
===================================================================
--- stack/native/trunk/profiles.xml.example 2009-04-20 11:11:00 UTC (rev 9845)
+++ stack/native/trunk/profiles.xml.example 2009-04-20 11:42:13 UTC (rev 9846)
@@ -12,7 +12,6 @@
</activation>
<properties>
<java.jdk15.home>/usr/java/jdk1.5</java.jdk15.home>
- <jboss423.home>/home/opalka/svn/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home>
<jboss500.home>/home/opalka/svn/jbossas/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home>
<jboss501.home>/home/opalka/svn/jbossas/branches/Branch_5_0/build/output/jboss-5.0.1.GA</jboss501.home>
<jboss510.home>/home/opalka/svn/jbossas/branches/Branch_5_x/build/output/jboss-5.1.0.Beta1</jboss510.home>
Modified: stack/native/trunk/src/main/distro/Install.txt
===================================================================
--- stack/native/trunk/src/main/distro/Install.txt 2009-04-20 11:11:00 UTC (rev 9845)
+++ stack/native/trunk/src/main/distro/Install.txt 2009-04-20 11:42:13 UTC (rev 9846)
@@ -13,7 +13,6 @@
2.) Modify the target container location in ant.properties
3.) Execute one of the following
- ant deploy-jboss42x
ant deploy-jboss50x
ant deploy-jboss51x
ant deploy-jboss60x
Modified: stack/native/trunk/src/main/distro/ant.properties.example
===================================================================
--- stack/native/trunk/src/main/distro/ant.properties.example 2009-04-20 11:11:00 UTC (rev 9845)
+++ stack/native/trunk/src/main/distro/ant.properties.example 2009-04-20 11:42:13 UTC (rev 9846)
@@ -3,13 +3,12 @@
#
# Optional JBoss Home
-jboss423.home=(a)jboss423.home@
jboss500.home=(a)jboss500.home@
jboss501.home=(a)jboss501.home@
jboss510.home=(a)jboss510.home@
jboss600.home=(a)jboss600.home@
-# The JBoss server under test. This can be [jboss423|jboss500|jboss501|jboss510|jboss600]
+# The JBoss server under test. This can be [jboss500|jboss501|jboss510|jboss600]
jbossws.integration.target=jboss500
# The JBoss settings
Modified: stack/native/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/native/trunk/src/main/distro/build-deploy.xml 2009-04-20 11:11:00 UTC (rev 9845)
+++ stack/native/trunk/src/main/distro/build-deploy.xml 2009-04-20 11:42:13 UTC (rev 9846)
@@ -12,43 +12,6 @@
<project>
<!-- ================================================================== -->
- <!-- Prepare Deployment Structure JBoss-4.2.x -->
- <!-- ================================================================== -->
-
- <target name="deploy-structure-jboss42" depends="prepare-deploy">
- <delete dir="${deploy.structure}"/>
- <antcall target="deploy-jbossws-native42" inheritall="false">
- <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
- <param name="jbossid" value="${jbossws.integration.target}"/>
- <param name="artifactsdir" value="${deploy.artifacts.dir}"/>
- <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
- </antcall>
- <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss423 -->
- <!-- ================================================================== -->
-
- <target name="target-jboss423">
- <property name="jbossws.integration.target" value="jboss423"/>
- <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
- </target>
-
- <target name="deploy-jboss423" depends="undeploy-jboss423,deploy-structure-jboss42" description="Deploy jbossws to jboss423">
- <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
- <copy todir="${jboss423.home}" overwrite="true">
- <fileset dir="${deploy.structure}"/>
- </copy>
- <chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/>
- </target>
-
- <target name="undeploy-jboss423" depends="target-jboss423,init" description="Remove jbossws from jboss423">
- <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
- <macro-undeploy-jbossws42 targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.as4.default.deploy.conf}"/>
- </target>
-
- <!-- ================================================================== -->
<!-- Prepare Deployment Structure JBoss-5.0.x -->
<!-- ================================================================== -->
@@ -82,7 +45,7 @@
<target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500">
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
- <macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>
+ <macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
</target>
<!-- ================================================================== -->
@@ -104,7 +67,7 @@
<target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501">
<fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
- <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>
+ <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
</target>
<!-- ================================================================== -->
@@ -141,7 +104,7 @@
<target name="undeploy-jboss510" depends="target-jboss510,init" description="Remove jbossws from jboss510">
<fail message="Not available: ${jboss510.available.file}" unless="jboss510.available"/>
- <macro-undeploy-jbossws51 targetdir="${jboss510.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>
+ <macro-undeploy-jbossws51 targetdir="${jboss510.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
</target>
<!-- ================================================================== -->
@@ -178,7 +141,7 @@
<target name="undeploy-jboss600" depends="target-jboss600,init" description="Remove jbossws from jboss600">
<fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/>
- <macro-undeploy-jbossws60 targetdir="${jboss600.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>
+ <macro-undeploy-jbossws60 targetdir="${jboss600.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
</target>
<!-- ================================================================== -->
Modified: stack/native/trunk/src/main/distro/build-setup.xml
===================================================================
--- stack/native/trunk/src/main/distro/build-setup.xml 2009-04-20 11:11:00 UTC (rev 9845)
+++ stack/native/trunk/src/main/distro/build-setup.xml 2009-04-20 11:42:13 UTC (rev 9846)
@@ -21,12 +21,6 @@
<property file="${target.properties.file}"/>
<property name="jboss.server.instance" value="default"/>
- <property name="jboss423.lib" value="${jboss423.home}/lib"/>
- <property name="jboss423.client" value="${jboss423.home}/client"/>
- <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/>
- <property name="jboss423.server.lib" value="${jboss423.server}/lib"/>
- <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/>
-
<property name="jboss500.lib" value="${jboss500.home}/lib"/>
<property name="jboss500.client" value="${jboss500.home}/client"/>
<property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/>
@@ -55,13 +49,11 @@
<property name="jboss600.server.deploy" value="${jboss600.server}/deploy"/>
<property name="jboss600.server.deployers" value="${jboss600.server}/deployers"/>
- <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/>
<property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/>
<property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/>
<property name="jboss510.available.file" value="${jboss510.client}/jboss-client.jar"/>
<property name="jboss600.available.file" value="${jboss600.client}/jboss-client.jar"/>
- <available property="jboss423.available" file="${jboss423.available.file}"/>
<available property="jboss500.available" file="${jboss500.available.file}"/>
<available property="jboss501.available" file="${jboss501.available.file}"/>
<available property="jboss510.available" file="${jboss510.available.file}"/>
Modified: stack/native/trunk/src/main/distro/build.xml
===================================================================
--- stack/native/trunk/src/main/distro/build.xml 2009-04-20 11:11:00 UTC (rev 9845)
+++ stack/native/trunk/src/main/distro/build.xml 2009-04-20 11:42:13 UTC (rev 9846)
@@ -22,8 +22,7 @@
<property name="tests.dir" value="${basedir}/tests"/>
<property name="tests.output.dir" value="${output.dir}"/>
<property name="deploy.artifacts.dir" value="${basedir}/deploy"/>
- <property name="jbossws.as5.default.deploy.conf" value="${build.dir}/jbossws-as5-default-deploy.conf"/>
- <property name="jbossws.as4.default.deploy.conf" value="${build.dir}/jbossws-as4-default-deploy.conf"/>
+ <property name="jbossws.default.deploy.conf" value="${build.dir}/default-deploy.conf"/>
<property name="target.properties.file" value="${basedir}/target.properties"/>
<!-- Check if ant.properties is available -->
@@ -46,11 +45,6 @@
<fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/>
<echo message="integration.target=${jbossws.integration.target}"/>
- <condition property="jbossws.integration.jboss42" value="true">
- <or>
- <equals arg1="${jbossws.integration.target}" arg2="jboss423"/>
- </or>
- </condition>
<condition property="jbossws.integration.jboss50" value="true">
<or>
<equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
Modified: stack/native/trunk/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/native/trunk/src/main/scripts/assembly-bin-dist.xml 2009-04-20 11:11:00 UTC (rev 9845)
+++ stack/native/trunk/src/main/scripts/assembly-bin-dist.xml 2009-04-20 11:42:13 UTC (rev 9846)
@@ -39,8 +39,7 @@
<directory>modules/resources/src/main/resources/resources</directory>
<outputDirectory>build</outputDirectory>
<includes>
- <include>jbossws-as5-default-deploy.conf</include>
- <include>jbossws-as4-default-deploy.conf</include>
+ <include>default-deploy.conf</include>
<include>jbossws-deploy-macros.xml</include>
</includes>
</fileSet>
Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-04-20 11:11:00 UTC (rev 9845)
+++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-04-20 11:42:13 UTC (rev 9846)
@@ -82,7 +82,6 @@
<unpack>false</unpack>
<includes>
<include>org.jboss.ws:jbossws-framework:jar</include>
- <include>org.jboss.ws:jbossws-jboss423:jar</include>
<include>org.jboss.ws:jbossws-jboss500:jar</include>
<include>org.jboss.jaxr:juddi-service:sar</include>
<include>apache-scout:scout:jar</include>
15 years, 5 months
- 1
- 0
JBossWS SVN: r9845 - in stack/metro/trunk: modules/management and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-20 07:11:00 -0400 (Mon, 20 Apr 2009)
New Revision: 9845
Added:
stack/metro/trunk/modules/resources/src/main/resources/resources/default-deploy.conf
Removed:
stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf
stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf
stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
Modified:
stack/metro/trunk/build.xml
stack/metro/trunk/modules/management/pom.xml
stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/metro/trunk/modules/server/pom.xml
stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
stack/metro/trunk/modules/testsuite/pom.xml
stack/metro/trunk/pom.xml
stack/metro/trunk/profiles.xml.example
stack/metro/trunk/src/main/distro/Install.txt
stack/metro/trunk/src/main/distro/ant.properties.example
stack/metro/trunk/src/main/distro/build-deploy.xml
stack/metro/trunk/src/main/distro/build-setup.xml
stack/metro/trunk/src/main/distro/build.xml
stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml
stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2612] removing AS 4x support
Modified: stack/metro/trunk/build.xml
===================================================================
--- stack/metro/trunk/build.xml 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/build.xml 2009-04-20 11:11:00 UTC (rev 9845)
@@ -29,8 +29,7 @@
<import file="${stack.distro.dir}/build-deploy.xml"/>
<import file="${stack.resources.dir}/resources/jbossws-deploy-macros.xml"/>
- <property name="jbossws.as4.default.deploy.conf" value="${stack.resources.dir}/resources/jbossws-as4-default-deploy.conf"/>
- <property name="jbossws.as5.default.deploy.conf" value="${stack.resources.dir}/resources/jbossws-as5-default-deploy.conf"/>
+ <property name="jbossws.default.deploy.conf" value="${stack.resources.dir}/resources/default-deploy.conf"/>
<property name="target.properties.file" value="${basedir}/target.properties"/>
<!-- ================================================================== -->
@@ -55,9 +54,6 @@
<arg value="help:effective-settings"/>
</exec>
<xmlproperty file="${stack.output.dir}/effective-settings.xml" keeproot="false"/>
- <condition property="jboss423.home" value="${profiles.profile.properties.jboss423.home}">
- <isset property="profiles.profile.properties.jboss423.home"/>
- </condition>
<condition property="jboss500.home" value="${profiles.profile.properties.jboss500.home}">
<isset property="profiles.profile.properties.jboss500.home"/>
</condition>
@@ -73,14 +69,12 @@
<!-- Loads the properties from the user profile -->
<xmlproperty file="${basedir}/profiles.xml" keeproot="false"/>
- <property name="jboss423.home" value="${profiles.profile.properties.jboss423.home}"/>
<property name="jboss500.home" value="${profiles.profile.properties.jboss500.home}"/>
<property name="jboss501.home" value="${profiles.profile.properties.jboss501.home}"/>
<property name="jboss510.home" value="${profiles.profile.properties.jboss510.home}"/>
<property name="jboss600.home" value="${profiles.profile.properties.jboss600.home}"/>
<echo/>
- <echo message="jboss423.home=${jboss423.home}"/>
<echo message="jboss500.home=${jboss500.home}"/>
<echo message="jboss501.home=${jboss501.home}"/>
<echo message="jboss510.home=${jboss510.home}"/>
Modified: stack/metro/trunk/modules/management/pom.xml
===================================================================
--- stack/metro/trunk/modules/management/pom.xml 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/modules/management/pom.xml 2009-04-20 11:11:00 UTC (rev 9845)
@@ -31,11 +31,6 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
<scope>provided</scope>
</dependency>
Added: stack/metro/trunk/modules/resources/src/main/resources/resources/default-deploy.conf
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/default-deploy.conf (rev 0)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2009-04-20 11:11:00 UTC (rev 9845)
@@ -0,0 +1 @@
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native!
-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar
Deleted: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf 2009-04-20 11:11:00 UTC (rev 9845)
@@ -1 +0,0 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-native-jaxrpc.jar server/default/lib/jbossw!
s-native-jaxws-ext.jar server/default/lib/jbossws-native-jaxws.jar server/default/lib/jbossws-native-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar
Deleted: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf 2009-04-20 11:11:00 UTC (rev 9845)
@@ -1 +0,0 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native!
-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar
Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-04-20 11:11:00 UTC (rev 9845)
@@ -122,19 +122,6 @@
<!-- Deploy Lib -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-lib42">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.lib.patternset"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
<macrodef name="macro-deploy-jbossws-lib50">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -184,20 +171,6 @@
<!-- Deploy Lib Endorsed -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-endorsed42">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.lib.endorsed.patternset"/>
- <include name="**/stax-api.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
<macrodef name="macro-deploy-jbossws-endorsed">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -215,21 +188,6 @@
<!-- Deploy Client -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-client42">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.client.patternset"/>
- <include name="**/jbossws-(a){jbossid}.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
<macrodef name="macro-deploy-jbossws-client50">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -289,21 +247,6 @@
<!-- Deploy Server Lib -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-server-lib42">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.server.lib.patternset"/>
- <include name="**/jbossws-(a){jbossid}.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
<macrodef name="macro-deploy-jbossws-server-lib50">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -373,38 +316,6 @@
<!-- Deploy JBossWS Service -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-sar42">
- <attribute name="thirdpartydir"/>
- <attribute name="artifactsdir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.service.lib.patternset"/>
- <include name="**/jaxb-api.jar"/>
- <include name="**/jaxb-impl.jar"/>
- <include name="**/stax-api.jar"/>
- <include name="**/wstx.jar"/>
- </fileset>
- </copy>
- <unzip dest="@{targetdir}/jbossws-management.war">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-metro-management.war"/>
- </fileset>
- </unzip>
- <copy todir="@{targetdir}/jbossws.beans">
- <fileset dir="@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans">
- <include name="META-INF/**"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/META-INF">
- <fileset dir="@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws-jboss42.sar/META-INF"/>
- </copy>
- </sequential>
- </macrodef>
-
<macrodef name="macro-deploy-jbossws-sar50">
<attribute name="thirdpartydir"/>
<attribute name="artifactsdir"/>
@@ -574,16 +485,6 @@
<!-- Deploy JBossWS -->
<!-- ================================================================== -->
- <target name="deploy-jbossws-metro42" depends="check-parameters">
- <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
- <macro-deploy-jbossws-client42 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-endorsed42 targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-sar42 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
- </target>
-
<target name="deploy-jbossws-metro50" depends="check-parameters">
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
<macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
@@ -627,42 +528,6 @@
<!-- Undeploy JBossWS -->
<!-- ================================================================== -->
- <macrodef name="macro-undeploy-jbossws42">
- <attribute name="defaultconf"/>
- <attribute name="targetdir"/>
- <sequential>
- <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/>
- <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
-
- <property name="jboss.server.home" value="@{targetdir}/../.."/>
- <property name="jboss.home" value="${jboss.server.home}/../.."/>
- <available property="jboss.undeploy.client" file="${jboss.home}/client"/>
- <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
-
- <!-- delete stale container integration jars -->
- <delete>
- <fileset dir="${jboss.server.home}">
- <include name="**/jbossws-jboss*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/client">
- <include name="jbossws-jboss*.jar"/>
- </fileset>
- </delete>
-
- <!-- delete content of last deployment -->
- <delete>
- <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/>
- </delete>
-
- <!-- delete jbossws.sar -->
- <delete dir="@{targetdir}"/>
-
- <!-- delete juddi-service.sar -->
- <delete dir="@{targetdir}/../juddi-service.sar"/>
-
- </sequential>
- </macrodef>
-
<macrodef name="macro-undeploy-jbossws50">
<attribute name="defaultconf"/>
<attribute name="targetdir"/>
Modified: stack/metro/trunk/modules/server/pom.xml
===================================================================
--- stack/metro/trunk/modules/server/pom.xml 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/modules/server/pom.xml 2009-04-20 11:11:00 UTC (rev 9845)
@@ -25,14 +25,6 @@
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-spi</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423</artifactId>
- <version>${jbossws.jboss423.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- </dependency>
-
<!-- Metro dependencies -->
<dependency>
<groupId>com.sun.xml.fastinfoset</groupId>
@@ -145,14 +137,6 @@
<artifactItems>
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423</artifactId>
- <version>${jbossws.jboss423.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss423</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
<version>${jbossws.jboss500.version}</version>
<classifier>resources</classifier>
@@ -204,8 +188,6 @@
</goals>
<configuration>
<tasks>
- <property name="jbossws.jboss423.version" value="${jbossws.jboss423.version}" />
- <property name="jbossws.jboss424.version" value="${jbossws.jboss424.version}" />
<ant antfile="src/main/scripts/antrun-beans-config.xml" />
</tasks>
</configuration>
Modified: stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-04-20 11:11:00 UTC (rev 9845)
@@ -27,18 +27,6 @@
<!-- Compile resource files -->
<target name="main" depends="init">
- <!-- Concat jbossws-jboss423/jbossws.beans -->
- <echo message="Concat jbossws-jboss423/jbossws.beans"/>
- <concat destfile="${project.build.resources.directory}/jbossws-jboss423/jbossws.beans/META-INF/jboss-beans.xml">
- <header trimleading="yes">
- <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
- xmlns="urn:jboss:bean-deployer"> </header>
- <fileset file="${project.resources.directory}/jbossws-metro-config.xml"/>
- <fileset file="${project.build.resources.directory}/jbossws-jboss423/jbossws-jboss42-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
<!-- Concat jbossws-jboss500/jbossws.beans -->
<echo message="Concat jbossws-jboss500/jbossws.beans"/>
<concat destfile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/jboss-beans.xml">
Modified: stack/metro/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/pom.xml 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/modules/testsuite/pom.xml 2009-04-20 11:11:00 UTC (rev 9845)
@@ -287,51 +287,6 @@
</profile>
<!--
- Name: jboss423
- Descr: JBoss-4.2.3 specific options
- -->
- <profile>
- <id>jboss423</id>
- <properties>
- <jboss.version>4.2.3.GA</jboss.version>
- <jbossws.integration.target>jboss423</jbossws.integration.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.client</groupId>
- <artifactId>jbossall-client</artifactId>
- <version>${jboss.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jnpserver</artifactId>
- <version>${jboss.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss423.txt</testExcludeFile>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss423.home}/lib/endorsed</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
Name: jboss500
Descr: JBoss-5.0.0 specific options
-->
Deleted: stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-04-20 11:11:00 UTC (rev 9845)
@@ -1,65 +0,0 @@
-# EJB3/Injection excludes
-org/jboss/test/ws/jaxws/samples/webserviceref/**
-org/jboss/test/ws/jaxws/jbws2307/**
-
-# Exclude endpoints with AS5 @SecurityDomain
-org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.*
-
-# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
-org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
-
-# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
-org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
-
-# [JBWS-1841] WebServiceRef injection from DD doesn't work
-org/jboss/test/ws/jaxws/jbws1841/**
-
-# [JBWS-1949] Metro MTOM ignores content-type on attachment part
-org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBare*.*
-org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrapped*.*
-org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMFeatureTestCase.*
-
-# [JBWS-2074] Resource injection in jaxws endpoints and handlers
-org/jboss/test/ws/jaxws/jbws2074/**
-
-# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
-org/jboss/test/ws/jaxws/binding/**
-org/jboss/test/ws/jaxws/handlerscope/**
-org/jboss/test/ws/jaxws/jbws2183/**
-
-# [JBWS-2131] NoSuchElementException during wsdl generation at deploy
-org/jboss/test/ws/jaxws/jbws1702/**
-
-# [JBWS-2240] PortComponent from jboss.xml descriptor is not parsed
-org/jboss/test/ws/jaxws/jbws2241/**
-
-# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties
-org/jboss/test/ws/jaxws/jbws1190/**
-
-# [JBWS-2257] Wrong WebServiceContext injected in EJB3 endpoints
-org/jboss/test/ws/jaxws/jbws2257/**
-
-# [JBWS-2308] faultCode argument for createFault was passed NULL
-org/jboss/test/ws/jaxws/jbws2308/*TestCase.*
-
-# [JBWS-2329] Failed to deploy service with multiple bindings
-org/jboss/test/ws/jaxws/jbws2278/**
-
-# [JBWS-2347] Rewrite @WebFault related tests
-org/jboss/test/ws/jaxws/jbws1904/**
-org/jboss/test/ws/jaxws/webfault/**
-
-# [JBWS-2348] Fix jbws1969 testcase
-org/jboss/test/ws/jaxws/jbws1969/**
-
-# [JBWS-2397] Fix jbws1797 testcase
-org/jboss/test/ws/jaxws/jbws1797/**
-
-# [JBWS-2400] Rewrite large attachment testcase
-org/jboss/test/ws/jaxws/jbws2000/**
-
-# [JBWS-2462] Address rewrite test fails in Metro integration
-org/jboss/test/ws/jaxws/jbws2150/**
-
-# [JBWS-2527] BeanFactory not initialized or already closed (fixed on AS 5.x series only)
-org/jboss/test/ws/jaxws/jbws2527/**
Modified: stack/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/pom.xml 2009-04-20 11:11:00 UTC (rev 9845)
@@ -47,7 +47,6 @@
<jbossws.common.version>1.0.11-SNAPSHOT</jbossws.common.version>
<jbossws.framework.version>3.2.0-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.1.1.GA</jbossws.spi.version>
- <jbossws.jboss423.version>3.1.1.GA</jbossws.jboss423.version>
<jbossws.jboss500.version>3.1.1.GA</jbossws.jboss500.version>
<jbossws.jboss501.version>3.1.1.GA</jbossws.jboss501.version>
<!-- JBWS-2505 -->
@@ -104,18 +103,6 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423</artifactId>
- <version>${jbossws.jboss423.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423</artifactId>
- <version>${jbossws.jboss423.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
<version>${jbossws.jboss500.version}</version>
</dependency>
@@ -443,18 +430,6 @@
</profile>
<!--
- Name: jboss423
- Descr: JBoss-4.2.2 specific options
- -->
- <profile>
- <id>jboss423</id>
- <properties>
- <jbossws.integration.target>jboss423</jbossws.integration.target>
- <jboss.home>${jboss423.home}</jboss.home>
- </properties>
- </profile>
-
- <!--
Name: jboss500
Descr: JBoss-5.0.0 specific options
-->
Modified: stack/metro/trunk/profiles.xml.example
===================================================================
--- stack/metro/trunk/profiles.xml.example 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/profiles.xml.example 2009-04-20 11:11:00 UTC (rev 9845)
@@ -11,7 +11,6 @@
</property>
</activation>
<properties>
- <jboss423.home>/home/opalka/svn/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home>
<jboss500.home>/home/opalka/svn/jbossas/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home>
<jboss501.home>/home/opalka/svn/jbossas/branches/Branch_5_0/build/output/jboss-5.0.1.GA</jboss501.home>
<jboss510.home>/home/opalka/svn/jbossas/branches/Branch_5_x/build/output/jboss-5.1.0.Beta1</jboss510.home>
Modified: stack/metro/trunk/src/main/distro/Install.txt
===================================================================
--- stack/metro/trunk/src/main/distro/Install.txt 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/src/main/distro/Install.txt 2009-04-20 11:11:00 UTC (rev 9845)
@@ -13,7 +13,6 @@
2.) Modify the target container location in ant.properties
3.) Execute one of the following
- ant deploy-jboss42x
ant deploy-jboss50x
ant deploy-jboss51x
ant deploy-jboss60x
Modified: stack/metro/trunk/src/main/distro/ant.properties.example
===================================================================
--- stack/metro/trunk/src/main/distro/ant.properties.example 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/src/main/distro/ant.properties.example 2009-04-20 11:11:00 UTC (rev 9845)
@@ -3,13 +3,12 @@
#
# Optional JBoss Home
-jboss423.home=(a)jboss423.home@
jboss500.home=(a)jboss500.home@
jboss501.home=(a)jboss501.home@
jboss510.home=(a)jboss510.home@
jboss600.home=(a)jboss600.home@
-# The JBoss server under test. This can be [jboss423|jboss500|jboss501|jboss510|jboss600]
+# The JBoss server under test. This can be [jboss500|jboss501|jboss510|jboss600]
jbossws.integration.target=jboss500
# The JBoss settings
Modified: stack/metro/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build-deploy.xml 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/src/main/distro/build-deploy.xml 2009-04-20 11:11:00 UTC (rev 9845)
@@ -12,45 +12,6 @@
<project>
<!-- ================================================================== -->
- <!-- Prepare Deployment Structure JBoss-4.2.x -->
- <!-- ================================================================== -->
-
- <target name="deploy-structure-jboss42" depends="prepare-deploy">
- <delete dir="${deploy.structure}"/>
- <antcall target="deploy-jbossws-metro42" inheritall="false">
- <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
- <param name="jbossid" value="${jbossws.integration.target}"/>
- <param name="artifactsdir" value="${deploy.artifacts.dir}"/>
- <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
- </antcall>
- <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss423 -->
- <!-- ================================================================== -->
-
- <target name="target-jboss423">
- <property name="jboss.server.instance" value="default"/>
- <property name="jbossws.integration.target" value="jboss423"/>
- <echo message="jbossws.integration.target=${jbossws.integration.target}${line.separator}" file="${target.properties.file}"/>
- <echo message="jboss.server.instance=${jboss.server.instance}${line.separator}" file="${target.properties.file}" append="true"/>
- </target>
-
- <target name="deploy-jboss423" depends="undeploy-jboss423,deploy-structure-jboss42" description="Deploy jbossws to jboss423">
- <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
- <copy todir="${jboss423.home}" overwrite="true">
- <fileset dir="${deploy.structure}"/>
- </copy>
- <chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/>
- </target>
-
- <target name="undeploy-jboss423" depends="target-jboss423,init" description="Remove jbossws from jboss423">
- <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
- <macro-undeploy-jbossws42 targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.as4.default.deploy.conf}"/>
- </target>
-
- <!-- ================================================================== -->
<!-- Prepare Deployment Structure JBoss-5.0.x -->
<!-- ================================================================== -->
@@ -86,7 +47,7 @@
<target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500">
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
- <macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>
+ <macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
</target>
<!-- ================================================================== -->
@@ -110,7 +71,7 @@
<target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501">
<fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
- <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>
+ <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
</target>
<!-- ================================================================== -->
@@ -149,7 +110,7 @@
<target name="undeploy-jboss510" depends="target-jboss510,init" description="Remove jbossws from jboss510">
<fail message="Not available: ${jboss510.available.file}" unless="jboss510.available"/>
- <macro-undeploy-jbossws51 targetdir="${jboss510.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>
+ <macro-undeploy-jbossws51 targetdir="${jboss510.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
</target>
<!-- ================================================================== -->
@@ -188,7 +149,7 @@
<target name="undeploy-jboss600" depends="target-jboss600,init" description="Remove jbossws from jboss600">
<fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/>
- <macro-undeploy-jbossws60 targetdir="${jboss600.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>
+ <macro-undeploy-jbossws60 targetdir="${jboss600.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
</target>
<!-- ================================================================== -->
Modified: stack/metro/trunk/src/main/distro/build-setup.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build-setup.xml 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/src/main/distro/build-setup.xml 2009-04-20 11:11:00 UTC (rev 9845)
@@ -20,12 +20,6 @@
<!-- Load jbossws.integration.target properties -->
<property file="${target.properties.file}"/>
- <property name="jboss423.lib" value="${jboss423.home}/lib"/>
- <property name="jboss423.client" value="${jboss423.home}/client"/>
- <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/>
- <property name="jboss423.server.lib" value="${jboss423.server}/lib"/>
- <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/>
-
<property name="jboss500.lib" value="${jboss500.home}/lib"/>
<property name="jboss500.client" value="${jboss500.home}/client"/>
<property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/>
@@ -54,13 +48,11 @@
<property name="jboss600.server.deploy" value="${jboss600.server}/deploy"/>
<property name="jboss600.server.deployers" value="${jboss600.server}/deployers"/>
- <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/>
<property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/>
<property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/>
<property name="jboss510.available.file" value="${jboss510.client}/jboss-client.jar"/>
<property name="jboss600.available.file" value="${jboss600.client}/jboss-client.jar"/>
- <available property="jboss423.available" file="${jboss423.available.file}"/>
<available property="jboss500.available" file="${jboss500.available.file}"/>
<available property="jboss501.available" file="${jboss501.available.file}"/>
<available property="jboss510.available" file="${jboss510.available.file}"/>
Modified: stack/metro/trunk/src/main/distro/build.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build.xml 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/src/main/distro/build.xml 2009-04-20 11:11:00 UTC (rev 9845)
@@ -22,8 +22,7 @@
<property name="tests.dir" value="${basedir}/tests"/>
<property name="tests.output.dir" value="${output.dir}"/>
<property name="deploy.artifacts.dir" value="${basedir}/deploy"/>
- <property name="jbossws.as4.default.deploy.conf" value="${build.dir}/jbossws-as4-default-deploy.conf"/>
- <property name="jbossws.as5.default.deploy.conf" value="${build.dir}/jbossws-as5-default-deploy.conf"/>
+ <property name="jbossws.default.deploy.conf" value="${build.dir}/default-deploy.conf"/>
<property name="target.properties.file" value="${basedir}/target.properties"/>
<!-- Check if ant.properties is available -->
@@ -46,11 +45,6 @@
<fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/>
<echo message="integration.target=${jbossws.integration.target}"/>
- <condition property="jbossws.integration.jboss42" value="true">
- <or>
- <equals arg1="${jbossws.integration.target}" arg2="jboss423"/>
- </or>
- </condition>
<condition property="jbossws.integration.jboss50" value="true">
<or>
<equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
Modified: stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml 2009-04-20 11:11:00 UTC (rev 9845)
@@ -39,8 +39,7 @@
<directory>modules/resources/src/main/resources/resources</directory>
<outputDirectory>build</outputDirectory>
<includes>
- <include>jbossws-as5-default-deploy.conf</include>
- <include>jbossws-as4-default-deploy.conf</include>
+ <include>default-deploy.conf</include>
<include>jbossws-deploy-macros.xml</include>
</includes>
</fileSet>
Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-04-20 11:11:00 UTC (rev 9845)
@@ -79,7 +79,6 @@
<unpack>false</unpack>
<includes>
<include>org.jboss.ws:jbossws-framework:jar</include>
- <include>org.jboss.ws:jbossws-jboss423:jar</include>
<include>org.jboss.ws:jbossws-jboss500:jar</include>
<include>org.jboss.jaxr:juddi-service:sar</include>
<include>apache-scout:scout:jar</include>
15 years, 5 months
- 1
- 0
JBossWS SVN: r9844 - in stack/cxf/trunk: modules/management and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-20 06:54:33 -0400 (Mon, 20 Apr 2009)
New Revision: 9844
Added:
stack/cxf/trunk/modules/resources/src/main/resources/resources/default-deploy.conf
Removed:
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf
stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
Modified:
stack/cxf/trunk/build.xml
stack/cxf/trunk/modules/management/pom.xml
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/pom.xml
stack/cxf/trunk/profiles.xml.example
stack/cxf/trunk/src/main/distro/Install.txt
stack/cxf/trunk/src/main/distro/ant.properties.example
stack/cxf/trunk/src/main/distro/build-deploy.xml
stack/cxf/trunk/src/main/distro/build-setup.xml
stack/cxf/trunk/src/main/distro/build.xml
stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml
stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2612] removing AS 4x support
Modified: stack/cxf/trunk/build.xml
===================================================================
--- stack/cxf/trunk/build.xml 2009-04-20 09:56:06 UTC (rev 9843)
+++ stack/cxf/trunk/build.xml 2009-04-20 10:54:33 UTC (rev 9844)
@@ -29,8 +29,7 @@
<import file="${stack.distro.dir}/build-deploy.xml"/>
<import file="${stack.resources.dir}/resources/jbossws-deploy-macros.xml"/>
- <property name="jbossws.as4.default.deploy.conf" value="${stack.resources.dir}/resources/jbossws-as4-default-deploy.conf"/>
- <property name="jbossws.as5.default.deploy.conf" value="${stack.resources.dir}/resources/jbossws-as5-default-deploy.conf"/>
+ <property name="jbossws.default.deploy.conf" value="${stack.resources.dir}/resources/default-deploy.conf"/>
<property name="target.properties.file" value="${basedir}/target.properties"/>
<!-- ================================================================== -->
@@ -55,9 +54,6 @@
<arg value="help:effective-settings"/>
</exec>
<xmlproperty file="${stack.output.dir}/effective-settings.xml" keeproot="false"/>
- <condition property="jboss423.home" value="${profiles.profile.properties.jboss423.home}">
- <isset property="profiles.profile.properties.jboss423.home"/>
- </condition>
<condition property="jboss500.home" value="${profiles.profile.properties.jboss500.home}">
<isset property="profiles.profile.properties.jboss500.home"/>
</condition>
@@ -73,14 +69,12 @@
<!-- Loads the properties from the user profile -->
<xmlproperty file="${basedir}/profiles.xml" keeproot="false"/>
- <property name="jboss423.home" value="${profiles.profile.properties.jboss423.home}"/>
<property name="jboss500.home" value="${profiles.profile.properties.jboss500.home}"/>
<property name="jboss501.home" value="${profiles.profile.properties.jboss501.home}"/>
<property name="jboss510.home" value="${profiles.profile.properties.jboss510.home}"/>
<property name="jboss600.home" value="${profiles.profile.properties.jboss600.home}"/>
<echo/>
- <echo message="jboss423.home=${jboss423.home}"/>
<echo message="jboss500.home=${jboss500.home}"/>
<echo message="jboss501.home=${jboss501.home}"/>
<echo message="jboss510.home=${jboss510.home}"/>
Modified: stack/cxf/trunk/modules/management/pom.xml
===================================================================
--- stack/cxf/trunk/modules/management/pom.xml 2009-04-20 09:56:06 UTC (rev 9843)
+++ stack/cxf/trunk/modules/management/pom.xml 2009-04-20 10:54:33 UTC (rev 9844)
@@ -31,11 +31,6 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
<scope>provided</scope>
</dependency>
Added: stack/cxf/trunk/modules/resources/src/main/resources/resources/default-deploy.conf
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/default-deploy.conf (rev 0)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2009-04-20 10:54:33 UTC (rev 9844)
@@ -0,0 +1 @@
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native!
-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar
Deleted: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf 2009-04-20 09:56:06 UTC (rev 9843)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf 2009-04-20 10:54:33 UTC (rev 9844)
@@ -1 +0,0 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-native-jaxrpc.jar server/default/lib/jbossw!
s-native-jaxws-ext.jar server/default/lib/jbossws-native-jaxws.jar server/default/lib/jbossws-native-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar
Deleted: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf 2009-04-20 09:56:06 UTC (rev 9843)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf 2009-04-20 10:54:33 UTC (rev 9844)
@@ -1 +0,0 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native!
-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar
Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-04-20 09:56:06 UTC (rev 9843)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-04-20 10:54:33 UTC (rev 9844)
@@ -118,19 +118,6 @@
<!-- Deploy Lib -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-lib42">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.lib.patternset"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
<macrodef name="macro-deploy-jbossws-lib50">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -180,20 +167,6 @@
<!-- Deploy Lib Endorsed -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-endorsed42">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.lib.endorsed.patternset"/>
- <include name="**/stax-api.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
<macrodef name="macro-deploy-jbossws-endorsed">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -211,21 +184,6 @@
<!-- Deploy Client -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-client42">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.client.patternset"/>
- <include name="**/jbossws-(a){jbossid}.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
<macrodef name="macro-deploy-jbossws-client50">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -285,21 +243,6 @@
<!-- Deploy Server Lib -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-server-lib42">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.server.lib.patternset"/>
- <include name="**/jbossws-(a){jbossid}.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
<macrodef name="macro-deploy-jbossws-server-lib50">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -369,41 +312,6 @@
<!-- Deploy JBossWS Service -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-cxf42-sar">
- <attribute name="thirdpartydir"/>
- <attribute name="artifactsdir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.service.lib.patternset"/>
- <include name="**/jaxb-api.jar"/>
- <include name="**/jaxb-impl.jar"/>
- <include name="**/stax-api.jar"/>
- <include name="**/wstx.jar"/>
- </fileset>
- </copy>
- <unzip dest="@{targetdir}/jbossws-management.war">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-cxf-management.war"/>
- </fileset>
- </unzip>
- <copy todir="@{targetdir}/jbossws.beans">
- <fileset dir="@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans">
- <include name="META-INF/**"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/META-INF">
- <fileset dir="@{artifactsdir}/resources/jbossws-cxf.sar/META-INF"/>
- </copy>
- <copy todir="@{targetdir}/META-INF">
- <fileset dir="@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws-jboss42.sar/META-INF"/>
- </copy>
- </sequential>
- </macrodef>
-
<macrodef name="macro-deploy-jbossws-cxf50-sar">
<attribute name="thirdpartydir"/>
<attribute name="artifactsdir"/>
@@ -573,16 +481,6 @@
<!-- Deploy JBossWS -->
<!-- ================================================================== -->
- <target name="deploy-jbossws-cxf42" depends="check-parameters">
- <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
- <macro-deploy-jbossws-client42 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-endorsed42 targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-cxf42-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
- </target>
-
<target name="deploy-jbossws-cxf50" depends="check-parameters">
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
<macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
@@ -626,42 +524,6 @@
<!-- Undeploy JBossWS -->
<!-- ================================================================== -->
- <macrodef name="macro-undeploy-jbossws42">
- <attribute name="defaultconf"/>
- <attribute name="targetdir"/>
- <sequential>
- <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/>
- <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
-
- <property name="jboss.server.home" value="@{targetdir}/../.."/>
- <property name="jboss.home" value="${jboss.server.home}/../.."/>
- <available property="jboss.undeploy.client" file="${jboss.home}/client"/>
- <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
-
- <!-- delete stale container integration jars -->
- <delete>
- <fileset dir="${jboss.server.home}">
- <include name="**/jbossws-jboss*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/client">
- <include name="jbossws-jboss*.jar"/>
- </fileset>
- </delete>
-
- <!-- delete content of last deployment -->
- <delete>
- <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/>
- </delete>
-
- <!-- delete jbossws.sar -->
- <delete dir="@{targetdir}"/>
-
- <!-- delete juddi-service.sar -->
- <delete dir="@{targetdir}/../juddi-service.sar"/>
-
- </sequential>
- </macrodef>
-
<macrodef name="macro-undeploy-jbossws50">
<attribute name="defaultconf"/>
<attribute name="targetdir"/>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2009-04-20 09:56:06 UTC (rev 9843)
+++ stack/cxf/trunk/modules/server/pom.xml 2009-04-20 10:54:33 UTC (rev 9844)
@@ -25,14 +25,6 @@
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-spi</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423</artifactId>
- <version>${jbossws.jboss423.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- </dependency>
-
<!-- CXF dependencies -->
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -204,14 +196,6 @@
<artifactItems>
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423</artifactId>
- <version>${jbossws.jboss423.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss423</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
<version>${jbossws.jboss500.version}</version>
<classifier>resources</classifier>
@@ -263,7 +247,6 @@
</goals>
<configuration>
<tasks>
- <property name="jbossws.jboss423.version" value="${jbossws.jboss423.version}" />
<ant antfile="src/main/scripts/antrun-beans-config.xml" />
</tasks>
</configuration>
Modified: stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-04-20 09:56:06 UTC (rev 9843)
+++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-04-20 10:54:33 UTC (rev 9844)
@@ -27,18 +27,6 @@
<!-- Compile resource files -->
<target name="main" depends="init">
- <!-- Concat jbossws-jboss423/jbossws.beans -->
- <echo message="Concat jbossws-jboss423/jbossws.beans"/>
- <concat destfile="${project.build.resources.directory}/jbossws-jboss423/jbossws.beans/META-INF/jboss-beans.xml">
- <header trimleading="yes">
- <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
- xmlns="urn:jboss:bean-deployer"> </header>
- <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/>
- <fileset file="${project.build.resources.directory}/jbossws-jboss423/jbossws-jboss42-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
<!-- Concat jbossws-jboss500/jbossws.beans -->
<echo message="Concat jbossws-jboss500/jbossws.beans"/>
<concat destfile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/jboss-beans.xml">
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2009-04-20 09:56:06 UTC (rev 9843)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2009-04-20 10:54:33 UTC (rev 9844)
@@ -276,46 +276,6 @@
</profile>
<!--
- Name: jboss423
- Descr: JBoss-4.2.3 specific options
- -->
- <profile>
- <id>jboss423</id>
- <properties>
- <jboss.version>4.2.3.GA</jboss.version>
- <jbossws.integration.target>jboss423</jbossws.integration.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.client</groupId>
- <artifactId>jbossall-client</artifactId>
- <version>${jboss.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss423.txt</testExcludeFile>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss423.home}/lib/endorsed</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
Name: jboss500
Descr: JBoss-5.0.0 specific options
-->
Deleted: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-04-20 09:56:06 UTC (rev 9843)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-04-20 10:54:33 UTC (rev 9844)
@@ -1,94 +0,0 @@
-# EJB3/Injection excludes
-org/jboss/test/ws/jaxws/samples/webserviceref/**
-
-# Exclude endpoints with AS5 @SecurityDomain
-org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.*
-
-# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope
-org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*
-org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*
-
-# [CXF-1510] Cannot handle anonymous bare requests
-org/jboss/test/ws/jaxws/anonymous/**
-
-# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext
-org/jboss/test/ws/jaxws/binding/**
-
-# [CXF-1514][JBWS-2247] Generated WSDL does not take 'transport-guarantee' in web.xml into account
-org/jboss/test/ws/jaxws/jbws1190/**
-
-# [CXF-1516] Type inheritance with document/literal/bare
-org/jboss/test/ws/jaxws/jbws1702/**
-
-# [CXF-1517] HTTP bindings for Provider
-org/jboss/test/ws/jaxws/jbws1807/**
-
-# [CXF-1519] Explicitly set the namespace of a WebFault
-org/jboss/test/ws/jaxws/jbws1904/**
-
-# [CXF-1521] Exception handling with @WebFault annotation
-org/jboss/test/ws/jaxws/webfault/**
-
-# [CXF-2006] RespectBinding feature and not understood required extensibility elements
-org/jboss/test/ws/jaxws/jbws2449/**
-
-# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
-org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
-
-# [JBWS-1655] Add support for endpoint address rewriting
-org/jboss/test/ws/jaxws/jbws2150/**
-
-# [JBWS-2074] Resource injection in jaxws endpoints and handlers
-org/jboss/test/ws/jaxws/jbws2074/**
-
-# [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail
-org/jboss/test/ws/jaxws/jbws1762/**
-
-# [JBWS-2118] context-root in jboss.xml is ignored
-org/jboss/test/ws/jaxws/jbws1813/**
-
-# [JBWS-2119] WebServiceRef injection from DD doesn't work
-org/jboss/test/ws/jaxws/jbws1841/**
-
-# [JBWS-2561] XOP request not properly inlined
-org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
-
-# [JBWS-2571] Mode.INOUT parameter not generated
-org/jboss/test/ws/jaxws/holder/**
-
-# [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF
-org/jboss/test/ws/jaxws/jbws1178/**
-
-# [JBWS-2240] PortComponent from jboss.xml descriptor is not parsed
-org/jboss/test/ws/jaxws/jbws2241/**
-
-# [JBWS-2307] Stub properties not propagated through service-ref (fixed in AS 5.x and above)
-org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.*
-
-# [JBWS-2330] Failed to deploy service with multiple bindings
-org/jboss/test/ws/jaxws/jbws2278/**
-
-# [JBWS-2480] Soap attachments are dropped on server response
-org/jboss/test/ws/jaxws/jbws1283/**
-
-# [JBWS-2491] Enable JAXWS 2.1 WebServiceContext methods
-org/jboss/test/ws/jaxws/jbws2257/**
-
-# [JBWS-2527] BeanFactory not initialized or already closed (fixed on AS 5.x series only)
-org/jboss/test/ws/jaxws/jbws2527/**
-
-# [JBWS-2397] Fix jbws1797 testcase
-org/jboss/test/ws/jaxws/jbws1797/**
-
-# [JBWS-2582] org.apache.cxf.tools.common.ToolException: -p option cannot be
-# used when wsdl contains mutiple schemas
-org/jboss/test/ws/jaxws/complex/**
-
-# [JBWS-2584] Provider endpoint causes NPE in AbstractPolicyInterceptor
-org/jboss/test/ws/jaxws/jbws1815/**
-
-# [JBWS-2591] WSConsume does not generate @XmlList with doc/lit wsdl
-org/jboss/test/ws/jaxws/jbws2591/**
-
-# [JBWS-2593] WSConsume does not generate @XmlJavaTypeAdapter in SEI
-org/jboss/test/ws/jaxws/jbws2593/**
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2009-04-20 09:56:06 UTC (rev 9843)
+++ stack/cxf/trunk/pom.xml 2009-04-20 10:54:33 UTC (rev 9844)
@@ -46,7 +46,6 @@
<jbossws.common.version>1.0.11-SNAPSHOT</jbossws.common.version>
<jbossws.framework.version>3.2.0-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.1.1.GA</jbossws.spi.version>
- <jbossws.jboss423.version>3.1.1.GA</jbossws.jboss423.version>
<jbossws.jboss500.version>3.1.1.GA</jbossws.jboss500.version>
<jbossws.jboss501.version>3.1.1.GA</jbossws.jboss501.version>
<!-- JBWS-2505 -->
@@ -107,18 +106,6 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423</artifactId>
- <version>${jbossws.jboss423.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423</artifactId>
- <version>${jbossws.jboss423.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
<version>${jbossws.jboss500.version}</version>
</dependency>
@@ -531,18 +518,6 @@
</profile>
<!--
- Name: jboss423
- Descr: JBoss-4.2.2 specific options
- -->
- <profile>
- <id>jboss423</id>
- <properties>
- <jbossws.integration.target>jboss423</jbossws.integration.target>
- <jboss.home>${jboss423.home}</jboss.home>
- </properties>
- </profile>
-
- <!--
Name: jboss500
Descr: JBoss-5.0.0 specific options
-->
Modified: stack/cxf/trunk/profiles.xml.example
===================================================================
--- stack/cxf/trunk/profiles.xml.example 2009-04-20 09:56:06 UTC (rev 9843)
+++ stack/cxf/trunk/profiles.xml.example 2009-04-20 10:54:33 UTC (rev 9844)
@@ -11,10 +11,9 @@
</property>
</activation>
<properties>
- <jboss423.home>/home/opalka/svn/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home>
<jboss500.home>/home/opalka/svn/jbossas/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home>
<jboss501.home>/home/opalka/svn/jbossas/branches/Branch_5_0/build/output/jboss-5.0.1.GA</jboss501.home>
- <jboss510.home>/home/opalka/svn/jbossas/branches/Branch_5_x/build/output/jboss-5.1.0.Beta1</jboss510.home>
+ <jboss510.home>/home/opalka/svn/jbossas/branches/Branch_5_x/build/output/jboss-5.1.0.CR1</jboss510.home>
<jboss600.home>/home/opalka/svn/jbossas/trunk/build/output/jboss-6.0.0.Alpha1</jboss600.home>
</properties>
</profile>
Modified: stack/cxf/trunk/src/main/distro/Install.txt
===================================================================
--- stack/cxf/trunk/src/main/distro/Install.txt 2009-04-20 09:56:06 UTC (rev 9843)
+++ stack/cxf/trunk/src/main/distro/Install.txt 2009-04-20 10:54:33 UTC (rev 9844)
@@ -13,7 +13,6 @@
2.) Modify the target container location in ant.properties
3.) Execute one of the following
- ant deploy-jboss42x
ant deploy-jboss50x
ant deploy-jboss51x
ant deploy-jboss60x
Modified: stack/cxf/trunk/src/main/distro/ant.properties.example
===================================================================
--- stack/cxf/trunk/src/main/distro/ant.properties.example 2009-04-20 09:56:06 UTC (rev 9843)
+++ stack/cxf/trunk/src/main/distro/ant.properties.example 2009-04-20 10:54:33 UTC (rev 9844)
@@ -3,13 +3,12 @@
#
# Optional JBoss Home
-jboss423.home=(a)jboss423.home@
jboss500.home=(a)jboss500.home@
jboss501.home=(a)jboss501.home@
jboss510.home=(a)jboss510.home@
jboss600.home=(a)jboss600.home@
-# The JBoss server under test. This can be [jboss423|jboss500|jboss501|jboss510|jboss600]
+# The JBoss server under test. This can be [jboss500|jboss501|jboss510|jboss600]
jbossws.integration.target=jboss500
# The JBoss settings
Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/build-deploy.xml 2009-04-20 09:56:06 UTC (rev 9843)
+++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2009-04-20 10:54:33 UTC (rev 9844)
@@ -12,43 +12,6 @@
<project>
<!-- ================================================================== -->
- <!-- Prepare Deployment Structure JBoss-4.2.x -->
- <!-- ================================================================== -->
-
- <target name="deploy-structure-jboss42" depends="prepare-deploy">
- <delete dir="${deploy.structure}"/>
- <antcall target="deploy-jbossws-cxf42" inheritall="false">
- <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
- <param name="jbossid" value="${jbossws.integration.target}"/>
- <param name="artifactsdir" value="${deploy.artifacts.dir}"/>
- <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
- </antcall>
- <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss423 -->
- <!-- ================================================================== -->
-
- <target name="target-jboss423">
- <property name="jbossws.integration.target" value="jboss423"/>
- <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
- </target>
-
- <target name="deploy-jboss423" depends="undeploy-jboss423,deploy-structure-jboss42" description="Deploy jbossws to jboss423">
- <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
- <copy todir="${jboss423.home}" overwrite="true">
- <fileset dir="${deploy.structure}"/>
- </copy>
- <chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/>
- </target>
-
- <target name="undeploy-jboss423" depends="target-jboss423,init" description="Remove jbossws from jboss423">
- <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
- <macro-undeploy-jbossws42 targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.as4.default.deploy.conf}"/>
- </target>
-
- <!-- ================================================================== -->
<!-- Prepare Deployment Structure JBoss-5.0.x -->
<!-- ================================================================== -->
@@ -82,7 +45,7 @@
<target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500">
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
- <macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>
+ <macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
</target>
<!-- ================================================================== -->
@@ -104,7 +67,7 @@
<target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501">
<fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
- <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>
+ <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
</target>
<!-- ================================================================== -->
@@ -141,7 +104,7 @@
<target name="undeploy-jboss510" depends="target-jboss510,init" description="Remove jbossws from jboss510">
<fail message="Not available: ${jboss510.available.file}" unless="jboss510.available"/>
- <macro-undeploy-jbossws51 targetdir="${jboss510.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>
+ <macro-undeploy-jbossws51 targetdir="${jboss510.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
</target>
<!-- ================================================================== -->
@@ -178,7 +141,7 @@
<target name="undeploy-jboss600" depends="target-jboss600,init" description="Remove jbossws from jboss600">
<fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/>
- <macro-undeploy-jbossws60 targetdir="${jboss600.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>
+ <macro-undeploy-jbossws60 targetdir="${jboss600.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
</target>
<!-- ================================================================== -->
Modified: stack/cxf/trunk/src/main/distro/build-setup.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/build-setup.xml 2009-04-20 09:56:06 UTC (rev 9843)
+++ stack/cxf/trunk/src/main/distro/build-setup.xml 2009-04-20 10:54:33 UTC (rev 9844)
@@ -21,12 +21,6 @@
<property file="${target.properties.file}"/>
<property name="jboss.server.instance" value="default"/>
- <property name="jboss423.lib" value="${jboss423.home}/lib"/>
- <property name="jboss423.client" value="${jboss423.home}/client"/>
- <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/>
- <property name="jboss423.server.lib" value="${jboss423.server}/lib"/>
- <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/>
-
<property name="jboss500.lib" value="${jboss500.home}/lib"/>
<property name="jboss500.client" value="${jboss500.home}/client"/>
<property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/>
@@ -55,13 +49,11 @@
<property name="jboss600.server.deploy" value="${jboss600.server}/deploy"/>
<property name="jboss600.server.deployers" value="${jboss600.server}/deployers"/>
- <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/>
<property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/>
<property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/>
<property name="jboss510.available.file" value="${jboss510.client}/jboss-client.jar"/>
<property name="jboss600.available.file" value="${jboss600.client}/jboss-client.jar"/>
- <available property="jboss423.available" file="${jboss423.available.file}"/>
<available property="jboss500.available" file="${jboss500.available.file}"/>
<available property="jboss501.available" file="${jboss501.available.file}"/>
<available property="jboss510.available" file="${jboss510.available.file}"/>
Modified: stack/cxf/trunk/src/main/distro/build.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/build.xml 2009-04-20 09:56:06 UTC (rev 9843)
+++ stack/cxf/trunk/src/main/distro/build.xml 2009-04-20 10:54:33 UTC (rev 9844)
@@ -22,8 +22,7 @@
<property name="tests.dir" value="${basedir}/tests"/>
<property name="tests.output.dir" value="${output.dir}"/>
<property name="deploy.artifacts.dir" value="${basedir}/deploy"/>
- <property name="jbossws.as5.default.deploy.conf" value="${build.dir}/jbossws-as5-default-deploy.conf"/>
- <property name="jbossws.as4.default.deploy.conf" value="${build.dir}/jbossws-as4-default-deploy.conf"/>
+ <property name="jbossws.default.deploy.conf" value="${build.dir}/default-deploy.conf"/>
<property name="target.properties.file" value="${basedir}/target.properties"/>
<!-- Check if ant.properties is available -->
@@ -46,11 +45,6 @@
<fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/>
<echo message="integration.target=${jbossws.integration.target}"/>
- <condition property="jbossws.integration.jboss42" value="true">
- <or>
- <equals arg1="${jbossws.integration.target}" arg2="jboss423"/>
- </or>
- </condition>
<condition property="jbossws.integration.jboss50" value="true">
<or>
<equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
Modified: stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2009-04-20 09:56:06 UTC (rev 9843)
+++ stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2009-04-20 10:54:33 UTC (rev 9844)
@@ -39,8 +39,7 @@
<directory>modules/resources/src/main/resources/resources</directory>
<outputDirectory>build</outputDirectory>
<includes>
- <include>jbossws-as5-default-deploy.conf</include>
- <include>jbossws-as4-default-deploy.conf</include>
+ <include>default-deploy.conf</include>
<include>jbossws-deploy-macros.xml</include>
</includes>
</fileSet>
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-04-20 09:56:06 UTC (rev 9843)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-04-20 10:54:33 UTC (rev 9844)
@@ -92,7 +92,6 @@
<unpack>false</unpack>
<includes>
<include>org.jboss.ws:jbossws-framework:jar</include>
- <include>org.jboss.ws:jbossws-jboss423:jar</include>
<include>org.jboss.ws:jbossws-jboss500:jar</include>
<include>org.jboss.jaxr:juddi-service:sar</include>
<include>apache-scout:scout:jar</include>
15 years, 5 months
- 1
- 0
JBossWS SVN: r9843 - in framework/trunk: hudson/hudson-home and 12 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-20 05:56:06 -0400 (Mon, 20 Apr 2009)
New Revision: 9843
Removed:
framework/trunk/hudson/hudson-home/jobs/AS-4.2.3/
framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.3/
framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-4.2.3-JDK5/
framework/trunk/hudson/hudson-home/jobs/CXF-Binary-Distro-AS-4.2.3-JDK6/
framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.3-JDK5/
framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.3-JDK6/
framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-4.2.3-JDK5/
framework/trunk/hudson/hudson-home/jobs/CXF-Source-Distro-AS-4.2.3-JDK6/
framework/trunk/hudson/hudson-home/jobs/Metro-Binary-Distro-AS-4.2.3-JDK5/
framework/trunk/hudson/hudson-home/jobs/Metro-Binary-Distro-AS-4.2.3-JDK6/
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3-JDK5/
framework/trunk/hudson/hudson-home/jobs/Metro-Core-AS-4.2.3-JDK6/
framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-4.2.3-JDK5/
framework/trunk/hudson/hudson-home/jobs/Metro-Source-Distro-AS-4.2.3-JDK6/
framework/trunk/hudson/hudson-home/jobs/Native-Binary-Distro-AS-4.2.3-JDK5/
framework/trunk/hudson/hudson-home/jobs/Native-Binary-Distro-AS-4.2.3-JDK6/
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3-JDK5/
framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3-JDK6/
framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-4.2.3-JDK5/
framework/trunk/hudson/hudson-home/jobs/Native-Source-Distro-AS-4.2.3-JDK6/
Modified:
framework/trunk/hudson/ant.properties.example
framework/trunk/hudson/hudson-home/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-Tests-ALL/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml
framework/trunk/hudson/hudson-home/jobs/CXF-Light/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-ALL/config.xml
framework/trunk/hudson/hudson-home/jobs/Metro-Light/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-ALL/config.xml
framework/trunk/hudson/hudson-home/jobs/Native-Light/config.xml
framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml
framework/trunk/hudson/hudson-home/jobs/Weekend-Matrix/config.xml
framework/trunk/hudson/hudson-home/jobs/Working-Days-Matrix/config.xml
framework/trunk/testsuite/test/ant-import/build-testsuite.xml
Log:
[JBWS-2612] removing AS 4x support
Modified: framework/trunk/hudson/ant.properties.example
===================================================================
--- framework/trunk/hudson/ant.properties.example 2009-04-20 09:31:15 UTC (rev 9842)
+++ framework/trunk/hudson/ant.properties.example 2009-04-20 09:56:06 UTC (rev 9843)
@@ -26,10 +26,6 @@
hudson.metro.url=http://anonsvn.jboss.org/repos/jbossws/stack/metro/trunk
hudson.cxf.url=http://anonsvn.jboss.org/repos/jbossws/stack/cxf/trunk
-hudson.jboss423.url=http://anonsvn.jboss.org/repos/jbossas/tags/JBoss_4_2_3_GA
-hudson.jboss423.build=jboss-4.2.3.GA
-hudson.jboss423.rev=HEAD
-
hudson.jboss500.url=http://anonsvn.jboss.org/repos/jbossas/tags/JBoss_5_0...
hudson.jboss500.build=jboss-5.0.0.GA
hudson.jboss500.rev=HEAD
Modified: framework/trunk/hudson/hudson-home/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/config.xml 2009-04-20 09:31:15 UTC (rev 9842)
+++ framework/trunk/hudson/hudson-home/config.xml 2009-04-20 09:56:06 UTC (rev 9843)
@@ -13,7 +13,6 @@
<tr><th align=left>Stack-Metro:</th><td>@hudson.metro.url@</td></tr>
<tr><th align=left>Stack-CXF:</th><td>@hudson.cxf.url@</td></tr>
<tr><td colspan=2></td></tr>
- <tr><th align=left>@hudson.jboss423.build@</th><td>-r(a)hudson.jboss423.rev@ @hudson.jboss423.url@</td></tr>
<tr><th align=left>@hudson.jboss500.build@</th><td>-r(a)hudson.jboss500.rev@ @hudson.jboss500.url@</td></tr>
<tr><th align=left>@hudson.jboss501.build@</th><td>-r(a)hudson.jboss501.rev@ @hudson.jboss501.url@</td></tr>
<tr><th align=left>@hudson.jboss510.build@</th><td>-r(a)hudson.jboss510.rev@ @hudson.jboss510.url@</td></tr>
@@ -33,7 +32,6 @@
<jobNames class="tree-set">
<no-comparator/>
<string>AS-Tests-ALL</string>
- <string>AS-Tests-AS-4.2.3</string>
<string>AS-Tests-AS-5.0.0</string>
<string>AS-Tests-AS-5.0.1</string>
<string>AS-Tests-AS-5.1.0</string>
@@ -56,32 +54,26 @@
<no-comparator/>
<string>Native-ALL</string>
<string>Native-Light</string>
- <string>Native-Core-AS-4.2.3-JDK5</string>
<string>Native-Core-AS-5.0.0-JDK5</string>
<string>Native-Core-AS-5.0.1-JDK5</string>
<string>Native-Core-AS-5.1.0-JDK5</string>
<string>Native-Core-AS-6.0.0-JDK5</string>
- <string>Native-Core-AS-4.2.3-JDK6</string>
<string>Native-Core-AS-5.0.0-JDK6</string>
<string>Native-Core-AS-5.0.1-JDK6</string>
<string>Native-Core-AS-5.1.0-JDK6</string>
<string>Native-Core-AS-6.0.0-JDK6</string>
- <string>Native-Binary-Distro-AS-4.2.3-JDK5</string>
<string>Native-Binary-Distro-AS-5.0.0-JDK5</string>
<string>Native-Binary-Distro-AS-5.0.1-JDK5</string>
<string>Native-Binary-Distro-AS-5.1.0-JDK5</string>
<string>Native-Binary-Distro-AS-6.0.0-JDK5</string>
- <string>Native-Binary-Distro-AS-4.2.3-JDK6</string>
<string>Native-Binary-Distro-AS-5.0.0-JDK6</string>
<string>Native-Binary-Distro-AS-5.0.1-JDK6</string>
<string>Native-Binary-Distro-AS-5.1.0-JDK6</string>
<string>Native-Binary-Distro-AS-6.0.0-JDK6</string>
- <string>Native-Source-Distro-AS-4.2.3-JDK5</string>
<string>Native-Source-Distro-AS-5.0.0-JDK5</string>
<string>Native-Source-Distro-AS-5.0.1-JDK5</string>
<string>Native-Source-Distro-AS-5.1.0-JDK5</string>
<string>Native-Source-Distro-AS-6.0.0-JDK5</string>
- <string>Native-Source-Distro-AS-4.2.3-JDK6</string>
<string>Native-Source-Distro-AS-5.0.0-JDK6</string>
<string>Native-Source-Distro-AS-5.0.1-JDK6</string>
<string>Native-Source-Distro-AS-5.1.0-JDK6</string>
@@ -104,32 +96,26 @@
<no-comparator/>
<string>Metro-ALL</string>
<string>Metro-Light</string>
- <string>Metro-Core-AS-4.2.3-JDK5</string>
<string>Metro-Core-AS-5.0.0-JDK5</string>
<string>Metro-Core-AS-5.0.1-JDK5</string>
<string>Metro-Core-AS-5.1.0-JDK5</string>
<string>Metro-Core-AS-6.0.0-JDK5</string>
- <string>Metro-Core-AS-4.2.3-JDK6</string>
<string>Metro-Core-AS-5.0.0-JDK6</string>
<string>Metro-Core-AS-5.0.1-JDK6</string>
<string>Metro-Core-AS-5.1.0-JDK6</string>
<string>Metro-Core-AS-6.0.0-JDK6</string>
- <string>Metro-Binary-Distro-AS-4.2.3-JDK5</string>
<string>Metro-Binary-Distro-AS-5.0.0-JDK5</string>
<string>Metro-Binary-Distro-AS-5.0.1-JDK5</string>
<string>Metro-Binary-Distro-AS-5.1.0-JDK5</string>
<string>Metro-Binary-Distro-AS-6.0.0-JDK5</string>
- <string>Metro-Binary-Distro-AS-4.2.3-JDK6</string>
<string>Metro-Binary-Distro-AS-5.0.0-JDK6</string>
<string>Metro-Binary-Distro-AS-5.0.1-JDK6</string>
<string>Metro-Binary-Distro-AS-5.1.0-JDK6</string>
<string>Metro-Binary-Distro-AS-6.0.0-JDK6</string>
- <string>Metro-Source-Distro-AS-4.2.3-JDK5</string>
<string>Metro-Source-Distro-AS-5.0.0-JDK5</string>
<string>Metro-Source-Distro-AS-5.0.1-JDK5</string>
<string>Metro-Source-Distro-AS-5.1.0-JDK5</string>
<string>Metro-Source-Distro-AS-6.0.0-JDK5</string>
- <string>Metro-Source-Distro-AS-4.2.3-JDK6</string>
<string>Metro-Source-Distro-AS-5.0.0-JDK6</string>
<string>Metro-Source-Distro-AS-5.0.1-JDK6</string>
<string>Metro-Source-Distro-AS-5.1.0-JDK6</string>
@@ -152,32 +138,26 @@
<no-comparator/>
<string>CXF-ALL</string>
<string>CXF-Light</string>
- <string>CXF-Core-AS-4.2.3-JDK5</string>
<string>CXF-Core-AS-5.0.0-JDK5</string>
<string>CXF-Core-AS-5.0.1-JDK5</string>
<string>CXF-Core-AS-5.1.0-JDK5</string>
<string>CXF-Core-AS-6.0.0-JDK5</string>
- <string>CXF-Core-AS-4.2.3-JDK6</string>
<string>CXF-Core-AS-5.0.0-JDK6</string>
<string>CXF-Core-AS-5.0.1-JDK6</string>
<string>CXF-Core-AS-5.1.0-JDK6</string>
<string>CXF-Core-AS-6.0.0-JDK6</string>
- <string>CXF-Binary-Distro-AS-4.2.3-JDK5</string>
<string>CXF-Binary-Distro-AS-5.0.0-JDK5</string>
<string>CXF-Binary-Distro-AS-5.0.1-JDK5</string>
<string>CXF-Binary-Distro-AS-5.1.0-JDK5</string>
<string>CXF-Binary-Distro-AS-6.0.0-JDK5</string>
- <string>CXF-Binary-Distro-AS-4.2.3-JDK6</string>
<string>CXF-Binary-Distro-AS-5.0.0-JDK6</string>
<string>CXF-Binary-Distro-AS-5.0.1-JDK6</string>
<string>CXF-Binary-Distro-AS-5.1.0-JDK6</string>
<string>CXF-Binary-Distro-AS-6.0.0-JDK6</string>
- <string>CXF-Source-Distro-AS-4.2.3-JDK5</string>
<string>CXF-Source-Distro-AS-5.0.0-JDK5</string>
<string>CXF-Source-Distro-AS-5.0.1-JDK5</string>
<string>CXF-Source-Distro-AS-5.1.0-JDK5</string>
<string>CXF-Source-Distro-AS-6.0.0-JDK5</string>
- <string>CXF-Source-Distro-AS-4.2.3-JDK6</string>
<string>CXF-Source-Distro-AS-5.0.0-JDK6</string>
<string>CXF-Source-Distro-AS-5.0.1-JDK6</string>
<string>CXF-Source-Distro-AS-5.1.0-JDK6</string>
@@ -209,7 +189,6 @@
<table border=1>
<tr align=center><th>Target</th> <th>Core Tests</th> <th colspan=3>Distribution Tests</th> <th colspan=3>Source distribution Tests</th></tr>
<tr align=center><th> </th> <th> </th> <th>Native</th><th>Metro</th><th>CXF</th> <th>Native</th><th>Metro</th><th>CXF</th></tr>
-<tr align=center><th align=left>AS-4.2.3</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
<tr align=center><th align=left>AS-5.0.0</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
<tr align=center><th align=left>AS-5.0.1</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
<tr align=center><th align=left>AS-5.1.0</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
@@ -224,7 +203,6 @@
<owner reference="../../.."/>
<jobNames class="tree-set">
<no-comparator/>
- <string>AS-4.2.3</string>
<string>AS-5.0.0</string>
<string>AS-5.0.1</string>
<string>AS-5.1.0</string>
@@ -243,64 +221,52 @@
<jobNames class="tree-set">
<no-comparator/>
<string>Metro-Light</string>
- <string>Metro-Core-AS-4.2.3-JDK5</string>
<string>Metro-Core-AS-5.0.0-JDK5</string>
<string>Metro-Core-AS-5.0.1-JDK5</string>
<string>Metro-Core-AS-5.1.0-JDK5</string>
<string>Metro-Core-AS-6.0.0-JDK5</string>
- <string>Metro-Core-AS-4.2.3-JDK6</string>
<string>Metro-Core-AS-5.0.0-JDK6</string>
<string>Metro-Core-AS-5.0.1-JDK6</string>
<string>Metro-Core-AS-5.1.0-JDK6</string>
<string>Metro-Core-AS-6.0.0-JDK6</string>
- <string>Metro-Binary-Distro-AS-4.2.3-JDK5</string>
<string>Metro-Binary-Distro-AS-5.0.0-JDK5</string>
<string>Metro-Binary-Distro-AS-5.0.1-JDK5</string>
<string>Metro-Binary-Distro-AS-5.1.0-JDK5</string>
<string>Metro-Binary-Distro-AS-6.0.0-JDK5</string>
- <string>Metro-Binary-Distro-AS-4.2.3-JDK6</string>
<string>Metro-Binary-Distro-AS-5.0.0-JDK6</string>
<string>Metro-Binary-Distro-AS-5.0.1-JDK6</string>
<string>Metro-Binary-Distro-AS-5.1.0-JDK6</string>
<string>Metro-Binary-Distro-AS-6.0.0-JDK6</string>
<string>CXF-Light</string>
- <string>CXF-Core-AS-4.2.3-JDK5</string>
<string>CXF-Core-AS-5.0.0-JDK5</string>
<string>CXF-Core-AS-5.0.1-JDK5</string>
<string>CXF-Core-AS-5.1.0-JDK5</string>
<string>CXF-Core-AS-6.0.0-JDK5</string>
- <string>CXF-Core-AS-4.2.3-JDK6</string>
<string>CXF-Core-AS-5.0.0-JDK6</string>
<string>CXF-Core-AS-5.0.1-JDK6</string>
<string>CXF-Core-AS-5.1.0-JDK6</string>
<string>CXF-Core-AS-6.0.0-JDK6</string>
- <string>CXF-Binary-Distro-AS-4.2.3-JDK5</string>
<string>CXF-Binary-Distro-AS-5.0.0-JDK5</string>
<string>CXF-Binary-Distro-AS-5.0.1-JDK5</string>
<string>CXF-Binary-Distro-AS-5.1.0-JDK5</string>
<string>CXF-Binary-Distro-AS-6.0.0-JDK5</string>
- <string>CXF-Binary-Distro-AS-4.2.3-JDK6</string>
<string>CXF-Binary-Distro-AS-5.0.0-JDK6</string>
<string>CXF-Binary-Distro-AS-5.0.1-JDK6</string>
<string>CXF-Binary-Distro-AS-5.1.0-JDK6</string>
<string>CXF-Binary-Distro-AS-6.0.0-JDK6</string>
<string>Native-Light</string>
- <string>Native-Core-AS-4.2.3-JDK5</string>
<string>Native-Core-AS-5.0.0-JDK5</string>
<string>Native-Core-AS-5.0.1-JDK5</string>
<string>Native-Core-AS-5.1.0-JDK5</string>
<string>Native-Core-AS-6.0.0-JDK5</string>
- <string>Native-Core-AS-4.2.3-JDK6</string>
<string>Native-Core-AS-5.0.0-JDK6</string>
<string>Native-Core-AS-5.0.1-JDK6</string>
<string>Native-Core-AS-5.1.0-JDK6</string>
<string>Native-Core-AS-6.0.0-JDK6</string>
- <string>Native-Binary-Distro-AS-4.2.3-JDK5</string>
<string>Native-Binary-Distro-AS-5.0.0-JDK5</string>
<string>Native-Binary-Distro-AS-5.0.1-JDK5</string>
<string>Native-Binary-Distro-AS-5.1.0-JDK5</string>
<string>Native-Binary-Distro-AS-6.0.0-JDK5</string>
- <string>Native-Binary-Distro-AS-4.2.3-JDK6</string>
<string>Native-Binary-Distro-AS-5.0.0-JDK6</string>
<string>Native-Binary-Distro-AS-5.0.1-JDK6</string>
<string>Native-Binary-Distro-AS-5.1.0-JDK6</string>
Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-ALL/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-Tests-ALL/config.xml 2009-04-20 09:31:15 UTC (rev 9842)
+++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-ALL/config.xml 2009-04-20 09:56:06 UTC (rev 9843)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-Tests-AS-4.2.3, AS-Tests-AS-5.0.0, AS-Tests-AS-5.0.1, AS-Tests-AS-5.1.0, AS-Tests-AS-6.0.0</childProjects>
+ <childProjects>AS-Tests-AS-5.0.0, AS-Tests-AS-5.0.1, AS-Tests-AS-5.1.0, AS-Tests-AS-6.0.0</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml 2009-04-20 09:31:15 UTC (rev 9842)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml 2009-04-20 09:56:06 UTC (rev 9843)
@@ -4,37 +4,31 @@
<publishers class="vector">
<hudson.tasks.BuildTrigger>
<childProjects>
- CXF-Core-AS-4.2.3-JDK5
-, CXF-Core-AS-5.0.0-JDK5
+ CXF-Core-AS-5.0.0-JDK5
, CXF-Core-AS-5.0.1-JDK5
, CXF-Core-AS-5.1.0-JDK5
, CXF-Core-AS-6.0.0-JDK5
-, CXF-Core-AS-4.2.3-JDK6
, CXF-Core-AS-5.0.0-JDK6
, CXF-Core-AS-5.0.1-JDK6
, CXF-Core-AS-5.1.0-JDK6
, CXF-Core-AS-6.0.0-JDK6
-, CXF-Binary-Distro-AS-4.2.3-JDK5
, CXF-Binary-Distro-AS-5.0.0-JDK5
, CXF-Binary-Distro-AS-5.0.1-JDK5
, CXF-Binary-Distro-AS-5.1.0-JDK5
, CXF-Binary-Distro-AS-6.0.0-JDK5
-, CXF-Binary-Distro-AS-4.2.3-JDK6
, CXF-Binary-Distro-AS-5.0.0-JDK6
, CXF-Binary-Distro-AS-5.0.1-JDK6
, CXF-Binary-Distro-AS-5.1.0-JDK6
, CXF-Binary-Distro-AS-6.0.0-JDK6
-, CXF-Source-Distro-AS-4.2.3-JDK5
, CXF-Source-Distro-AS-5.0.0-JDK5
, CXF-Source-Distro-AS-5.0.1-JDK5
, CXF-Source-Distro-AS-5.1.0-JDK5
, CXF-Source-Distro-AS-6.0.0-JDK5
-, CXF-Source-Distro-AS-4.2.3-JDK6
, CXF-Source-Distro-AS-5.0.0-JDK6
, CXF-Source-Distro-AS-5.0.1-JDK6
, CXF-Source-Distro-AS-5.1.0-JDK6
Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Light/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/CXF-Light/config.xml 2009-04-20 09:31:15 UTC (rev 9842)
+++ framework/trunk/hudson/hudson-home/jobs/CXF-Light/config.xml 2009-04-20 09:56:06 UTC (rev 9843)
@@ -4,25 +4,21 @@
<publishers class="vector">
<hudson.tasks.BuildTrigger>
<childProjects>
- CXF-Core-AS-4.2.3-JDK5
-, CXF-Core-AS-5.0.0-JDK5
+ CXF-Core-AS-5.0.0-JDK5
, CXF-Core-AS-5.0.1-JDK5
, CXF-Core-AS-5.1.0-JDK5
, CXF-Core-AS-6.0.0-JDK5
-, CXF-Core-AS-4.2.3-JDK6
, CXF-Core-AS-5.0.0-JDK6
, CXF-Core-AS-5.0.1-JDK6
, CXF-Core-AS-5.1.0-JDK6
, CXF-Core-AS-6.0.0-JDK6
-, CXF-Binary-Distro-AS-4.2.3-JDK5
, CXF-Binary-Distro-AS-5.0.0-JDK5
, CXF-Binary-Distro-AS-5.0.1-JDK5
, CXF-Binary-Distro-AS-5.1.0-JDK5
, CXF-Binary-Distro-AS-6.0.0-JDK5
-, CXF-Binary-Distro-AS-4.2.3-JDK6
, CXF-Binary-Distro-AS-5.0.0-JDK6
, CXF-Binary-Distro-AS-5.0.1-JDK6
, CXF-Binary-Distro-AS-5.1.0-JDK6
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-ALL/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-ALL/config.xml 2009-04-20 09:31:15 UTC (rev 9842)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-ALL/config.xml 2009-04-20 09:56:06 UTC (rev 9843)
@@ -4,32 +4,31 @@
<publishers class="vector">
<hudson.tasks.BuildTrigger>
<childProjects>
- Metro-Core-AS-4.2.3-JDK5
-, Metro-Core-AS-5.0.0-JDK5
+ Metro-Core-AS-5.0.0-JDK5
, Metro-Core-AS-5.0.1-JDK5
, Metro-Core-AS-5.1.0-JDK5
, Metro-Core-AS-6.0.0-JDK5
-, Metro-Core-AS-4.2.3-JDK6
+
, Metro-Core-AS-5.0.0-JDK6
, Metro-Core-AS-5.0.1-JDK6
, Metro-Core-AS-5.1.0-JDK6
, Metro-Core-AS-6.0.0-JDK6
-, Metro-Binary-Distro-AS-4.2.3-JDK5
+
, Metro-Binary-Distro-AS-5.0.0-JDK5
, Metro-Binary-Distro-AS-5.0.1-JDK5
, Metro-Binary-Distro-AS-5.1.0-JDK5
, Metro-Binary-Distro-AS-6.0.0-JDK5
-, Metro-Binary-Distro-AS-4.2.3-JDK6
+
, Metro-Binary-Distro-AS-5.0.0-JDK6
, Metro-Binary-Distro-AS-5.0.1-JDK6
, Metro-Binary-Distro-AS-5.1.0-JDK6
, Metro-Binary-Distro-AS-6.0.0-JDK6
-, Metro-Source-Distro-AS-4.2.3-JDK5
+
, Metro-Source-Distro-AS-5.0.0-JDK5
, Metro-Source-Distro-AS-5.0.1-JDK5
, Metro-Source-Distro-AS-5.1.0-JDK5
, Metro-Source-Distro-AS-6.0.0-JDK5
-, Metro-Source-Distro-AS-4.2.3-JDK6
+
, Metro-Source-Distro-AS-5.0.0-JDK6
, Metro-Source-Distro-AS-5.0.1-JDK6
, Metro-Source-Distro-AS-5.1.0-JDK6
Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Light/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Metro-Light/config.xml 2009-04-20 09:31:15 UTC (rev 9842)
+++ framework/trunk/hudson/hudson-home/jobs/Metro-Light/config.xml 2009-04-20 09:56:06 UTC (rev 9843)
@@ -4,22 +4,21 @@
<publishers class="vector">
<hudson.tasks.BuildTrigger>
<childProjects>
- Metro-Core-AS-4.2.3-JDK5
-, Metro-Core-AS-5.0.0-JDK5
+ Metro-Core-AS-5.0.0-JDK5
, Metro-Core-AS-5.0.1-JDK5
, Metro-Core-AS-5.1.0-JDK5
, Metro-Core-AS-6.0.0-JDK5
-, Metro-Core-AS-4.2.3-JDK6
+
, Metro-Core-AS-5.0.0-JDK6
, Metro-Core-AS-5.0.1-JDK6
, Metro-Core-AS-5.1.0-JDK6
, Metro-Core-AS-6.0.0-JDK6
-, Metro-Binary-Distro-AS-4.2.3-JDK5
+
, Metro-Binary-Distro-AS-5.0.0-JDK5
, Metro-Binary-Distro-AS-5.0.1-JDK5
, Metro-Binary-Distro-AS-5.1.0-JDK5
, Metro-Binary-Distro-AS-6.0.0-JDK5
-, Metro-Binary-Distro-AS-4.2.3-JDK6
+
, Metro-Binary-Distro-AS-5.0.0-JDK6
, Metro-Binary-Distro-AS-5.0.1-JDK6
, Metro-Binary-Distro-AS-5.1.0-JDK6
Modified: framework/trunk/hudson/hudson-home/jobs/Native-ALL/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-ALL/config.xml 2009-04-20 09:31:15 UTC (rev 9842)
+++ framework/trunk/hudson/hudson-home/jobs/Native-ALL/config.xml 2009-04-20 09:56:06 UTC (rev 9843)
@@ -4,32 +4,31 @@
<publishers class="vector">
<hudson.tasks.BuildTrigger>
<childProjects>
- Native-Core-AS-4.2.3-JDK5
-, Native-Core-AS-5.0.0-JDK5
+ Native-Core-AS-5.0.0-JDK5
, Native-Core-AS-5.0.1-JDK5
, Native-Core-AS-5.1.0-JDK5
, Native-Core-AS-6.0.0-JDK5
-, Native-Core-AS-4.2.3-JDK6
+
, Native-Core-AS-5.0.0-JDK6
, Native-Core-AS-5.0.1-JDK6
, Native-Core-AS-5.1.0-JDK6
, Native-Core-AS-6.0.0-JDK6
-, Native-Binary-Distro-AS-4.2.3-JDK5
+
, Native-Binary-Distro-AS-5.0.0-JDK5
, Native-Binary-Distro-AS-5.0.1-JDK5
, Native-Binary-Distro-AS-5.1.0-JDK5
, Native-Binary-Distro-AS-6.0.0-JDK5
-, Native-Binary-Distro-AS-4.2.3-JDK6
+
, Native-Binary-Distro-AS-5.0.0-JDK6
, Native-Binary-Distro-AS-5.0.1-JDK6
, Native-Binary-Distro-AS-5.1.0-JDK6
, Native-Binary-Distro-AS-6.0.0-JDK6
-, Native-Source-Distro-AS-4.2.3-JDK5
+
, Native-Source-Distro-AS-5.0.0-JDK5
, Native-Source-Distro-AS-5.0.1-JDK5
, Native-Source-Distro-AS-5.1.0-JDK5
, Native-Source-Distro-AS-6.0.0-JDK5
-, Native-Source-Distro-AS-4.2.3-JDK6
+
, Native-Source-Distro-AS-5.0.0-JDK6
, Native-Source-Distro-AS-5.0.1-JDK6
, Native-Source-Distro-AS-5.1.0-JDK6
Modified: framework/trunk/hudson/hudson-home/jobs/Native-Light/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Native-Light/config.xml 2009-04-20 09:31:15 UTC (rev 9842)
+++ framework/trunk/hudson/hudson-home/jobs/Native-Light/config.xml 2009-04-20 09:56:06 UTC (rev 9843)
@@ -4,22 +4,21 @@
<publishers class="vector">
<hudson.tasks.BuildTrigger>
<childProjects>
- Native-Core-AS-4.2.3-JDK5
-, Native-Core-AS-5.0.0-JDK5
+ Native-Core-AS-5.0.0-JDK5
, Native-Core-AS-5.0.1-JDK5
, Native-Core-AS-5.1.0-JDK5
, Native-Core-AS-6.0.0-JDK5
-, Native-Core-AS-4.2.3-JDK6
+
, Native-Core-AS-5.0.0-JDK6
, Native-Core-AS-5.0.1-JDK6
, Native-Core-AS-5.1.0-JDK6
, Native-Core-AS-6.0.0-JDK6
-, Native-Binary-Distro-AS-4.2.3-JDK5
+
, Native-Binary-Distro-AS-5.0.0-JDK5
, Native-Binary-Distro-AS-5.0.1-JDK5
, Native-Binary-Distro-AS-5.1.0-JDK5
, Native-Binary-Distro-AS-6.0.0-JDK5
-, Native-Binary-Distro-AS-4.2.3-JDK6
+
, Native-Binary-Distro-AS-5.0.0-JDK6
, Native-Binary-Distro-AS-5.0.1-JDK6
, Native-Binary-Distro-AS-5.1.0-JDK6
Modified: framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2009-04-20 09:31:15 UTC (rev 9842)
+++ framework/trunk/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2009-04-20 09:56:06 UTC (rev 9843)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-4.2.3, AS-5.0.0, AS-5.0.1, AS-5.1.0, AS-6.0.0, AS-Tests-ALL</childProjects>
+ <childProjects>AS-5.0.0, AS-5.0.1, AS-5.1.0, AS-6.0.0, AS-Tests-ALL</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: framework/trunk/hudson/hudson-home/jobs/Weekend-Matrix/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Weekend-Matrix/config.xml 2009-04-20 09:31:15 UTC (rev 9842)
+++ framework/trunk/hudson/hudson-home/jobs/Weekend-Matrix/config.xml 2009-04-20 09:56:06 UTC (rev 9843)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-4.2.3, AS-5.0.0, AS-5.0.1, AS-5.1.0, AS-6.0.0, AS-Tests-ALL, Native-ALL, CXF-ALL, Metro-ALL</childProjects>
+ <childProjects>AS-5.0.0, AS-5.0.1, AS-5.1.0, AS-6.0.0, AS-Tests-ALL, Native-ALL, CXF-ALL, Metro-ALL</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: framework/trunk/hudson/hudson-home/jobs/Working-Days-Matrix/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Working-Days-Matrix/config.xml 2009-04-20 09:31:15 UTC (rev 9842)
+++ framework/trunk/hudson/hudson-home/jobs/Working-Days-Matrix/config.xml 2009-04-20 09:56:06 UTC (rev 9843)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-4.2.3, AS-5.0.0, AS-5.0.1, AS-5.1.0, AS-6.0.0, AS-Tests-ALL, Native-Light, CXF-Light, Metro-Light</childProjects>
+ <childProjects>AS-5.0.0, AS-5.0.1, AS-5.1.0, AS-6.0.0, AS-Tests-ALL, Native-Light, CXF-Light, Metro-Light</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2009-04-20 09:31:15 UTC (rev 9842)
+++ framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2009-04-20 09:56:06 UTC (rev 9843)
@@ -15,12 +15,6 @@
<target name="tests-prepare" depends="prepare">
<!-- Define jboss.home -->
- <condition property="jboss.home" value="${jboss423.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss423"/>
- </condition>
- <condition property="jboss.home" value="${jboss424.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss424"/>
- </condition>
<condition property="jboss.home" value="${jboss500.home}">
<equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
</condition>
@@ -114,7 +108,7 @@
</tstamp>
</target>
- <target name="tests-classpath" depends="tests-classpath-jboss60,tests-classpath-jboss51,tests-classpath-jboss50,tests-classpath-jboss42">
+ <target name="tests-classpath" depends="tests-classpath-jboss60,tests-classpath-jboss51,tests-classpath-jboss50">
<path id="tests.javac.classpath">
<path refid="ws.stack.classpath"/>
<path refid="tests.extra.classpath"/>
@@ -127,67 +121,6 @@
</path>
</target>
- <target name="tests-classpath-jboss42" depends="tests-prepare" if="jbossws.integration.jboss42">
-
- <path id="integration.target.javac.classpath">
- <pathelement location="${jboss.client}/activation.jar"/>
- <pathelement location="${jboss.client}/jaxb-api.jar"/>
- <pathelement location="${jboss.client}/jaxb-impl.jar"/>
- <pathelement location="${jboss.client}/jaxws-tools.jar"/>
- <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/>
- <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/>
- <pathelement location="${jboss.client}/jboss-common-client.jar"/>
- <pathelement location="${jboss.client}/jboss-ejb3x.jar"/>
- <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
- <pathelement location="${jboss.client}/jboss-j2ee.jar"/>
- <pathelement location="${jboss.client}/jboss-remoting.jar"/>
- <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
- <pathelement location="${jboss.client}/jbosssx-client.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}/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}/jaxb-api.jar"/>
- <pathelement location="${jboss.client}/jaxb-impl.jar"/>
- <pathelement location="${jboss.client}/jaxws-tools.jar"/>
- <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/>
- <pathelement location="${jboss.client}/commons-logging.jar"/>
- <pathelement location="${jboss.client}/javassist.jar"/>
- <pathelement location="${jboss.client}/jaxb-xjc.jar"/>
- <pathelement location="${jboss.client}/jaxws-tools.jar"/>
- <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/>
- <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/>
- <pathelement location="${jboss.client}/jboss-ejb3x.jar"/>
- <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
- <pathelement location="${jboss.client}/jboss-remoting.jar"/>
- <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
- <pathelement location="${jboss.client}/jbossws-jboss423.jar"/>
- <pathelement location="${jboss.client}/jbossws-jboss424.jar"/>
- <pathelement location="${jboss.client}/jbossall-client.jar"/>
- <pathelement location="${jboss.client}/log4j.jar"/>
- <pathelement location="${jboss.client}/mail.jar"/>
- <pathelement location="${jboss.client}/stax-api.jar"/>
- <!-- FIXME jars should be available in the client dir -->
- <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}"/>
- <!-- WS-RM backports server dependencies -->
- <pathelement location="${jboss.server.deploy}/jboss-web.deployer/jbossweb.jar"/>
- </path>
- </target>
-
<target name="tests-classpath-jboss50" depends="tests-prepare" if="jbossws.integration.jboss50">
<path id="integration.target.javac.classpath">
15 years, 5 months
- 1
- 0
JBossWS SVN: r9842 - in stack/native/trunk: modules/testsuite and 12 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-20 05:31:15 -0400 (Mon, 20 Apr 2009)
New Revision: 9842
Added:
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/META-INF/jboss-service.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/jboss-service.xml
Removed:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMAS5Endpoint.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAAS5Endpoint.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/jboss4x/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/jboss5x/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/jboss4x/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/jboss5x/
Modified:
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/jaxrpc/jbws723/JBWS723TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.java
stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt
stack/native/trunk/pom.xml
Log:
[JBWS-2612] removing AS 4x support
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 2009-04-20 08:18:56 UTC (rev 9841)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2009-04-20 09:31:15 UTC (rev 9842)
@@ -103,21 +103,12 @@
<include name="org/jboss/test/ws/jaxws/samples/dar/DarResponseMessageBean.class"/>
</fileset>
</jar>
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-dar-jms-client-as4.sar">
- <fileset dir="${tests.output.dir}/test-libs">
- <include name="jaxws-samples-dar-jms-client.war"/>
- <include name="jaxws-samples-dar-jms-client.jar"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/dar/jboss4x/META-INF">
- <include name="jboss-service.xml"/>
- </metainf>
- </jar>
<jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-dar-jms-client.sar">
<fileset dir="${tests.output.dir}/test-libs">
<include name="jaxws-samples-dar-jms-client.war"/>
<include name="jaxws-samples-dar-jms-client.jar"/>
</fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/dar/jboss5x/META-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/dar/META-INF">
<include name="jboss-service.xml"/>
</metainf>
</jar>
@@ -129,19 +120,11 @@
<include name="org/jboss/test/ws/jaxws/samples/jmstransport/OrganizationJMSEndpoint.class"/>
</fileset>
</jar>
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-jmstransport-as4.sar">
- <fileset dir="${tests.output.dir}/test-libs">
- <include name="jaxws-samples-jmstransport.jar"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/jboss4x/META-INF">
- <include name="jboss-service.xml"/>
- </metainf>
- </jar>
<jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-jmstransport.sar">
<fileset dir="${tests.output.dir}/test-libs">
<include name="jaxws-samples-jmstransport.jar"/>
</fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/jboss5x/META-INF">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/META-INF">
<include name="jboss-service.xml"/>
</metainf>
</jar>
@@ -196,27 +179,6 @@
<include name="wsse10.truststore"/>
</metainf>
</jar>
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-news-step2-newspaper-as5.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/samples/news/PressRelease.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/news/AbstractPressReleaseEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/news/SecurePressReleaseEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/news/NewspaperSWA.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/news/AbstractNewspaperSWAEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAAS5Endpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/news/NewspaperMTOM.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/news/AbstractNewspaperMTOMEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMAS5Endpoint.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/news/EditionSWA.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/news/EditionMTOM.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/news/jaxws-handlers-server.xml"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/news/META-INF">
- <include name="jboss-wsse-server.xml"/>
- <include name="bob-sign_enc.jks"/>
- <include name="wsse10.truststore"/>
- </metainf>
- </jar>
<jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-news-step2-agency-client.jar">
<fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/news/generated/agency/*.class"/>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java 2009-04-20 08:18:56 UTC (rev 9841)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java 2009-04-20 09:31:15 UTC (rev 9842)
@@ -165,10 +165,7 @@
{
stub._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-jbws723/ConfidentialSecured");
port.getContactInfo("mafia");
-
- if (isTargetJBoss5())
- System.out.println("FIXME [JBAS-3595] - Tomcat allows http access with transport guarantie CONFIDENTIAL");
- else fail("Security exception expected");
+ fail("Security exception expected");
}
catch (RemoteException ignore)
{
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2009-04-20 08:18:56 UTC (rev 9841)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2009-04-20 09:31:15 UTC (rev 9842)
@@ -147,9 +147,7 @@
stub._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-ejb/ConfidentialSecured");
port.getContactInfo("mafia");
- if (isTargetJBoss5())
- System.out.println("FIXME [JBAS-3595] - Tomcat allows http access with transport guarantie CONFIDENTIAL");
- else fail("Security exception expected");
+ fail("Security exception expected");
}
catch (RemoteException ignore)
{
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java 2009-04-20 08:18:56 UTC (rev 9841)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java 2009-04-20 09:31:15 UTC (rev 9842)
@@ -21,11 +21,8 @@
*/
package org.jboss.test.ws.jaxrpc.samples.wssecurity;
-import java.io.File;
import java.net.URL;
-import javax.naming.InitialContext;
import javax.xml.namespace.QName;
-import javax.xml.rpc.Service;
import javax.xml.rpc.Stub;
import junit.framework.Test;
@@ -50,30 +47,17 @@
return new JBossWSTestSetup(StorePassEncryptTestCase.class, "jaxrpc-samples-store-pass-encrypt.war, jaxrpc-samples-store-pass-encrypt-client.jar");
}
-
public void setUp() throws Exception
{
- if (port == null)
- {
- if (isTargetJBoss42())
- {
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService");
- port = (Hello)service.getPort(Hello.class);
- }
- else
- {
- ServiceFactoryImpl factory = new ServiceFactoryImpl();
- URL wsdlURL = getResourceURL("jaxrpc/samples/wssecurity/WEB-INF/wsdl/HelloService.wsdl");
- URL mappingURL = getResourceURL("jaxrpc/samples/wssecurity/WEB-INF/jaxrpc-mapping.xml");
- URL securityURL = getResourceURL("jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF/jboss-wsse-client.xml");
- QName qname = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService");
- ServiceImpl service = (ServiceImpl)factory.createService(wsdlURL, qname, mappingURL, securityURL);
- port = (Hello)service.getPort(Hello.class);
- ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-store-pass-encrypt");
- ((StubExt)port).setConfigName("Standard WSSecurity Client");
- }
- }
+ ServiceFactoryImpl factory = new ServiceFactoryImpl();
+ URL wsdlURL = getResourceURL("jaxrpc/samples/wssecurity/WEB-INF/wsdl/HelloService.wsdl");
+ URL mappingURL = getResourceURL("jaxrpc/samples/wssecurity/WEB-INF/jaxrpc-mapping.xml");
+ URL securityURL = getResourceURL("jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF/jboss-wsse-client.xml");
+ QName qname = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService");
+ ServiceImpl service = (ServiceImpl)factory.createService(wsdlURL, qname, mappingURL, securityURL);
+ port = (Hello)service.getPort(Hello.class);
+ ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-store-pass-encrypt");
+ ((StubExt)port).setConfigName("Standard WSSecurity Client");
}
public void testEndpoint() throws Exception
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2009-04-20 08:18:56 UTC (rev 9841)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2009-04-20 09:31:15 UTC (rev 9842)
@@ -29,7 +29,6 @@
import junit.framework.Test;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestHelper;
import org.jboss.wsf.test.JBossWSTestSetup;
import org.jboss.wsf.common.IOUtils;
@@ -73,15 +72,8 @@
// Maybe you should extend the Class-Path in the MANIFEST instead.
StringBuffer cp = new StringBuffer(System.getProperty("test.classes.directory"));
cp.append(PS + jbc + FS + "jbossws-native-client.jar");
- if (isTargetJBoss5OrGreater())
- {
- cp.append(PS + jbc + FS + "jboss-common-core.jar");
- cp.append(PS + jbc + FS + "jboss-logging-spi.jar");
- }
- else
- {
- cp.append(PS + jbc + FS + "jboss-common-client.jar");
- }
+ cp.append(PS + jbc + FS + "jboss-common-core.jar");
+ cp.append(PS + jbc + FS + "jboss-logging-spi.jar");
Runtime rt = Runtime.getRuntime();
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.java 2009-04-20 08:18:56 UTC (rev 9841)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.java 2009-04-20 09:31:15 UTC (rev 9842)
@@ -31,13 +31,9 @@
import junit.framework.Test;
-import org.jboss.wsf.common.DOMUtils;
import org.jboss.wsf.common.ObjectNameFactory;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestHelper;
import org.jboss.wsf.test.JBossWSTestSetup;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
/**
* Invokes the DAR JMS client
@@ -51,8 +47,7 @@
public static Test suite()
{
- String suffix = new JBossWSTestHelper().isTargetJBoss4() ? "-as4" : "";
- return new JBossWSTestSetup(JMSClientTestCase.class, "jaxws-samples-dar-jms-client" + suffix + ".sar,jaxws-samples-dar-jms.jar");
+ return new JBossWSTestSetup(JMSClientTestCase.class, "jaxws-samples-dar-jms-client.sar,jaxws-samples-dar-jms.jar");
}
public void test() throws Exception
@@ -82,26 +77,7 @@
private int getMessageCount(String queue) throws Exception
{
ObjectName oname = ObjectNameFactory.create("jboss.mq.destination:service=Queue,name=" + queue);
- if (isTargetJBoss5OrGreater())
- {
- return (Integer)getServer().getAttribute(oname, "MessageCount");
- }
- else
- {
- String result = (String)getServer().invoke(oname, "listMessageCounter", null, null);
- Element table = DOMUtils.parse(result);
- NodeList ths = table.getFirstChild().getChildNodes();
- int p = -1;
- for (int i=0; i<ths.getLength(); i++)
- {
- if (ths.item(i).getTextContent().equalsIgnoreCase("Count"))
- p = i;
- }
- if (p == -1)
- throw new Exception("Cannot read the queue message count!");
- String count = table.getLastChild().getChildNodes().item(p).getTextContent();
- return Integer.parseInt(count);
- }
+ return (Integer)getServer().getAttribute(oname, "MessageCount");
}
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2009-04-20 08:18:56 UTC (rev 9841)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2009-04-20 09:31:15 UTC (rev 9842)
@@ -38,7 +38,6 @@
import javax.xml.ws.Service;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestHelper;
import org.jboss.wsf.test.JBossWSTestSetup;
import org.jboss.wsf.common.DOMUtils;
@@ -56,8 +55,7 @@
public static Test suite() throws Exception
{
- String suffix = new JBossWSTestHelper().isTargetJBoss4() ? "-as4" : "";
- return new JBossWSTestSetup(JMSTransportTestCase.class, "jaxws-samples-jmstransport" + suffix + ".sar");
+ return new JBossWSTestSetup(JMSTransportTestCase.class, "jaxws-samples-jmstransport.sar");
}
public void testJMSEndpointPort() throws Exception
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java 2009-04-20 08:18:56 UTC (rev 9841)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java 2009-04-20 09:31:15 UTC (rev 9842)
@@ -24,7 +24,6 @@
import java.net.URL;
import junit.framework.Test;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestHelper;
import org.jboss.wsf.test.JBossWSTestSetup;
/**
@@ -39,11 +38,10 @@
{
public static Test suite()
{
- String newspaperJar = new JBossWSTestHelper().isTargetJBoss5OrGreater() ? "jaxws-samples-news-step2-newspaper-as5.jar" : "jaxws-samples-news-step2-newspaper.jar";
return new JBossWSTestSetup
(
SecureNewsTestCase.class,
- newspaperJar + ", jaxws-samples-news-step2-agency-client.jar"
+ "jaxws-samples-news-step2-newspaper.jar, jaxws-samples-news-step2-agency-client.jar"
);
}
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMAS5Endpoint.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMAS5Endpoint.java 2009-04-20 08:18:56 UTC (rev 9841)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMAS5Endpoint.java 2009-04-20 09:31:15 UTC (rev 9842)
@@ -1,60 +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.test.ws.jaxws.samples.news;
-
-import javax.ejb.Stateless;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.ws.BindingType;
-
-import org.jboss.ejb3.annotation.SecurityDomain;
-import org.jboss.wsf.spi.annotation.AuthMethod;
-import org.jboss.wsf.spi.annotation.TransportGuarantee;
-import org.jboss.wsf.spi.annotation.WebContext;
-
-@Stateless
-@SecurityDomain("JBossWS")
-@SOAPBinding
-(
- style = SOAPBinding.Style.RPC,
- use = SOAPBinding.Use.LITERAL
-)
-@WebService
-(
- name = "NewspaperMTOMEndpoint",
- serviceName = "NewspaperMTOMService",
- targetNamespace = "http://org.jboss.ws/samples/news",
- endpointInterface = "org.jboss.test.ws.jaxws.samples.news.NewspaperMTOM"
-)
-@WebContext
-(
- contextRoot = "/news",
- urlPattern = "/newspaper/mtom",
- authMethod = AuthMethod.BASIC,
- transportGuarantee = TransportGuarantee.CONFIDENTIAL,
- secureWSDLAccess = false
-)
-@BindingType(value = "http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true")
-public class SecureNewspaperMTOMAS5Endpoint extends AbstractNewspaperMTOMEndpoint implements NewspaperMTOM
-{
-
-}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.java 2009-04-20 08:18:56 UTC (rev 9841)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.java 2009-04-20 09:31:15 UTC (rev 9842)
@@ -26,7 +26,7 @@
import javax.jws.soap.SOAPBinding;
import javax.xml.ws.BindingType;
-import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.wsf.spi.annotation.AuthMethod;
import org.jboss.wsf.spi.annotation.TransportGuarantee;
import org.jboss.wsf.spi.annotation.WebContext;
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAAS5Endpoint.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAAS5Endpoint.java 2009-04-20 08:18:56 UTC (rev 9841)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAAS5Endpoint.java 2009-04-20 09:31:15 UTC (rev 9842)
@@ -1,58 +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.test.ws.jaxws.samples.news;
-
-import javax.ejb.Stateless;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-import org.jboss.wsf.spi.annotation.AuthMethod;
-import org.jboss.wsf.spi.annotation.TransportGuarantee;
-import org.jboss.wsf.spi.annotation.WebContext;
-import org.jboss.ejb3.annotation.SecurityDomain;
-
-@Stateless
-@SecurityDomain("JBossWS")
-@SOAPBinding
-(
- style = SOAPBinding.Style.RPC,
- use = SOAPBinding.Use.LITERAL
-)
-@WebService
-(
- name = "NewspaperSWAEndpoint",
- serviceName = "NewspaperSWAService",
- targetNamespace = "http://org.jboss.ws/samples/news",
- endpointInterface = "org.jboss.test.ws.jaxws.samples.news.NewspaperSWA"
-)
-@WebContext
-(
- contextRoot = "/news",
- urlPattern = "/newspaper/swa",
- authMethod = AuthMethod.BASIC,
- transportGuarantee = TransportGuarantee.CONFIDENTIAL,
- secureWSDLAccess = false
-)
-public class SecureNewspaperSWAAS5Endpoint extends AbstractNewspaperSWAEndpoint implements NewspaperSWA
-{
-
-}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.java 2009-04-20 08:18:56 UTC (rev 9841)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.java 2009-04-20 09:31:15 UTC (rev 9842)
@@ -28,7 +28,7 @@
import org.jboss.wsf.spi.annotation.AuthMethod;
import org.jboss.wsf.spi.annotation.TransportGuarantee;
import org.jboss.wsf.spi.annotation.WebContext;
-import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.annotation.SecurityDomain;
@Stateless
@SecurityDomain("JBossWS")
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/META-INF/jboss-service.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/META-INF/jboss-service.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/META-INF/jboss-service.xml 2009-04-20 09:31:15 UTC (rev 9842)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+ <mbean code="org.jboss.mq.server.jmx.Queue" name="jboss.mq.destination:service=Queue,name=DarRequestQueue">
+ <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+ </mbean>
+ <mbean code="org.jboss.mq.server.jmx.Queue" name="jboss.mq.destination:service=Queue,name=DarResponseQueue">
+ <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+ </mbean>
+</server>
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/jboss-service.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/jboss-service.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/jboss-service.xml 2009-04-20 09:31:15 UTC (rev 9842)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+ <mbean code="org.jboss.mq.server.jmx.Queue" name="jboss.mq.destination:service=Queue,name=RequestQueue">
+ <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+ </mbean>
+ <mbean code="org.jboss.mq.server.jmx.Queue" name="jboss.mq.destination:service=Queue,name=ResponseQueue">
+ <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+ </mbean>
+</server>
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-04-20 08:18:56 UTC (rev 9841)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-04-20 09:31:15 UTC (rev 9842)
@@ -1,8 +1,3 @@
-# Exclude endpoints with AS42 @SecurityDomain
-org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.*
-org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.*
-org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.*
-
# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-04-20 08:18:56 UTC (rev 9841)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-04-20 09:31:15 UTC (rev 9842)
@@ -1,8 +1,3 @@
-# Exclude endpoints with AS42 @SecurityDomain
-org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.*
-org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.*
-org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.*
-
# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-04-20 08:18:56 UTC (rev 9841)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-04-20 09:31:15 UTC (rev 9842)
@@ -1,8 +1,3 @@
-# Exclude endpoints with AS42 @SecurityDomain
-org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.*
-org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.*
-org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.*
-
# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-04-20 08:18:56 UTC (rev 9841)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-04-20 09:31:15 UTC (rev 9842)
@@ -1,8 +1,3 @@
-# Exclude endpoints with AS42 @SecurityDomain
-org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.*
-org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.*
-org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.*
-
# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration
org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2009-04-20 08:18:56 UTC (rev 9841)
+++ stack/native/trunk/pom.xml 2009-04-20 09:31:15 UTC (rev 9842)
@@ -47,7 +47,7 @@
<!-- Properties -->
<properties>
- <jbossws.common.version>1.0.10.GA</jbossws.common.version>
+ <jbossws.common.version>1.0.11-SNAPSHOT</jbossws.common.version>
<jbossws.framework.version>3.2.0-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.1.1.GA</jbossws.spi.version>
<jbossws.jboss423.version>3.1.1.GA</jbossws.jboss423.version>
15 years, 5 months
- 1
- 0
JBossWS SVN: r9841 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-20 04:18:56 -0400 (Mon, 20 Apr 2009)
New Revision: 9841
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[JBWS-2612] removing AS 4x support
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-04-20 08:11:52 UTC (rev 9840)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-04-20 08:18:56 UTC (rev 9841)
@@ -1,6 +1,3 @@
-# Exclude endpoints with AS42 @SecurityDomain
-org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.*
-
# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope
org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*
org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-04-20 08:11:52 UTC (rev 9840)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-04-20 08:18:56 UTC (rev 9841)
@@ -1,6 +1,3 @@
-# Exclude endpoints with AS42 @SecurityDomain
-org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.*
-
# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope
org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*
org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-04-20 08:11:52 UTC (rev 9840)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-04-20 08:18:56 UTC (rev 9841)
@@ -1,6 +1,3 @@
-# Exclude endpoints with AS42 @SecurityDomain
-org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.*
-
# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope
org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*
org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-04-20 08:11:52 UTC (rev 9840)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-04-20 08:18:56 UTC (rev 9841)
@@ -1,6 +1,3 @@
-# Exclude endpoints with AS42 @SecurityDomain
-org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.*
-
# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope
org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*
org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*
15 years, 5 months
- 1
- 0
JBossWS SVN: r9840 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-20 04:11:52 -0400 (Mon, 20 Apr 2009)
New Revision: 9840
Modified:
stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[JBWS-2612] removing AS 4x support
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-04-20 08:04:20 UTC (rev 9839)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-04-20 08:11:52 UTC (rev 9840)
@@ -1,6 +1,3 @@
-# Exclude endpoints with AS42 @SecurityDomain
-org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.*
-
# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-04-20 08:04:20 UTC (rev 9839)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-04-20 08:11:52 UTC (rev 9840)
@@ -1,6 +1,3 @@
-# Exclude endpoints with AS42 @SecurityDomain
-org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.*
-
# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-04-20 08:04:20 UTC (rev 9839)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-04-20 08:11:52 UTC (rev 9840)
@@ -1,6 +1,3 @@
-# Exclude endpoints with AS42 @SecurityDomain
-org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.*
-
# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-04-20 08:04:20 UTC (rev 9839)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-04-20 08:11:52 UTC (rev 9840)
@@ -1,6 +1,3 @@
-# Exclude endpoints with AS42 @SecurityDomain
-org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.*
-
# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
15 years, 5 months
- 1
- 0