August 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r4137 - in trunk: integration/xfire/src/main/java/org/jboss/wsf/stack/xfire and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-03 04:46:08 -0400 (Fri, 03 Aug 2007) New Revision: 4137 Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/MetroServerConfig.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/MetroServerConfigMBean.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/CXFServerConfig.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/CXFServerConfigMBean.java trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/NativeServerConfig.java trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/NativeServerConfigMBean.java Log: Resolve dependency on framework.jar Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/MetroServerConfig.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/MetroServerConfig.java 2007-08-03 08:30:50 UTC (rev 4136) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/MetroServerConfig.java 2007-08-03 08:46:08 UTC (rev 4137) @@ -24,7 +24,7 @@ //$Id: DefaultServerConfig.java 4023 2007-07-28 07:14:06Z thomas.diesler(a)jboss.com $ import org.jboss.logging.Logger; -import org.jboss.wsf.framework.management.DefaultServerConfig; +import org.jboss.wsf.common.management.DefaultServerConfig; /** * Basic implementation of a ServerConfig Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/MetroServerConfigMBean.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/MetroServerConfigMBean.java 2007-08-03 08:30:50 UTC (rev 4136) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/MetroServerConfigMBean.java 2007-08-03 08:46:08 UTC (rev 4137) @@ -23,7 +23,7 @@ //$Id: DefaultServerConfig.java 4023 2007-07-28 07:14:06Z thomas.diesler(a)jboss.com $ -import org.jboss.wsf.framework.management.DefaultServerConfigMBean; +import org.jboss.wsf.common.management.DefaultServerConfigMBean; /** * Basic implementation of a ServerConfig Modified: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/CXFServerConfig.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/CXFServerConfig.java 2007-08-03 08:30:50 UTC (rev 4136) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/CXFServerConfig.java 2007-08-03 08:46:08 UTC (rev 4137) @@ -24,7 +24,7 @@ //$Id: DefaultServerConfig.java 4023 2007-07-28 07:14:06Z thomas.diesler(a)jboss.com $ import org.jboss.logging.Logger; -import org.jboss.wsf.framework.management.DefaultServerConfig; +import org.jboss.wsf.common.management.DefaultServerConfig; /** * Basic implementation of a ServerConfig Modified: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/CXFServerConfigMBean.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/CXFServerConfigMBean.java 2007-08-03 08:30:50 UTC (rev 4136) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/CXFServerConfigMBean.java 2007-08-03 08:46:08 UTC (rev 4137) @@ -23,7 +23,7 @@ //$Id: DefaultServerConfig.java 4023 2007-07-28 07:14:06Z thomas.diesler(a)jboss.com $ -import org.jboss.wsf.framework.management.DefaultServerConfigMBean; +import org.jboss.wsf.common.management.DefaultServerConfigMBean; /** * Basic implementation of a ServerConfig Modified: trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/NativeServerConfig.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/NativeServerConfig.java 2007-08-03 08:30:50 UTC (rev 4136) +++ trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/NativeServerConfig.java 2007-08-03 08:46:08 UTC (rev 4137) @@ -24,7 +24,7 @@ //$Id: DefaultServerConfig.java 4023 2007-07-28 07:14:06Z thomas.diesler(a)jboss.com $ import org.jboss.logging.Logger; -import org.jboss.wsf.framework.management.DefaultServerConfig; +import org.jboss.wsf.common.management.DefaultServerConfig; /** * Basic implementation of a ServerConfig Modified: trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/NativeServerConfigMBean.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/NativeServerConfigMBean.java 2007-08-03 08:30:50 UTC (rev 4136) +++ trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/NativeServerConfigMBean.java 2007-08-03 08:46:08 UTC (rev 4137) @@ -23,7 +23,7 @@ //$Id: DefaultServerConfig.java 4023 2007-07-28 07:14:06Z thomas.diesler(a)jboss.com $ -import org.jboss.wsf.framework.management.DefaultServerConfigMBean; +import org.jboss.wsf.common.management.DefaultServerConfigMBean; /** * Basic implementation of a ServerConfig

18 years, 8 months

1
0
0 / 0

JBossWS SVN: r4136 - common/trunk/ant-import and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-03 04:30:50 -0400 (Fri, 03 Aug 2007) New Revision: 4136 Added: common/trunk/src/main/java/org/jboss/wsf/common/management/ common/trunk/src/main/java/org/jboss/wsf/common/management/DefaultServerConfig.java common/trunk/src/main/java/org/jboss/wsf/common/management/DefaultServerConfigMBean.java Removed: framework/trunk/ant-import/macros-deploy-wsf.xml framework/trunk/src/main/java/org/jboss/wsf/framework/management/DefaultServerConfig.java framework/trunk/src/main/java/org/jboss/wsf/framework/management/DefaultServerConfigMBean.java Modified: common/trunk/.classpath common/trunk/ant-import/build-thirdparty.xml common/trunk/version.properties framework/trunk/.classpath Log: Remove dependency on jbossws-framework.jar Modified: common/trunk/.classpath =================================================================== --- common/trunk/.classpath 2007-08-03 08:30:19 UTC (rev 4135) +++ common/trunk/.classpath 2007-08-03 08:30:50 UTC (rev 4136) @@ -7,7 +7,6 @@ <classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/> <classpathentry kind="lib" path="thirdparty/jaxrpc-api.jar"/> <classpathentry kind="lib" path="thirdparty/jaxws-api.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-logging-log4j.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-logging-spi.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-microcontainer.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-common-core.jar"/> Modified: common/trunk/ant-import/build-thirdparty.xml =================================================================== --- common/trunk/ant-import/build-thirdparty.xml 2007-08-03 08:30:19 UTC (rev 4135) +++ common/trunk/ant-import/build-thirdparty.xml 2007-08-03 08:30:50 UTC (rev 4136) @@ -41,13 +41,12 @@ <get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency-src.zip" dest="${thirdparty.dir}/jboss-dependency-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip" dest="${thirdparty.dir}/jboss-microcontainer-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/> Copied: common/trunk/src/main/java/org/jboss/wsf/common/management/DefaultServerConfig.java (from rev 4128, framework/trunk/src/main/java/org/jboss/wsf/framework/management/DefaultServerConfig.java) =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/management/DefaultServerConfig.java (rev 0) +++ common/trunk/src/main/java/org/jboss/wsf/common/management/DefaultServerConfig.java 2007-08-03 08:30:50 UTC (rev 4136) @@ -0,0 +1,226 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.common.management; + +//$Id$ + +import java.io.File; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.Set; + +import javax.management.AttributeNotFoundException; +import javax.management.JMException; +import javax.management.MBeanServer; +import javax.management.ObjectName; + +import org.jboss.logging.Logger; +import org.jboss.wsf.common.ObjectNameFactory; +import org.jboss.wsf.spi.management.ServerConfig; + +/** + * Basic implementation of a ServerConfig + * + * @author Thomas.Diesler(a)jboss.org + * @author darran.lofthouse(a)jboss.com + * @since 08-May-2006 + */ +public class DefaultServerConfig implements DefaultServerConfigMBean, ServerConfig +{ + private static final Logger log = Logger.getLogger(DefaultServerConfig.class); + + // The MBeanServer + private MBeanServer mbeanServer; + // The webservice host name that will be used when updating the wsdl + private String webServiceHost = UNDEFINED_HOSTNAME; + // The webservice port that will be used when updating the wsdl + private int webServicePort; + // The webservice port that will be used when updating the wsdl + private int webServiceSecurePort; + // Whether we should always modify the soap address to the deployed endpoing location + private boolean modifySOAPAddress; + + public MBeanServer getMbeanServer() + { + return mbeanServer; + } + + public void setMbeanServer(MBeanServer mbeanServer) + { + this.mbeanServer = mbeanServer; + } + + public String getWebServiceHost() + { + return webServiceHost; + } + + public void setWebServiceHost(String host) throws UnknownHostException + { + if (host == null || host.trim().length() == 0) + { + log.debug("Using undefined host: " + UNDEFINED_HOSTNAME); + host = UNDEFINED_HOSTNAME; + } + if ("0.0.0.0".equals(host)) + { + InetAddress localHost = InetAddress.getLocalHost(); + log.debug("Using local host: " + localHost.getHostName()); + host = localHost.getHostName(); + } + this.webServiceHost = host; + } + + public void setWebServicePort(int port) + { + this.webServicePort = port; + } + + public void setWebServiceSecurePort(int port) + { + this.webServiceSecurePort = port; + } + + public boolean isModifySOAPAddress() + { + return modifySOAPAddress; + } + + public void setModifySOAPAddress(boolean modify) + { + this.modifySOAPAddress = modify; + } + + public File getServerTempDir() + { + try + { + ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig"); + File tmpdir = (File)getMbeanServer().getAttribute(oname, "ServerTempDir"); + return tmpdir; + } + catch (JMException e) + { + return null; + } + } + + public File getServerDataDir() + { + try + { + ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig"); + File tmpdir = (File)getMbeanServer().getAttribute(oname, "ServerDataDir"); + return tmpdir; + } + catch (JMException e) + { + return null; + } + } + + public int getWebServicePort() + { + if (webServicePort <= 0) + webServicePort = getConnectorPort("HTTP/1.1", false); + + int localPort = webServicePort; + if (localPort <= 0) + { + // Do not initialize webServicePort with the default, the connector port may become available later + log.warn("Unable to calculate 'WebServicePort', using default '8080'"); + localPort = 8080; + } + + return localPort; + } + + public int getWebServiceSecurePort() + { + if (webServiceSecurePort <= 0) + webServiceSecurePort = getConnectorPort("HTTP/1.1", true); + + int localPort = webServiceSecurePort; + if (localPort <= 0) + { + // Do not initialize webServiceSecurePort with the default, the connector port may become available later + log.warn("Unable to calculate 'WebServiceSecurePort', using default '8443'"); + localPort = 8443; + } + + return localPort; + } + + public void create() throws Exception + { + getMbeanServer().registerMBean(this, DefaultServerConfigMBean.OBJECT_NAME); + } + + public void destroy() throws Exception + { + getMbeanServer().unregisterMBean(DefaultServerConfigMBean.OBJECT_NAME); + } + + private int getConnectorPort(final String protocol, final boolean secure) + { + int port = -1; + + try + { + ObjectName connectors = new ObjectName("jboss.web:type=Connector,*"); + + Set connectorNames = getMbeanServer().queryNames(connectors, null); + for (Object current : connectorNames) + { + ObjectName currentName = (ObjectName)current; + + try + { + int connectorPort = (Integer)getMbeanServer().getAttribute(currentName, "port"); + boolean connectorSecure = (Boolean)getMbeanServer().getAttribute(currentName, "secure"); + String connectorProtocol = (String)getMbeanServer().getAttribute(currentName, "protocol"); + + if (protocol.equals(connectorProtocol) && secure == connectorSecure) + { + if (port > -1) + { + log.warn("Found multiple connectors for protocol='" + protocol + "' and secure='" + secure + "', using first port found '" + port + "'"); + } + else + { + port = connectorPort; + } + } + } + catch (AttributeNotFoundException ignored) + { + } + } + + return port; + } + catch (JMException e) + { + return -1; + } + } +} Copied: common/trunk/src/main/java/org/jboss/wsf/common/management/DefaultServerConfigMBean.java (from rev 4128, framework/trunk/src/main/java/org/jboss/wsf/framework/management/DefaultServerConfigMBean.java) =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/management/DefaultServerConfigMBean.java (rev 0) +++ common/trunk/src/main/java/org/jboss/wsf/common/management/DefaultServerConfigMBean.java 2007-08-03 08:30:50 UTC (rev 4136) @@ -0,0 +1,33 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.common.management; + +import javax.management.ObjectName; + +import org.jboss.wsf.common.ObjectNameFactory; +import org.jboss.wsf.spi.management.ServerConfig; + +public interface DefaultServerConfigMBean extends ServerConfig +{ + /** The object name in the MBean server */ + ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=ServerConfig"); +} Modified: common/trunk/version.properties =================================================================== --- common/trunk/version.properties 2007-08-03 08:30:19 UTC (rev 4135) +++ common/trunk/version.properties 2007-08-03 08:30:50 UTC (rev 4136) @@ -14,12 +14,11 @@ implementation.vendor.id=http://www.jboss.org # Thirdparty library versions +jbossws-spi=2.0.1.CR1 + jboss-common-core=2.0.2.GA -jboss-common-logging-log4j=2.0.2.GA jboss-common-logging-spi=2.0.2.GA jboss-microcontainer=2.0.0.Beta3 -jbossws-common=2.0.1.CR1 -jbossws-spi=2.0.1.CR1 sun-jaf=1.1 sun-jaxb=2.1.4 sun-jaxrpc=1.1 Modified: framework/trunk/.classpath =================================================================== --- framework/trunk/.classpath 2007-08-03 08:30:19 UTC (rev 4135) +++ framework/trunk/.classpath 2007-08-03 08:30:50 UTC (rev 4136) @@ -4,25 +4,14 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/> <classpathentry kind="lib" path="thirdparty/jboss-common-core.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-container.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-dependency.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-deployers.jar" sourcepath="thirdparty/jboss-deployers-src.zip"/> - <classpathentry kind="lib" path="thirdparty/jboss-logging-log4j.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-logging-spi.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-microcontainer.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-xml-binding.jar"/> <classpathentry kind="lib" path="thirdparty/jaxws-api.jar"/> <classpathentry kind="lib" path="thirdparty/jsr181-api.jar"/> - <classpathentry kind="lib" path="thirdparty/servlet-api.jar"/> - <classpathentry kind="lib" path="thirdparty/junit.jar"/> - <classpathentry kind="lib" path="thirdparty/activation.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-javaee.jar"/> <classpathentry kind="lib" path="thirdparty/jaxrpc-api.jar"/> <classpathentry kind="lib" path="thirdparty/dom4j.jar"/> - <classpathentry kind="lib" path="thirdparty/ant.jar"/> - <classpathentry kind="lib" path="thirdparty/getopt.jar"/> <classpathentry kind="lib" path="thirdparty/saaj-api.jar"/> - <classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/spi"/> <classpathentry combineaccessrules="false" kind="src" path="/common"/> <classpathentry kind="output" path="output/eclipse"/> Deleted: framework/trunk/ant-import/macros-deploy-wsf.xml =================================================================== --- framework/trunk/ant-import/macros-deploy-wsf.xml 2007-08-03 08:30:19 UTC (rev 4135) +++ framework/trunk/ant-import/macros-deploy-wsf.xml 2007-08-03 08:30:50 UTC (rev 4136) @@ -1,79 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project> - - <macrodef name="macro-deploy-wsf"> - <attribute name="wsflibs"/> - <attribute name="thirdpartylibs"/> - <attribute name="jbosshome"/> - <sequential> - -  - <unzip dest="@{jbosshome}/bin" src="@{wsflibs}/jbossws-framework-scripts.zip"/> - <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/> - -  - <copy todir="@{jbosshome}/client"> - <fileset dir="@{wsflibs}"> - <include name="jbossws-framework.jar"/> - </fileset> - <fileset dir="@{thirdpartylibs}"> - <include name="jbossws-common.jar"/> - <include name="jbossws-spi.jar"/> - <include name="wsdl4j.jar"/> - </fileset> - </copy> - -  - <copy todir="@{jbosshome}/server/${jboss.server.instance}/lib"> - <fileset dir="@{wsflibs}"> - <include name="jbossws-framework.jar"/> - </fileset> - <fileset dir="@{thirdpartylibs}"> - <include name="jbossws-common.jar"/> - <include name="jbossws-spi.jar"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <macrodef name="macro-undeploy-wsf"> - <attribute name="jbosshome"/> - <sequential> - <delete> -  - <fileset dir="@{jbosshome}/bin"> - <include name="wsconsume.*"/> - <include name="wsprovide.*"/> - </fileset> - -  - <fileset dir="@{jbosshome}/client"> - <include name="jbossws-common.jar"/> - <include name="jbossws-framework.jar"/> - <include name="jbossws-spi.jar"/> - <include name="wsdl4j.jar"/> - </fileset> - -  - <fileset dir="@{jbosshome}/server/${jboss.server.instance}/lib"> - <include name="jbossws-common.jar"/> - <include name="jbossws-framework.jar"/> - <include name="jbossws-spi.jar"/> - </fileset> - </delete> - </sequential> - </macrodef> - -</project> \ No newline at end of file Deleted: framework/trunk/src/main/java/org/jboss/wsf/framework/management/DefaultServerConfig.java =================================================================== --- framework/trunk/src/main/java/org/jboss/wsf/framework/management/DefaultServerConfig.java 2007-08-03 08:30:19 UTC (rev 4135) +++ framework/trunk/src/main/java/org/jboss/wsf/framework/management/DefaultServerConfig.java 2007-08-03 08:30:50 UTC (rev 4136) @@ -1,226 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.framework.management; - -//$Id$ - -import java.io.File; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.Set; - -import javax.management.AttributeNotFoundException; -import javax.management.JMException; -import javax.management.MBeanServer; -import javax.management.ObjectName; - -import org.jboss.logging.Logger; -import org.jboss.wsf.common.ObjectNameFactory; -import org.jboss.wsf.spi.management.ServerConfig; - -/** - * Basic implementation of a ServerConfig - * - * @author Thomas.Diesler(a)jboss.org - * @author darran.lofthouse(a)jboss.com - * @since 08-May-2006 - */ -public class DefaultServerConfig implements DefaultServerConfigMBean, ServerConfig -{ - private static final Logger log = Logger.getLogger(DefaultServerConfig.class); - - // The MBeanServer - private MBeanServer mbeanServer; - // The webservice host name that will be used when updating the wsdl - private String webServiceHost = UNDEFINED_HOSTNAME; - // The webservice port that will be used when updating the wsdl - private int webServicePort; - // The webservice port that will be used when updating the wsdl - private int webServiceSecurePort; - // Whether we should always modify the soap address to the deployed endpoing location - private boolean modifySOAPAddress; - - public MBeanServer getMbeanServer() - { - return mbeanServer; - } - - public void setMbeanServer(MBeanServer mbeanServer) - { - this.mbeanServer = mbeanServer; - } - - public String getWebServiceHost() - { - return webServiceHost; - } - - public void setWebServiceHost(String host) throws UnknownHostException - { - if (host == null || host.trim().length() == 0) - { - log.debug("Using undefined host: " + UNDEFINED_HOSTNAME); - host = UNDEFINED_HOSTNAME; - } - if ("0.0.0.0".equals(host)) - { - InetAddress localHost = InetAddress.getLocalHost(); - log.debug("Using local host: " + localHost.getHostName()); - host = localHost.getHostName(); - } - this.webServiceHost = host; - } - - public void setWebServicePort(int port) - { - this.webServicePort = port; - } - - public void setWebServiceSecurePort(int port) - { - this.webServiceSecurePort = port; - } - - public boolean isModifySOAPAddress() - { - return modifySOAPAddress; - } - - public void setModifySOAPAddress(boolean modify) - { - this.modifySOAPAddress = modify; - } - - public File getServerTempDir() - { - try - { - ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig"); - File tmpdir = (File)getMbeanServer().getAttribute(oname, "ServerTempDir"); - return tmpdir; - } - catch (JMException e) - { - return null; - } - } - - public File getServerDataDir() - { - try - { - ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig"); - File tmpdir = (File)getMbeanServer().getAttribute(oname, "ServerDataDir"); - return tmpdir; - } - catch (JMException e) - { - return null; - } - } - - public int getWebServicePort() - { - if (webServicePort <= 0) - webServicePort = getConnectorPort("HTTP/1.1", false); - - int localPort = webServicePort; - if (localPort <= 0) - { - // Do not initialize webServicePort with the default, the connector port may become available later - log.warn("Unable to calculate 'WebServicePort', using default '8080'"); - localPort = 8080; - } - - return localPort; - } - - public int getWebServiceSecurePort() - { - if (webServiceSecurePort <= 0) - webServiceSecurePort = getConnectorPort("HTTP/1.1", true); - - int localPort = webServiceSecurePort; - if (localPort <= 0) - { - // Do not initialize webServiceSecurePort with the default, the connector port may become available later - log.warn("Unable to calculate 'WebServiceSecurePort', using default '8443'"); - localPort = 8443; - } - - return localPort; - } - - public void create() throws Exception - { - getMbeanServer().registerMBean(this, DefaultServerConfigMBean.OBJECT_NAME); - } - - public void destroy() throws Exception - { - getMbeanServer().unregisterMBean(DefaultServerConfigMBean.OBJECT_NAME); - } - - private int getConnectorPort(final String protocol, final boolean secure) - { - int port = -1; - - try - { - ObjectName connectors = new ObjectName("jboss.web:type=Connector,*"); - - Set connectorNames = getMbeanServer().queryNames(connectors, null); - for (Object current : connectorNames) - { - ObjectName currentName = (ObjectName)current; - - try - { - int connectorPort = (Integer)getMbeanServer().getAttribute(currentName, "port"); - boolean connectorSecure = (Boolean)getMbeanServer().getAttribute(currentName, "secure"); - String connectorProtocol = (String)getMbeanServer().getAttribute(currentName, "protocol"); - - if (protocol.equals(connectorProtocol) && secure == connectorSecure) - { - if (port > -1) - { - log.warn("Found multiple connectors for protocol='" + protocol + "' and secure='" + secure + "', using first port found '" + port + "'"); - } - else - { - port = connectorPort; - } - } - } - catch (AttributeNotFoundException ignored) - { - } - } - - return port; - } - catch (JMException e) - { - return -1; - } - } -} Deleted: framework/trunk/src/main/java/org/jboss/wsf/framework/management/DefaultServerConfigMBean.java =================================================================== --- framework/trunk/src/main/java/org/jboss/wsf/framework/management/DefaultServerConfigMBean.java 2007-08-03 08:30:19 UTC (rev 4135) +++ framework/trunk/src/main/java/org/jboss/wsf/framework/management/DefaultServerConfigMBean.java 2007-08-03 08:30:50 UTC (rev 4136) @@ -1,33 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.framework.management; - -import javax.management.ObjectName; - -import org.jboss.wsf.common.ObjectNameFactory; -import org.jboss.wsf.spi.management.ServerConfig; - -public interface DefaultServerConfigMBean extends ServerConfig -{ - /** The object name in the MBean server */ - ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=ServerConfig"); -}

18 years, 8 months

1
0
0 / 0

JBossWS SVN: r4135 - trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-08-03 04:30:19 -0400 (Fri, 03 Aug 2007) New Revision: 4135 Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java Log: Fix smoke/tools tests Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2007-08-03 08:29:27 UTC (rev 4134) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2007-08-03 08:30:19 UTC (rev 4135) @@ -77,7 +77,7 @@ public void testBindingFiles() throws Exception { List<File> files = new ArrayList<File>(); - files.add( new File("resources/jaxws/spi/tools/wsdl/async-binding.xml") ); + files.add( new File("resources/jaxws/smoke/tools/wsdl/async-binding.xml") ); consumer.setBindingFiles(files); consumer.setTargetPackage("org.jboss.test.ws.tools.testBindingFiles"); @@ -113,7 +113,7 @@ consumer.setCatalog( new File("resources/jaxws/spi/tools/wsdl/jax-ws-catalog.xml") ); consumer.setGenerateSource(true); consumer.setOutputDirectory(outputDirectory); - consumer.consume("resources/jaxws/spi/tools/wsdl/TestServiceCatalog.wsdl"); + consumer.consume("resources/jaxws/smoke/tools/wsdl/TestServiceCatalog.wsdl"); } /** @@ -279,7 +279,7 @@ private void consumeWSDL() throws Exception { consumer.setOutputDirectory(outputDirectory); - consumer.consume("resources/jaxws/spi/tools/wsdl/TestService.wsdl"); + consumer.consume("resources/jaxws/smoke/tools/wsdl/TestService.wsdl"); } } Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java 2007-08-03 08:29:27 UTC (rev 4134) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java 2007-08-03 08:30:19 UTC (rev 4135) @@ -112,7 +112,7 @@ { provide(); ClassLoader loader = getArtefactClassLoader(); - Class responseWrapper = loader.loadClass("org.jboss.test.ws.jaxws.spi.tools.jaxws.AddResponse"); + Class responseWrapper = loader.loadClass("org.jboss.test.ws.jaxws.smoke.tools.jaxws.AddResponse"); XmlRootElement rootElement = (XmlRootElement) responseWrapper.getAnnotation(XmlRootElement.class); assertNotNull("@XmlRootElement missing form response wrapper", rootElement); assertEquals("Wrong namespace", rootElement.namespace(), "http://foo.bar.com/calculator");

18 years, 8 months

1
0
0 / 0

JBossWS SVN: r4134 - in trunk: integration/sunri/ant-import and 8 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-03 04:29:27 -0400 (Fri, 03 Aug 2007) New Revision: 4134 Modified: trunk/integration/sunri/.classpath trunk/integration/sunri/ant-import/build-testsuite.xml trunk/integration/sunri/ant-import/build-thirdparty.xml trunk/integration/sunri/src/main/etc/bin-dist-build.xml trunk/integration/xfire/.classpath trunk/integration/xfire/ant-import/build-testsuite.xml trunk/integration/xfire/ant-import/build-thirdparty.xml trunk/integration/xfire/src/main/etc/bin-dist-build.xml trunk/jbossws-core/.classpath trunk/jbossws-core/ant-import-tests/build-testsuite.xml trunk/jbossws-core/ant-import/build-testsuite.xml trunk/jbossws-core/ant-import/build-thirdparty.xml trunk/testsuite/.classpath Log: Remove dependency on jbossws-framework.jar Modified: trunk/integration/sunri/.classpath =================================================================== --- trunk/integration/sunri/.classpath 2007-08-03 07:44:53 UTC (rev 4133) +++ trunk/integration/sunri/.classpath 2007-08-03 08:29:27 UTC (rev 4134) @@ -21,9 +21,6 @@ <classpathentry kind="lib" path="thirdparty/streambuffer.jar"/> <classpathentry kind="lib" path="thirdparty/servlet-api.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/spi"/> - <classpathentry combineaccessrules="false" kind="src" path="/integration-framework"/> - <classpathentry kind="lib" path="/integration-framework/thirdparty/dom4j.jar"/> - <classpathentry kind="lib" path="/integration-framework/thirdparty/jboss-common-core.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/common"/> <classpathentry kind="output" path="output/eclipse"/> </classpath> Modified: trunk/integration/sunri/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/sunri/ant-import/build-testsuite.xml 2007-08-03 07:44:53 UTC (rev 4133) +++ trunk/integration/sunri/ant-import/build-testsuite.xml 2007-08-03 08:29:27 UTC (rev 4134) @@ -28,7 +28,6 @@ <path id="ws.stack.classpath"> <pathelement location="${int.sunri.dir}/thirdparty/jbossws-common.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jbossws-framework.jar"/> <pathelement location="${int.sunri.dir}/thirdparty/jbossws-spi.jar"/> <pathelement location="${int.sunri.dir}/thirdparty/FastInfoset.jar"/> <pathelement location="${int.sunri.dir}/thirdparty/http.jar"/> Modified: trunk/integration/sunri/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-08-03 07:44:53 UTC (rev 4133) +++ trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-08-03 08:29:27 UTC (rev 4134) @@ -84,8 +84,8 @@  <path id="sunri.integration.classpath"> +  <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-framework.jar"/> <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> <pathelement location="${thirdparty.dir}/dom4j.jar"/> Modified: trunk/integration/sunri/src/main/etc/bin-dist-build.xml =================================================================== --- trunk/integration/sunri/src/main/etc/bin-dist-build.xml 2007-08-03 07:44:53 UTC (rev 4133) +++ trunk/integration/sunri/src/main/etc/bin-dist-build.xml 2007-08-03 08:29:27 UTC (rev 4134) @@ -78,7 +78,6 @@ <target name="tests-init" depends="prepare,tests-classpath"> <path id="ws.stack.classpath"> - <pathelement location="${lib.dir}/jbossws-framework.jar"/> <pathelement location="${lib.dir}/jbossws-spi.jar"/> <pathelement location="${thirdparty.dir}/FastInfoset.jar"/> <pathelement location="${thirdparty.dir}/http.jar"/> Modified: trunk/integration/xfire/.classpath =================================================================== --- trunk/integration/xfire/.classpath 2007-08-03 07:44:53 UTC (rev 4133) +++ trunk/integration/xfire/.classpath 2007-08-03 08:29:27 UTC (rev 4134) @@ -16,8 +16,6 @@ <classpathentry kind="lib" path="thirdparty/spring-core.jar"/> <classpathentry kind="lib" path="thirdparty/spring-web.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/spi"/> - <classpathentry kind="lib" path="/integration-framework/thirdparty/dom4j.jar"/> - <classpathentry kind="lib" path="/integration-framework/thirdparty/jboss-common-core.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/common"/> <classpathentry kind="output" path="output/eclipse"/> </classpath> Modified: trunk/integration/xfire/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/xfire/ant-import/build-testsuite.xml 2007-08-03 07:44:53 UTC (rev 4133) +++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-08-03 08:29:27 UTC (rev 4134) @@ -28,7 +28,6 @@ <path id="ws.stack.classpath"> <pathelement location="${int.xfire.dir}/thirdparty/jbossws-common.jar"/> - <pathelement location="${int.xfire.dir}/thirdparty/jbossws-framework.jar"/> <pathelement location="${int.xfire.dir}/thirdparty/jbossws-spi.jar"/> <pathelement location="${int.xfire.dir}/thirdparty/cxf-incubator.jar"/> <pathelement location="${int.xfire.dir}/thirdparty/geronimo-javamail.jar"/> Modified: trunk/integration/xfire/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-08-03 07:44:53 UTC (rev 4133) +++ trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-08-03 08:29:27 UTC (rev 4134) @@ -84,8 +84,8 @@ <target name="thirdparty-classpath" depends="thirdparty-init"> <path id="xfire.integration.classpath"> +  <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-framework.jar"/> <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> <pathelement location="${thirdparty.dir}/cxf-incubator.jar"/> Modified: trunk/integration/xfire/src/main/etc/bin-dist-build.xml =================================================================== --- trunk/integration/xfire/src/main/etc/bin-dist-build.xml 2007-08-03 07:44:53 UTC (rev 4133) +++ trunk/integration/xfire/src/main/etc/bin-dist-build.xml 2007-08-03 08:29:27 UTC (rev 4134) @@ -79,7 +79,6 @@ <target name="tests-init" depends="prepare,tests-classpath"> <path id="ws.stack.classpath"> - <pathelement location="${lib.dir}/jbossws-framework.jar"/> <pathelement location="${lib.dir}/jbossws-spi.jar"/> <pathelement location="${lib.dir}/cxf-incubator.jar"/> <pathelement location="${lib.dir}/geronimo-javamail.jar"/> Modified: trunk/jbossws-core/.classpath =================================================================== --- trunk/jbossws-core/.classpath 2007-08-03 07:44:53 UTC (rev 4133) +++ trunk/jbossws-core/.classpath 2007-08-03 08:29:27 UTC (rev 4134) @@ -36,8 +36,6 @@ <classpathentry kind="lib" path="thirdparty/jaxws-rt.jar"/> <classpathentry kind="lib" path="thirdparty/concurrent.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/spi"/> - <classpathentry combineaccessrules="false" kind="src" path="/integration-framework"/> - <classpathentry kind="lib" path="/integration-framework/thirdparty/junit.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/common"/> <classpathentry kind="output" path="output/eclipse"/> </classpath> Modified: trunk/jbossws-core/ant-import/build-testsuite.xml =================================================================== --- trunk/jbossws-core/ant-import/build-testsuite.xml 2007-08-03 07:44:53 UTC (rev 4133) +++ trunk/jbossws-core/ant-import/build-testsuite.xml 2007-08-03 08:29:27 UTC (rev 4134) @@ -28,7 +28,6 @@ <path id="ws.stack.classpath"> <pathelement location="${core.dir}/thirdparty/jbossws-common.jar"/> - <pathelement location="${core.dir}/thirdparty/jbossws-framework.jar"/> <pathelement location="${core.dir}/thirdparty/jbossws-spi.jar"/> <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/> Modified: trunk/jbossws-core/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-08-03 07:44:53 UTC (rev 4133) +++ trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-08-03 08:29:27 UTC (rev 4134) @@ -126,8 +126,8 @@  <path id="thirdparty.classpath"> +  <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-framework.jar"/> <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/> Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-08-03 07:44:53 UTC (rev 4133) +++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-08-03 08:29:27 UTC (rev 4134) @@ -29,7 +29,6 @@ <path id="ws.stack.classpath"> <pathelement location="${core.dir}/thirdparty/jbossws-common.jar"/> - <pathelement location="${core.dir}/thirdparty/jbossws-framework.jar"/> <pathelement location="${core.dir}/thirdparty/jbossws-spi.jar"/> <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/> Modified: trunk/testsuite/.classpath =================================================================== --- trunk/testsuite/.classpath 2007-08-03 07:44:53 UTC (rev 4133) +++ trunk/testsuite/.classpath 2007-08-03 08:29:27 UTC (rev 4134) @@ -4,7 +4,6 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> <classpathentry combineaccessrules="false" kind="src" path="/spi"/> - <classpathentry combineaccessrules="false" kind="src" path="/integration-framework"/> <classpathentry kind="lib" path="/integration-framework/thirdparty/activation.jar"/> <classpathentry kind="lib" path="/integration-framework/thirdparty/dom4j.jar"/> <classpathentry kind="lib" path="/integration-framework/thirdparty/jaxb-api.jar"/>

18 years, 8 months

1
0
0 / 0

JBossWS SVN: r4133 - in common/trunk: ant-import and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-08-03 03:44:53 -0400 (Fri, 03 Aug 2007) New Revision: 4133 Modified: common/trunk/ant-import/build-thirdparty.xml common/trunk/version.properties Log: added junit-.jar to classpath in order to compile JBossWSTest abstraction Modified: common/trunk/ant-import/build-thirdparty.xml =================================================================== --- common/trunk/ant-import/build-thirdparty.xml 2007-08-03 07:40:50 UTC (rev 4132) +++ common/trunk/ant-import/build-thirdparty.xml 2007-08-03 07:44:53 UTC (rev 4133) @@ -38,6 +38,7 @@ <target name="thirdparty-get" depends="thirdparty-init" if="force.thirdparty" description="Gets the thirdparty libraries"> <mkdir dir="${thirdparty.dir}"/> + <get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/> @@ -67,6 +68,7 @@ <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/> <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/> <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> + <pathelement location="${thirdparty.dir}/junit.jar"/> </path> </target> Modified: common/trunk/version.properties =================================================================== --- common/trunk/version.properties 2007-08-03 07:40:50 UTC (rev 4132) +++ common/trunk/version.properties 2007-08-03 07:44:53 UTC (rev 4133) @@ -24,3 +24,4 @@ sun-jaxb=2.1.4 sun-jaxrpc=1.1 sun-jaxws=2.1.1 +junit=3.8.1

18 years, 8 months

1
0
0 / 0

JBossWS SVN: r4132 - common/trunk.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-08-03 03:40:50 -0400 (Fri, 03 Aug 2007) New Revision: 4132 Modified: common/trunk/build.xml Log: added project name to build file Modified: common/trunk/build.xml =================================================================== --- common/trunk/build.xml 2007-08-03 07:34:43 UTC (rev 4131) +++ common/trunk/build.xml 2007-08-03 07:40:50 UTC (rev 4132) @@ -11,7 +11,7 @@  -<project default="main" basedir="."> +<project name="JBossWS-Common" default="main" basedir="."> <import file="${basedir}/ant-import/build-setup.xml"/> <import file="${basedir}/ant-import/build-release.xml"/>

18 years, 8 months

1
0
0 / 0

JBossWS SVN: r4131 - spi/trunk and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-08-03 03:34:43 -0400 (Fri, 03 Aug 2007) New Revision: 4131 Modified: container/jboss50/trunk/build.xml spi/trunk/build.xml Log: added project name to build file Modified: container/jboss50/trunk/build.xml =================================================================== --- container/jboss50/trunk/build.xml 2007-08-03 05:47:11 UTC (rev 4130) +++ container/jboss50/trunk/build.xml 2007-08-03 07:34:43 UTC (rev 4131) @@ -11,7 +11,7 @@  -<project default="main" basedir="." name="Integration-JBoss50"> +<project default="main" basedir="." name="JBossWS-JBoss50"> <import file="${basedir}/ant-import/build-setup.xml"/> <import file="${basedir}/ant-import/build-release.xml"/> Modified: spi/trunk/build.xml =================================================================== --- spi/trunk/build.xml 2007-08-03 05:47:11 UTC (rev 4130) +++ spi/trunk/build.xml 2007-08-03 07:34:43 UTC (rev 4131) @@ -11,7 +11,7 @@  -<project default="main" basedir="."> +<project name="JBossWS-SPI" default="main" basedir="."> <import file="${basedir}/ant-import/build-setup.xml"/> <import file="${basedir}/ant-import/build-release.xml"/>

18 years, 8 months

1
0
0 / 0

JBossWS SVN: r4130 - in container: jboss42/trunk and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-03 01:47:11 -0400 (Fri, 03 Aug 2007) New Revision: 4130 Modified: container/jboss40/trunk/.classpath container/jboss42/trunk/.classpath container/jboss50/trunk/.classpath Log: Fix eclipse classpath Modified: container/jboss40/trunk/.classpath =================================================================== --- container/jboss40/trunk/.classpath 2007-08-03 05:11:33 UTC (rev 4129) +++ container/jboss40/trunk/.classpath 2007-08-03 05:47:11 UTC (rev 4130) @@ -5,12 +5,13 @@ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-4.0.x"/> <classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/> <classpathentry combineaccessrules="false" kind="src" path="/spi"/> - <classpathentry kind="lib" path="/integration-framework/thirdparty/dom4j.jar"/> - <classpathentry kind="lib" path="/integration-framework/thirdparty/jaxrpc-api.jar"/> - <classpathentry kind="lib" path="/integration-framework/thirdparty/jaxws-api.jar"/> - <classpathentry kind="lib" path="/integration-framework/thirdparty/jsr181-api.jar"/> - <classpathentry kind="lib" path="/integration-framework/thirdparty/saaj-api.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/common"/> <classpathentry combineaccessrules="false" kind="src" path="/container-jboss42"/> + <classpathentry kind="lib" path="thirdparty/jaxrpc-api.jar"/> + <classpathentry kind="lib" path="thirdparty/jaxws-api.jar"/> + <classpathentry kind="lib" path="thirdparty/jbossws-common.jar"/> + <classpathentry kind="lib" path="thirdparty/jbossws-spi.jar"/> + <classpathentry kind="lib" path="thirdparty/jsr181-api.jar"/> + <classpathentry kind="lib" path="thirdparty/saaj-api.jar"/> <classpathentry kind="output" path="output/eclipse"/> </classpath> Modified: container/jboss42/trunk/.classpath =================================================================== --- container/jboss42/trunk/.classpath 2007-08-03 05:11:33 UTC (rev 4129) +++ container/jboss42/trunk/.classpath 2007-08-03 05:47:11 UTC (rev 4130) @@ -4,11 +4,12 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-4.2.x"/> <classpathentry combineaccessrules="false" kind="src" path="/spi"/> - <classpathentry kind="lib" path="/integration-framework/thirdparty/dom4j.jar"/> - <classpathentry kind="lib" path="/integration-framework/thirdparty/jaxws-api.jar"/> - <classpathentry kind="lib" path="/integration-framework/thirdparty/jsr181-api.jar"/> - <classpathentry kind="lib" path="/integration-framework/thirdparty/saaj-api.jar"/> - <classpathentry kind="lib" path="/integration-framework/thirdparty/jaxrpc-api.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/common"/> + <classpathentry kind="lib" path="thirdparty/jaxrpc-api.jar"/> + <classpathentry kind="lib" path="thirdparty/jaxws-api.jar"/> + <classpathentry kind="lib" path="thirdparty/jbossws-common.jar"/> + <classpathentry kind="lib" path="thirdparty/jbossws-spi.jar"/> + <classpathentry kind="lib" path="thirdparty/jsr181-api.jar"/> + <classpathentry kind="lib" path="thirdparty/saaj-api.jar"/> <classpathentry kind="output" path="output/eclipse"/> </classpath> Modified: container/jboss50/trunk/.classpath =================================================================== --- container/jboss50/trunk/.classpath 2007-08-03 05:11:33 UTC (rev 4129) +++ container/jboss50/trunk/.classpath 2007-08-03 05:47:11 UTC (rev 4130) @@ -4,12 +4,12 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> <classpathentry combineaccessrules="false" kind="src" path="/spi"/> - <classpathentry combineaccessrules="false" kind="src" path="/integration-framework"/> - <classpathentry kind="lib" path="/integration-framework/thirdparty/dom4j.jar"/> - <classpathentry kind="lib" path="/integration-framework/thirdparty/jaxws-api.jar"/> - <classpathentry kind="lib" path="/integration-framework/thirdparty/jsr181-api.jar"/> - <classpathentry kind="lib" path="/integration-framework/thirdparty/saaj-api.jar"/> - <classpathentry kind="lib" path="/integration-framework/thirdparty/jaxrpc-api.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/common"/> + <classpathentry kind="lib" path="thirdparty/jaxrpc-api.jar"/> + <classpathentry kind="lib" path="thirdparty/jaxws-api.jar"/> + <classpathentry kind="lib" path="thirdparty/jbossws-common.jar"/> + <classpathentry kind="lib" path="thirdparty/jbossws-spi.jar"/> + <classpathentry kind="lib" path="thirdparty/jsr181-api.jar"/> + <classpathentry kind="lib" path="thirdparty/saaj-api.jar"/> <classpathentry kind="output" path="output/eclipse"/> </classpath>

18 years, 8 months

1
0
0 / 0

JBossWS SVN: r4129 - in trunk: build/ant-import and 9 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-03 01:11:33 -0400 (Fri, 03 Aug 2007) New Revision: 4129 Added: trunk/integration/sunri/ant-import/macros-deploy-framework.xml trunk/integration/xfire/ant-import/macros-deploy-framework.xml trunk/jbossws-core/ant-import/macros-deploy-framework.xml Removed: trunk/integration/spi/ Modified: trunk/build/ant-import/build-release.xml trunk/build/ant-import/build-setup.xml trunk/build/build.xml trunk/integration/sunri/ant-import/build-bin-dist.xml trunk/integration/sunri/ant-import/build-deploy.xml trunk/integration/sunri/ant-import/build-testsuite.xml trunk/integration/sunri/ant-import/build-thirdparty.xml trunk/integration/sunri/ant-import/macros-deploy-sunri.xml trunk/integration/sunri/build.xml trunk/integration/sunri/version.properties trunk/integration/xfire/.classpath trunk/integration/xfire/ant-import/build-deploy.xml trunk/integration/xfire/ant-import/build-testsuite.xml trunk/integration/xfire/ant-import/build-thirdparty.xml trunk/integration/xfire/ant-import/macros-deploy-xfire.xml trunk/integration/xfire/build.xml trunk/integration/xfire/version.properties trunk/jbossws-core/ant-import-tests/build-testsuite.xml trunk/jbossws-core/ant-import/build-bin-dist.xml trunk/jbossws-core/ant-import/build-deploy.xml trunk/jbossws-core/ant-import/build-testsuite.xml trunk/jbossws-core/ant-import/build-thirdparty.xml trunk/jbossws-core/ant-import/macros-deploy-native.xml trunk/jbossws-core/build.xml trunk/jbossws-core/version.properties trunk/testsuite/src/resources/jaxws/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl Log: Externalize jbossws-framework Modified: trunk/build/ant-import/build-release.xml =================================================================== --- trunk/build/ant-import/build-release.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/build/ant-import/build-release.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -36,7 +36,6 @@ </target> <target name="release-to-repository" depends="prepare" description="Release to local repository"> - <ant antfile="${framework.dir}/build.xml" target="release" inheritall="false"/> <ant antfile="${core.dir}/build.xml" target="release" inheritall="false"/> <ant antfile="${int.sunri.dir}/build.xml" target="release" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="release" inheritall="false"/> Modified: trunk/build/ant-import/build-setup.xml =================================================================== --- trunk/build/ant-import/build-setup.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/build/ant-import/build-setup.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -18,7 +18,6 @@  <property name="build.dir" value="${basedir}/build"/> - <property name="framework.dir" value="${basedir}/integration/spi"/> <property name="core.dir" value="${basedir}/jbossws-core"/> <property name="testsuite.dir" value="${basedir}/testsuite"/> <property name="int.sunri.dir" value="${basedir}/integration/sunri"/> Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/build/build.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -113,7 +113,6 @@ | Build all jar files. --> <target name="jars" depends="prepare" description="Builds all jar files."> - <ant antfile="${framework.dir}/build.xml" target="jars" inheritall="false"/> <ant antfile="${core.dir}/build.xml" target="jars" inheritall="false"/> </target> @@ -123,7 +122,6 @@ <target name="clean" depends="prepare" description="Cleans up most generated files."> <delete dir="${build.dir}/output"/> - <ant antfile="${framework.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${core.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${testsuite.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${int.sunri.dir}/build.xml" target="clean" inheritall="false"/> @@ -132,7 +130,6 @@ <target name="clobber" depends="prepare" description="Cleans up all generated files."> <delete dir="${build.dir}/output"/> - <ant antfile="${framework.dir}/build.xml" target="clobber" inheritall="false"/> <ant antfile="${core.dir}/build.xml" target="clobber" inheritall="false"/> <ant antfile="${testsuite.dir}/build.xml" target="clobber" inheritall="false"/> <ant antfile="${int.sunri.dir}/build.xml" target="clobber" inheritall="false"/> Modified: trunk/integration/sunri/ant-import/build-bin-dist.xml =================================================================== --- trunk/integration/sunri/ant-import/build-bin-dist.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/integration/sunri/ant-import/build-bin-dist.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -52,16 +52,16 @@ <fileset dir="${build.dir}/ant-import"> <include name="build-testsuite.xml"/> </fileset> - <fileset dir="${int.native.dir}/ant-import"> + <fileset dir="${core.dir}/ant-import"> + <include name="macros-deploy-framework.xml"/> <include name="macros-deploy-native.xml"/> </fileset> <fileset dir="${int.sunri.dir}/ant-import"> + <include name="macros-deploy-framework.xml"/> <include name="macros-deploy-sunri.xml"/> </fileset> - <fileset dir="${framework.dir}/ant-import"> - <include name="macros-deploy-spi.xml"/> - </fileset> <fileset dir="${int.xfire.dir}/ant-import"> + <include name="macros-deploy-framework.xml"/> <include name="macros-deploy-xfire.xml"/> </fileset> <fileset dir="${testsuite.dir}/ant-import"> Modified: trunk/integration/sunri/ant-import/build-deploy.xml =================================================================== --- trunk/integration/sunri/ant-import/build-deploy.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/integration/sunri/ant-import/build-deploy.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -13,8 +13,8 @@ <project> + <import file="${int.sunri.dir}/ant-import/macros-deploy-framework.xml"/> <import file="${int.sunri.dir}/ant-import/macros-deploy-sunri.xml"/> - <import file="${framework.dir}/ant-import/macros-deploy-wsf.xml"/>   @@ -25,20 +25,18 @@ <ant antfile="${core.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <macro-deploy-sunri50 - wsflibs="${framework.dir}/output/lib" stacklibs="${int.sunri.dir}/output/lib" thirdpartylibs="${int.sunri.dir}/thirdparty"/> - <macro-deploy-wsf - wsflibs="${framework.dir}/output/lib" - thirdpartylibs="${framework.dir}/thirdparty" + <macro-deploy-framework + thirdpartylibs="${int.sunri.dir}/thirdparty" jbosshome="${jboss50.home}"/> </target>  <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50"> <macro-undeploy-sunri50/> - <macro-undeploy-wsf jbosshome="${jboss50.home}"/> + <macro-undeploy-framework jbosshome="${jboss50.home}"/> </target>  @@ -46,20 +44,18 @@ <ant antfile="${core.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> <macro-deploy-sunri42 - wsflibs="${framework.dir}/output/lib" stacklibs="${int.sunri.dir}/output/lib" thirdpartylibs="${int.sunri.dir}/thirdparty"/> - <macro-deploy-wsf - wsflibs="${framework.dir}/output/lib" - thirdpartylibs="${framework.dir}/thirdparty" + <macro-deploy-framework + thirdpartylibs="${int.sunri.dir}/thirdparty" jbosshome="${jboss42.home}"/> </target>  <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/sunri from jboss42"> <macro-undeploy-sunri42/> - <macro-undeploy-wsf jbosshome="${jboss42.home}"/> + <macro-undeploy-framework jbosshome="${jboss42.home}"/> </target> </project> Modified: trunk/integration/sunri/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/sunri/ant-import/build-testsuite.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/integration/sunri/ant-import/build-testsuite.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -27,8 +27,8 @@ <target name="tests-init" depends="tests-classpath"> <path id="ws.stack.classpath"> - <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/> <pathelement location="${int.sunri.dir}/thirdparty/jbossws-common.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/jbossws-framework.jar"/> <pathelement location="${int.sunri.dir}/thirdparty/jbossws-spi.jar"/> <pathelement location="${int.sunri.dir}/thirdparty/FastInfoset.jar"/> <pathelement location="${int.sunri.dir}/thirdparty/http.jar"/> Modified: trunk/integration/sunri/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -42,13 +42,20 @@ description="Gets the thirdparty libraries"> <mkdir dir="${thirdparty.dir}"/> - <get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework.jar" dest="${thirdparty.dir}/jbossws-framework.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-scripts.zip" dest="${thirdparty.dir}/jbossws-framework-scripts.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50-deployer.zip" dest="${thirdparty.dir}/jbossws-jboss50-deployer.zip" usetimestamp="true" verbose="true"/> + + <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jboss-javaee/${jboss-javaee}/lib/jboss-javaee.jar" dest="${thirdparty.dir}/jboss-javaee.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/> @@ -77,19 +84,20 @@  <path id="sunri.integration.classpath"> - <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/> - <pathelement location="${framework.dir}/thirdparty/dom4j.jar"/> - <pathelement location="${framework.dir}/thirdparty/jboss-common-core.jar"/> - <pathelement location="${framework.dir}/thirdparty/jboss-logging-spi.jar"/> - <pathelement location="${framework.dir}/thirdparty/jboss-javaee.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-framework.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> + + <pathelement location="${thirdparty.dir}/dom4j.jar"/> <pathelement location="${thirdparty.dir}/http.jar"/> <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> <pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/> <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/> <pathelement location="${thirdparty.dir}/jaxws-rt.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> + <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/> + <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/> + <pathelement location="${thirdparty.dir}/jboss-javaee.jar"/> <pathelement location="${thirdparty.dir}/jsr181-api.jar"/> <pathelement location="${thirdparty.dir}/servlet-api.jar"/> </path> Added: trunk/integration/sunri/ant-import/macros-deploy-framework.xml =================================================================== --- trunk/integration/sunri/ant-import/macros-deploy-framework.xml (rev 0) +++ trunk/integration/sunri/ant-import/macros-deploy-framework.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + + <macrodef name="macro-deploy-framework"> + <attribute name="thirdpartylibs"/> + <attribute name="jbosshome"/> + <sequential> + +  + <unzip dest="@{jbosshome}/bin" src="@{thirdpartylibs}/jbossws-framework-scripts.zip"/> + <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/> + +  + <copy todir="@{jbosshome}/client"> + <fileset dir="@{thirdpartylibs}"> + <include name="jbossws-common.jar"/> + <include name="jbossws-framework.jar"/> + <include name="jbossws-spi.jar"/> + </fileset> + </copy> + +  + <copy todir="@{jbosshome}/server/${jboss.server.instance}/lib"> + <fileset dir="@{thirdpartylibs}"> + <include name="jbossws-common.jar"/> + <include name="jbossws-framework.jar"/> + <include name="jbossws-spi.jar"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <macrodef name="macro-undeploy-framework"> + <attribute name="jbosshome"/> + <sequential> + <delete> +  + <fileset dir="@{jbosshome}/bin"> + <include name="wsconsume.*"/> + <include name="wsprovide.*"/> + </fileset> + +  + <fileset dir="@{jbosshome}/client"> + <include name="jbossws-common.jar"/> + <include name="jbossws-framework.jar"/> + <include name="jbossws-spi.jar"/> + </fileset> + +  + <fileset dir="@{jbosshome}/server/${jboss.server.instance}/lib"> + <include name="jbossws-common.jar"/> + <include name="jbossws-framework.jar"/> + <include name="jbossws-spi.jar"/> + </fileset> + </delete> + </sequential> + </macrodef> + +</project> \ No newline at end of file Modified: trunk/integration/sunri/ant-import/macros-deploy-sunri.xml =================================================================== --- trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -18,7 +18,6 @@  <macrodef name="macro-deploy-sunri50"> - <attribute name="wsflibs"/> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> @@ -112,7 +111,6 @@ </macrodef> <macrodef name="macro-deploy-sunri42"> - <attribute name="wsflibs"/> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> Modified: trunk/integration/sunri/build.xml =================================================================== --- trunk/integration/sunri/build.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/integration/sunri/build.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -41,7 +41,6 @@  <target name="init" depends="prepare,thirdparty"> - <ant antfile="${framework.dir}/build.xml" target="jars" inheritall="false"/> <mkdir dir="${sunri.output.apidocs.dir}"/> </target> @@ -163,12 +162,10 @@ <include name="jbossws-context.war"/> </fileset> - <fileset dir="${framework.dir}/thirdparty"> - <include name="jaxrpc-api.jar"/> - </fileset> <fileset dir="${thirdparty.dir}"> <include name="FastInfoset.jar"/> <include name="http.jar"/> + <include name="jaxrpc-api.jar"/> <include name="jaxws-api.jar"/> <include name="jaxws-rt.jar"/> <include name="jaxws-tools.jar"/> @@ -212,9 +209,6 @@ <fileset dir="${sunri.output.lib.dir}"> <include name="jbossws-context.war"/> </fileset> - <fileset dir="${framework.dir}/thirdparty"> - <include name="jaxrpc-api.jar"/> - </fileset> <fileset dir="${sunri.output.lib.dir}"> <include name="jbossws-sunri.jar"/> </fileset> @@ -224,6 +218,7 @@ <include name="http.jar"/> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> + <include name="jaxrpc-api.jar"/> <include name="jaxws-api.jar"/> <include name="jaxws-rt.jar"/> <include name="jaxws-tools.jar"/> @@ -257,9 +252,6 @@ <classpath> <pathelement path="${sunri50.integration.classpath}"/> <pathelement path="${sunri.integration.classpath}"/> - <fileset dir="${framework.dir}/thirdparty"> - <include name="**/*.jar"/> - </fileset> </classpath> <packageset dir="${sunri.java.dir}" defaultexcludes="yes"> @@ -268,9 +260,6 @@ <packageset dir="${sunri.output.dir}/thirdparty-sources" defaultexcludes="yes"> <include name="com/sun/**"/> </packageset> - <packageset dir="${framework.dir}/src/main/java"> - <include name="org/jboss/wsf/**"/> - </packageset> <doctitle><![CDATA[<h1>JBoss Web Service Framework ${version.id} - Stack integration Sun-RI</h1>]]></doctitle> <tag name="todo" scope="all" description="To do:"/> Modified: trunk/integration/sunri/version.properties =================================================================== --- trunk/integration/sunri/version.properties 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/integration/sunri/version.properties 2007-08-03 05:11:33 UTC (rev 4129) @@ -5,10 +5,14 @@ # Thirdparty library versions jbossws-common=2.0.1.CR1 +jbossws-framework=2.0.1.CR1 jbossws-spi=2.0.1.CR1 jbossws-jboss50=2.0.1.CR1 jbossws-jboss42=2.0.1.CR1 +jboss-common-core=2.0.2.GA +jboss-common-logging-spi=2.0.2.GA +jboss-javaee=5.0.0-SNAPSHOT jboss-security-spi=2.0.0.Beta sun-jaxws=2.1.1 sun-servlet=2.5 Modified: trunk/integration/xfire/.classpath =================================================================== --- trunk/integration/xfire/.classpath 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/integration/xfire/.classpath 2007-08-03 05:11:33 UTC (rev 4129) @@ -16,7 +16,6 @@ <classpathentry kind="lib" path="thirdparty/spring-core.jar"/> <classpathentry kind="lib" path="thirdparty/spring-web.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/spi"/> - <classpathentry combineaccessrules="false" kind="src" path="/integration-framework"/> <classpathentry kind="lib" path="/integration-framework/thirdparty/dom4j.jar"/> <classpathentry kind="lib" path="/integration-framework/thirdparty/jboss-common-core.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/common"/> Modified: trunk/integration/xfire/ant-import/build-deploy.xml =================================================================== --- trunk/integration/xfire/ant-import/build-deploy.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/integration/xfire/ant-import/build-deploy.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -13,8 +13,8 @@ <project> + <import file="${int.xfire.dir}/ant-import/macros-deploy-framework.xml"/> <import file="${int.xfire.dir}/ant-import/macros-deploy-xfire.xml"/> - <import file="${framework.dir}/ant-import/macros-deploy-wsf.xml"/>   @@ -25,20 +25,18 @@ <ant antfile="${core.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <macro-deploy-xfire50 - wsflibs="${framework.dir}/output/lib" stacklibs="${int.xfire.dir}/output/lib" thirdpartylibs="${int.xfire.dir}/thirdparty"/> - <macro-deploy-wsf - wsflibs="${framework.dir}/output/lib" - thirdpartylibs="${framework.dir}/thirdparty" + <macro-deploy-framework + thirdpartylibs="${int.xfire.dir}/thirdparty" jbosshome="${jboss50.home}"/> </target>  <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/xfire from jboss50"> <macro-undeploy-xfire50/> - <macro-undeploy-wsf jbosshome="${jboss50.home}"/> + <macro-undeploy-framework jbosshome="${jboss50.home}"/> </target>  @@ -46,20 +44,18 @@ <ant antfile="${core.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> <macro-deploy-xfire42 - wsflibs="${framework.dir}/output/lib" stacklibs="${int.xfire.dir}/output/lib" thirdpartylibs="${int.xfire.dir}/thirdparty"/> - <macro-deploy-wsf - wsflibs="${framework.dir}/output/lib" - thirdpartylibs="${framework.dir}/thirdparty" + <macro-deploy-framework + thirdpartylibs="${int.xfire.dir}/thirdparty" jbosshome="${jboss42.home}"/> </target>  <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/xfire from jboss42"> <macro-undeploy-xfire42/> - <macro-undeploy-wsf jbosshome="${jboss42.home}"/> + <macro-undeploy-framework jbosshome="${jboss42.home}"/> </target> </project> Modified: trunk/integration/xfire/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/xfire/ant-import/build-testsuite.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -27,8 +27,8 @@ <target name="tests-init" depends="tests-classpath"> <path id="ws.stack.classpath"> - <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/> <pathelement location="${int.xfire.dir}/thirdparty/jbossws-common.jar"/> + <pathelement location="${int.xfire.dir}/thirdparty/jbossws-framework.jar"/> <pathelement location="${int.xfire.dir}/thirdparty/jbossws-spi.jar"/> <pathelement location="${int.xfire.dir}/thirdparty/cxf-incubator.jar"/> <pathelement location="${int.xfire.dir}/thirdparty/geronimo-javamail.jar"/> Modified: trunk/integration/xfire/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -42,6 +42,15 @@ description="Gets the thirdparty libraries"> <mkdir dir="${thirdparty.dir}"/> + <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework.jar" dest="${thirdparty.dir}/jbossws-framework.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-scripts.zip" dest="${thirdparty.dir}/jbossws-framework-scripts.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50-deployer.zip" dest="${thirdparty.dir}/jbossws-jboss50-deployer.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-cxf/${apache-cxf}/lib/cxf-incubator.jar" dest="${thirdparty.dir}/cxf-incubator.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-cxf/${apache-cxf}/lib/geronimo-javamail.jar" dest="${thirdparty.dir}/geronimo-javamail.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-cxf/${apache-cxf}/lib/geronimo-ws-metadata.jar" dest="${thirdparty.dir}/geronimo-ws-metadata.jar" usetimestamp="true" verbose="true"/> @@ -57,13 +66,11 @@ <get src="${jboss.repository}/apache-xml-commons/${apache-xml-commons}/lib/resolver.jar" dest="${thirdparty.dir}/resolver.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j-src.jar" dest="${thirdparty.dir}/wsdl4j-src.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50-deployer.zip" dest="${thirdparty.dir}/jbossws-jboss50-deployer.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jboss-javaee/${jboss-javaee}/lib/jboss-javaee.jar" dest="${thirdparty.dir}/jboss-javaee.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api.jar" dest="${thirdparty.dir}/stax-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/> @@ -77,16 +84,17 @@ <target name="thirdparty-classpath" depends="thirdparty-init"> <path id="xfire.integration.classpath"> - <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/> - <pathelement location="${framework.dir}/thirdparty/dom4j.jar"/> - <pathelement location="${framework.dir}/thirdparty/jboss-common-core.jar"/> - <pathelement location="${framework.dir}/thirdparty/jboss-logging-spi.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-framework.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> + <pathelement location="${thirdparty.dir}/cxf-incubator.jar"/> + <pathelement location="${thirdparty.dir}/dom4j.jar"/> <pathelement location="${thirdparty.dir}/geronimo-ws-metadata.jar"/> <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> + <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/> + <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/> <pathelement location="${thirdparty.dir}/saaj-api.jar"/> <pathelement location="${thirdparty.dir}/saaj-impl.jar"/> <pathelement location="${thirdparty.dir}/servlet-api.jar"/> Added: trunk/integration/xfire/ant-import/macros-deploy-framework.xml =================================================================== --- trunk/integration/xfire/ant-import/macros-deploy-framework.xml (rev 0) +++ trunk/integration/xfire/ant-import/macros-deploy-framework.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + + <macrodef name="macro-deploy-framework"> + <attribute name="thirdpartylibs"/> + <attribute name="jbosshome"/> + <sequential> + +  + <unzip dest="@{jbosshome}/bin" src="@{thirdpartylibs}/jbossws-framework-scripts.zip"/> + <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/> + +  + <copy todir="@{jbosshome}/client"> + <fileset dir="@{thirdpartylibs}"> + <include name="jbossws-common.jar"/> + <include name="jbossws-framework.jar"/> + <include name="jbossws-spi.jar"/> + </fileset> + </copy> + +  + <copy todir="@{jbosshome}/server/${jboss.server.instance}/lib"> + <fileset dir="@{thirdpartylibs}"> + <include name="jbossws-common.jar"/> + <include name="jbossws-framework.jar"/> + <include name="jbossws-spi.jar"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <macrodef name="macro-undeploy-framework"> + <attribute name="jbosshome"/> + <sequential> + <delete> +  + <fileset dir="@{jbosshome}/bin"> + <include name="wsconsume.*"/> + <include name="wsprovide.*"/> + </fileset> + +  + <fileset dir="@{jbosshome}/client"> + <include name="jbossws-common.jar"/> + <include name="jbossws-framework.jar"/> + <include name="jbossws-spi.jar"/> + </fileset> + +  + <fileset dir="@{jbosshome}/server/${jboss.server.instance}/lib"> + <include name="jbossws-common.jar"/> + <include name="jbossws-framework.jar"/> + <include name="jbossws-spi.jar"/> + </fileset> + </delete> + </sequential> + </macrodef> + +</project> \ No newline at end of file Modified: trunk/integration/xfire/ant-import/macros-deploy-xfire.xml =================================================================== --- trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -19,7 +19,6 @@  <macrodef name="macro-deploy-xfire50"> - <attribute name="wsflibs"/> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> @@ -27,9 +26,6 @@  <copy todir="${jboss50.home}/client" overwrite="true"> - <fileset dir="@{wsflibs}"> - <include name="jbossws-framework.jar"/> - </fileset> <fileset dir="@{thirdpartylibs}"> <include name="jbossws-jboss50.jar"/> <include name="jaxb-api.jar"/> @@ -96,7 +92,6 @@ </macrodef> <macrodef name="macro-deploy-xfire42"> - <attribute name="wsflibs"/> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> @@ -104,12 +99,8 @@  <copy todir="${jboss42.home}/client" overwrite="true"> - <fileset dir="@{wsflibs}"> - <include name="jbossws-framework.jar"/> - </fileset> <fileset dir="@{thirdpartylibs}"> <include name="jbossws-jboss42.jar"/> - <include name="jbossws-spi.jar"/> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="jaxb-xjc.jar"/> Modified: trunk/integration/xfire/build.xml =================================================================== --- trunk/integration/xfire/build.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/integration/xfire/build.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -41,7 +41,6 @@  <target name="init" depends="prepare,thirdparty"> - <ant antfile="${framework.dir}/build.xml" target="jars" inheritall="false"/> <mkdir dir="${xfire.output.apidocs.dir}"/> </target> @@ -149,14 +148,12 @@ <include name="jbossws-context.war"/> </fileset> - <fileset dir="${framework.dir}/thirdparty"> - <include name="jaxrpc-api.jar"/> - </fileset> <fileset dir="${thirdparty.dir}"> <include name="cxf-incubator.jar"/> <include name="geronimo-ws-metadata.jar"/> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> + <include name="jaxrpc-api.jar"/> <include name="jaxws-api.jar"/> <include name="jdom.jar"/> <include name="neethi.jar"/> @@ -203,9 +200,6 @@ <fileset dir="${xfire.output.lib.dir}"> <include name="jbossws-context.war"/> </fileset> - <fileset dir="${framework.dir}/thirdparty"> - <include name="jaxrpc-api.jar"/> - </fileset> <fileset dir="${xfire.output.lib.dir}"> <include name="jbossws-xfire.jar"/> </fileset> @@ -215,6 +209,7 @@ <include name="geronimo-ws-metadata.jar"/> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> + <include name="jaxrpc-api.jar"/> <include name="jaxws-api.jar"/> <include name="jdom.jar"/> <include name="neethi.jar"/> @@ -250,9 +245,6 @@ <javadoc destdir="${xfire.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API ${version.id} "> <classpath> <pathelement path="${xfire.integration.classpath}"/> - <fileset dir="${framework.dir}/thirdparty"> - <include name="**/*.jar"/> - </fileset> </classpath> <packageset dir="${xfire.java.dir}" defaultexcludes="yes"> <include name="org/jboss/wsf/**"/> @@ -260,10 +252,6 @@ <packageset dir="${xfire.output.dir}/thirdparty-sources" defaultexcludes="yes"> <include name="org/codehaus/**"/> </packageset> - <packageset dir="${framework.dir}/src/main/java"> - <include name="org/jboss/wsf/**"/> - <include name="org/jboss/ws/**"/> - </packageset> <doctitle><![CDATA[<h1>JBoss Web Service Framework ${version.id} - Stack integration XFire</h1>]]></doctitle> <tag name="todo" scope="all" description="To do:"/>  Modified: trunk/integration/xfire/version.properties =================================================================== --- trunk/integration/xfire/version.properties 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/integration/xfire/version.properties 2007-08-03 05:11:33 UTC (rev 4129) @@ -5,6 +5,7 @@ # Thirdparty library versions jbossws-common=2.0.1.CR1 +jbossws-framework=2.0.1.CR1 jbossws-spi=2.0.1.CR1 jbossws-jboss50=2.0.1.CR1 jbossws-jboss42=2.0.1.CR1 @@ -12,6 +13,9 @@ apache-cxf=2.0 apache-xml-commons=1.2 ibm-wsdl4j=1.6.2 +jboss-common-core=2.0.2.GA +jboss-common-logging-spi=2.0.2.GA +jboss-javaee=5.0.0-SNAPSHOT jboss-jaxr=1.2.0.GA jboss-security-spi=2.0.0.Beta Modified: trunk/jbossws-core/ant-import/build-bin-dist.xml =================================================================== --- trunk/jbossws-core/ant-import/build-bin-dist.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/jbossws-core/ant-import/build-bin-dist.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -51,16 +51,16 @@ <fileset dir="${build.dir}/ant-import"> <include name="build-testsuite.xml"/> </fileset> - <fileset dir="${int.native.dir}/ant-import"> + <fileset dir="${core.dir}/ant-import"> + <include name="macros-deploy-framework.xml"/> <include name="macros-deploy-native.xml"/> </fileset> <fileset dir="${int.sunri.dir}/ant-import"> + <include name="macros-deploy-framework.xml"/> <include name="macros-deploy-sunri.xml"/> </fileset> - <fileset dir="${framework.dir}/ant-import"> - <include name="macros-deploy-spi.xml"/> - </fileset> <fileset dir="${int.xfire.dir}/ant-import"> + <include name="macros-deploy-framework.xml"/> <include name="macros-deploy-xfire.xml"/> </fileset> <fileset dir="${testsuite.dir}/ant-import"> Modified: trunk/jbossws-core/ant-import/build-deploy.xml =================================================================== --- trunk/jbossws-core/ant-import/build-deploy.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/jbossws-core/ant-import/build-deploy.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -13,8 +13,8 @@ <project> + <import file="${core.dir}/ant-import/macros-deploy-framework.xml"/> <import file="${core.dir}/ant-import/macros-deploy-native.xml"/> - <import file="${framework.dir}/ant-import/macros-deploy-wsf.xml"/>   @@ -25,12 +25,10 @@ <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <macro-deploy-native50 - wsflibs="${framework.dir}/output/lib" stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> - <macro-deploy-wsf - wsflibs="${framework.dir}/output/lib" - thirdpartylibs="${framework.dir}/thirdparty" + <macro-deploy-framework + thirdpartylibs="${core.dir}/thirdparty" jbosshome="${jboss50.home}"/>  <target name="undeploy-jboss50" depends="prepare,undeploy-jboss50-endorsed" description="Remove jbossws from jboss50"> <macro-undeploy-native50/> - <macro-undeploy-wsf jbosshome="${jboss50.home}"/> + <macro-undeploy-framework jbosshome="${jboss50.home}"/> </target> <target name="undeploy-jboss50-endorsed" depends="prepare"> @@ -61,12 +59,10 @@ <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> <macro-deploy-native42 - wsflibs="${framework.dir}/output/lib" stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> - <macro-deploy-wsf - wsflibs="${framework.dir}/output/lib" - thirdpartylibs="${framework.dir}/thirdparty" + <macro-deploy-framework + thirdpartylibs="${core.dir}/thirdparty" jbosshome="${jboss42.home}"/>  <target name="undeploy-jboss42" depends="prepare,undeploy-jboss42-endorsed" description="Remove jbossws from jboss42"> <macro-undeploy-native42/> - <macro-undeploy-wsf jbosshome="${jboss42.home}"/> + <macro-undeploy-framework jbosshome="${jboss42.home}"/> </target> <target name="undeploy-jboss42-endorsed" depends="prepare"> <macro-undeploy-endorsed jbosshome="${jboss42.home}"/> @@ -97,12 +93,10 @@ <target name="deploy-jboss40-ejb3"> <macro-deploy-native40 - wsflibs="${framework.dir}/output/lib" stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> - <macro-deploy-wsf - wsflibs="${framework.dir}/output/lib" - thirdpartylibs="${framework.dir}/thirdparty" + <macro-deploy-framework + thirdpartylibs="${core.dir}/thirdparty" jbosshome="${jboss40.home}"/> </target> @@ -119,6 +113,6 @@  <target name="undeploy-jboss40" depends="prepare" description="Remove jbossws from jboss40"> <macro-undeploy-native40/> - <macro-undeploy-wsf jbosshome="${jboss40.home}"/> + <macro-undeploy-framework jbosshome="${jboss40.home}"/> </target> </project> Modified: trunk/jbossws-core/ant-import/build-testsuite.xml =================================================================== --- trunk/jbossws-core/ant-import/build-testsuite.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/jbossws-core/ant-import/build-testsuite.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -27,8 +27,8 @@ <target name="tests-init" depends="tests-classpath"> <path id="ws.stack.classpath"> - <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/> <pathelement location="${core.dir}/thirdparty/jbossws-common.jar"/> + <pathelement location="${core.dir}/thirdparty/jbossws-framework.jar"/> <pathelement location="${core.dir}/thirdparty/jbossws-spi.jar"/> <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/> Modified: trunk/jbossws-core/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -42,6 +42,17 @@ description="Gets the thirdparty libraries"> <mkdir dir="${thirdparty.dir}"/> + <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework.jar" dest="${thirdparty.dir}/jbossws-framework.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-scripts.zip" dest="${thirdparty.dir}/jbossws-framework-scripts.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40.jar" dest="${thirdparty.dir}/jbossws-jboss40.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40-resources.zip" dest="${thirdparty.dir}/jbossws-jboss40-resources.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50-deployer.zip" dest="${thirdparty.dir}/jbossws-jboss50-deployer.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-collections/${apache-collections}/lib/commons-collections.jar" dest="${thirdparty.dir}/commons-collections.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/> @@ -67,14 +78,6 @@ <get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs.jar" dest="${thirdparty.dir}/jboss-vfs.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs-sources.jar" dest="${thirdparty.dir}/jboss-vfs-sources.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40.jar" dest="${thirdparty.dir}/jbossws-jboss40.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40-resources.zip" dest="${thirdparty.dir}/jbossws-jboss40-resources.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50-deployer.zip" dest="${thirdparty.dir}/jbossws-jboss50-deployer.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/> @@ -123,7 +126,10 @@  <path id="thirdparty.classpath"> - <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-framework.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> + <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/> <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/> <pathelement location="${thirdparty.dir}/ant.jar"/> @@ -144,8 +150,6 @@ <pathelement location="${thirdparty.dir}/jboss-remoting.jar"/> <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/> <pathelement location="${thirdparty.dir}/jbosssx.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> <pathelement location="${thirdparty.dir}/mail.jar"/> <pathelement location="${thirdparty.dir}/policy.jar"/> <pathelement location="${thirdparty.dir}/servlet-api.jar"/> Added: trunk/jbossws-core/ant-import/macros-deploy-framework.xml =================================================================== --- trunk/jbossws-core/ant-import/macros-deploy-framework.xml (rev 0) +++ trunk/jbossws-core/ant-import/macros-deploy-framework.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + + <macrodef name="macro-deploy-framework"> + <attribute name="thirdpartylibs"/> + <attribute name="jbosshome"/> + <sequential> + +  + <unzip dest="@{jbosshome}/bin" src="@{thirdpartylibs}/jbossws-framework-scripts.zip"/> + <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/> + +  + <copy todir="@{jbosshome}/client"> + <fileset dir="@{thirdpartylibs}"> + <include name="jbossws-common.jar"/> + <include name="jbossws-framework.jar"/> + <include name="jbossws-spi.jar"/> + </fileset> + </copy> + +  + <copy todir="@{jbosshome}/server/${jboss.server.instance}/lib"> + <fileset dir="@{thirdpartylibs}"> + <include name="jbossws-common.jar"/> + <include name="jbossws-framework.jar"/> + <include name="jbossws-spi.jar"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <macrodef name="macro-undeploy-framework"> + <attribute name="jbosshome"/> + <sequential> + <delete> +  + <fileset dir="@{jbosshome}/bin"> + <include name="wsconsume.*"/> + <include name="wsprovide.*"/> + </fileset> + +  + <fileset dir="@{jbosshome}/client"> + <include name="jbossws-common.jar"/> + <include name="jbossws-framework.jar"/> + <include name="jbossws-spi.jar"/> + </fileset> + +  + <fileset dir="@{jbosshome}/server/${jboss.server.instance}/lib"> + <include name="jbossws-common.jar"/> + <include name="jbossws-framework.jar"/> + <include name="jbossws-spi.jar"/> + </fileset> + </delete> + </sequential> + </macrodef> + +</project> \ No newline at end of file Modified: trunk/jbossws-core/ant-import/macros-deploy-native.xml =================================================================== --- trunk/jbossws-core/ant-import/macros-deploy-native.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/jbossws-core/ant-import/macros-deploy-native.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -18,7 +18,6 @@  <macrodef name="macro-deploy-native50"> - <attribute name="wsflibs"/> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> @@ -123,7 +122,6 @@ </macrodef> <macrodef name="macro-deploy-native42"> - <attribute name="wsflibs"/> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> @@ -225,7 +223,6 @@ </macrodef> <macrodef name="macro-deploy-native40"> - <attribute name="wsflibs"/> <attribute name="stacklibs"/> <attribute name="thirdpartylibs"/> <sequential> Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -28,15 +28,14 @@ <target name="tests-init" depends="thirdparty-classpath,tests-classpath"> <path id="ws.stack.classpath"> - <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/> - <pathelement location="${framework.dir}/thirdparty/jbossws-common.jar"/> - <pathelement location="${framework.dir}/thirdparty/jbossws-spi.jar"/> + <pathelement location="${core.dir}/thirdparty/jbossws-common.jar"/> + <pathelement location="${core.dir}/thirdparty/jbossws-framework.jar"/> + <pathelement location="${core.dir}/thirdparty/jbossws-spi.jar"/> <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/> <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/> <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> <pathelement location="${core.dir}/output/lib/jbossws-client.jar"/> - <pathelement location="${core.dir}/thirdparty/jbossws-spi.jar"/> <pathelement location="${core.dir}/thirdparty/policy.jar"/> <pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/> <pathelement location="${core.dir}/thirdparty/wstx.jar"/> Modified: trunk/jbossws-core/build.xml =================================================================== --- trunk/jbossws-core/build.xml 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/jbossws-core/build.xml 2007-08-03 05:11:33 UTC (rev 4129) @@ -33,7 +33,6 @@ <property name="core.output.lib.dir" value="${core.output.dir}/lib"/> <target name="init" depends="prepare,thirdparty-get"> - <ant antfile="${framework.dir}/build.xml" target="jars" inheritall="false"/> </target>  Modified: trunk/jbossws-core/version.properties =================================================================== --- trunk/jbossws-core/version.properties 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/jbossws-core/version.properties 2007-08-03 05:11:33 UTC (rev 4129) @@ -7,6 +7,7 @@ javassist=3.5.0.CR1 jbpm-bpel=1.1.0.Beta5 jbossws-common=2.0.1.CR1 +jbossws-framework=2.0.1.CR1 jbossws-spi=2.0.1.CR1 jbossws-jboss50=2.0.1.CR1 jbossws-jboss42=2.0.1.CR1 Modified: trunk/testsuite/src/resources/jaxws/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl =================================================================== --- trunk/testsuite/src/resources/jaxws/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl 2007-08-03 04:08:01 UTC (rev 4128) +++ trunk/testsuite/src/resources/jaxws/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl 2007-08-03 05:11:33 UTC (rev 4129) @@ -26,7 +26,7 @@ </binding> <service name='TestEndpointService'> <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='http://@jboss.bind.address@:8080/jaxws-serviceref'/> + <soap:address location='http://@jboss.bind.address@:8080/jaxws-samples-serviceref'/> </port> </service> </definitions> \ No newline at end of file

18 years, 8 months

1
0
0 / 0

JBossWS SVN: r4128 - in framework: trunk and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-03 00:08:01 -0400 (Fri, 03 Aug 2007) New Revision: 4128 Added: framework/trunk/ framework/trunk/ant-import/build-setup.xml framework/trunk/ant.properties.example framework/trunk/version.properties Removed: framework/trunk/build.bat framework/trunk/build.sh framework/trunk/spi.iml Modified: framework/trunk/.project framework/trunk/ant-import/build-release.xml framework/trunk/ant-import/build-thirdparty.xml framework/trunk/build.xml Log: Initial commit Copied: framework/trunk (from rev 4126, trunk/integration/spi) Property changes on: framework/trunk ___________________________________________________________________ Name: svn:ignore + output* thirdparty version.properties.md5 ant.properties Modified: framework/trunk/.project =================================================================== --- trunk/integration/spi/.project 2007-08-02 22:39:33 UTC (rev 4126) +++ framework/trunk/.project 2007-08-03 04:08:01 UTC (rev 4128) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>integration-framework</name> + <name>framework</name> <comment></comment> <projects> </projects> Modified: framework/trunk/ant-import/build-release.xml =================================================================== --- trunk/integration/spi/ant-import/build-release.xml 2007-08-02 22:39:33 UTC (rev 4126) +++ framework/trunk/ant-import/build-release.xml 2007-08-03 04:08:01 UTC (rev 4128) @@ -19,17 +19,17 @@  <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> - <mkdir dir="${jboss.repository.dir}/jbossws/${repository.id}/lib"/> - <copy todir="${jboss.repository.dir}/jbossws-spi/${repository.id}/lib" overwrite="true"> + <mkdir dir="${jboss.repository.dir}/jbossws-framework/${repository.id}/lib"/> + <copy todir="${jboss.repository.dir}/jbossws-framework/${repository.id}/lib" overwrite="true"> <fileset dir="${framework.output.lib.dir}"> <include name="jbossws-framework.jar"/> <include name="jbossws-framework-src.zip"/> <include name="jbossws-framework-scripts.zip"/> </fileset> </copy> - <copy tofile="${jboss.repository.dir}/jbossws-spi/${repository.id}/component-info.xml" file="${framework.etc.dir}/component-info.xml" filtering="true" overwrite="true"> + <copy tofile="${jboss.repository.dir}/jbossws-framework/${repository.id}/component-info.xml" file="${framework.etc.dir}/component-info.xml" filtering="true" overwrite="true"> <filterset> - <filtersfile file="${build.dir}/version.properties"/> + <filtersfile file="${framework.dir}/version.properties"/> </filterset> </copy> Added: framework/trunk/ant-import/build-setup.xml =================================================================== --- framework/trunk/ant-import/build-setup.xml (rev 0) +++ framework/trunk/ant-import/build-setup.xml 2007-08-03 04:08:01 UTC (rev 4128) @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  +  +  + + <property name="framework.dir" value="${basedir}"/> + +  + <available property="ant.properties.available" file="${framework.dir}/ant.properties"/> + <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/> + + <property file="${framework.dir}/ant.properties"/> + <property file="${framework.dir}/version.properties"/> + +  + <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> + <available classname="java.io.Console" property="HAVE_JDK_1.6"/> + + <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/> + +  +  +  + + <target name="prepare"> + <tstamp> + <format property="build.id" pattern="yyyyMMddHHmm"/> + </tstamp> + </target> + +</project> \ No newline at end of file Modified: framework/trunk/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/spi/ant-import/build-thirdparty.xml 2007-08-02 22:39:33 UTC (rev 4126) +++ framework/trunk/ant-import/build-thirdparty.xml 2007-08-03 04:08:01 UTC (rev 4128) @@ -13,8 +13,6 @@ <project> - <property file="${core.dir}/version.properties"/> -    @@ -22,7 +20,7 @@ <target name="thirdparty-init" depends="prepare"> <property name="thirdparty.dir" value="${framework.dir}/thirdparty"/> - <checksum file="${build.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> + <checksum file="${framework.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> <condition property="force.thirdparty"> <or> <not> @@ -38,51 +36,27 @@ <target name="thirdparty-get" depends="thirdparty-init" if="force.thirdparty" description="Gets the thirdparty libraries"> <mkdir dir="${thirdparty.dir}"/> - <get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j-src.jar" dest="${thirdparty.dir}/wsdl4j-src.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/gnu-getopt/${gnu-getopt}/lib/getopt.jar" dest="${thirdparty.dir}/getopt.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jboss-javaee/${jboss-javaee}/lib/jboss-javaee.jar" dest="${thirdparty.dir}/jboss-javaee.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency-src.zip" dest="${thirdparty.dir}/jboss-dependency-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers.jar" dest="${thirdparty.dir}/jboss-deployers.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers-src.zip" dest="${thirdparty.dir}/jboss-deployers-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip" dest="${thirdparty.dir}/jboss-microcontainer-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api.jar" dest="${thirdparty.dir}/stax-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxrpc/${sun-jaxrpc}/lib/jaxrpc-api.jar" dest="${thirdparty.dir}/jaxrpc-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr181-api.jar" dest="${thirdparty.dir}/jsr181-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/saaj-api.jar" dest="${thirdparty.dir}/saaj-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/streambuffer.jar" dest="${thirdparty.dir}/streambuffer.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/stax-ex.jar" dest="${thirdparty.dir}/stax-ex.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaxrpc/${sun-jaxrpc}/lib/jaxrpc-api.jar" dest="${thirdparty.dir}/jaxrpc-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> - <checksum file="${build.dir}/version.properties" fileext=".md5"/> + <checksum file="${framework.dir}/version.properties" fileext=".md5"/> </target> <target name="thirdparty-classpath" depends="thirdparty-get">  <path id="spi.thirdparty.classpath"> - <pathelement location="${thirdparty.dir}/ant.jar"/> - <pathelement location="${thirdparty.dir}/activation.jar"/> <pathelement location="${thirdparty.dir}/dom4j.jar"/> - <pathelement location="${thirdparty.dir}/getopt.jar"/> <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/> <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/> <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/> @@ -92,11 +66,8 @@ <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> <pathelement location="${thirdparty.dir}/jaxrpc-api.jar"/> <pathelement location="${thirdparty.dir}/jsr181-api.jar"/> - <pathelement location="${thirdparty.dir}/junit.jar"/> - <pathelement location="${thirdparty.dir}/servlet-api.jar"/> <pathelement location="${thirdparty.dir}/saaj-api.jar"/> </path> Added: framework/trunk/ant.properties.example =================================================================== --- framework/trunk/ant.properties.example (rev 0) +++ framework/trunk/ant.properties.example 2007-08-03 04:08:01 UTC (rev 4128) @@ -0,0 +1,20 @@ +# +# A sample ant properties file +# +# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $ + +# JBoss Repository +#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository +jboss.repository=http://repository.jboss.org + +# JBossWS Release +jboss.local.repository=/home/tdiesler/svn/jboss.local.repository + +# Force thirdparty HTTP get +#force.thirdparty.get=true + +# Java Compiler options +javac.debug=yes +javac.deprecation=no +javac.fail.onerror=yes +javac.verbose=no Deleted: framework/trunk/build.bat =================================================================== --- trunk/integration/spi/build.bat 2007-08-02 22:39:33 UTC (rev 4126) +++ framework/trunk/build.bat 2007-08-03 04:08:01 UTC (rev 4128) @@ -1,109 +0,0 @@ -@echo off - -REM ====================================================================== -REM -REM This is the main entry point for the build system. -REM -REM Users should be sure to execute this file rather than 'ant' to ensure -REM the correct version is being used with the correct configuration. -REM -REM NOTE: Uncomment the USE_JDK6 property when using JDK 1.6 -REM -REM ====================================================================== -REM -REM $Id: build.bat 61858 2007-03-29 17:19:26Z dimitris(a)jboss.org $ - -REM ****************************************************** -REM Ignore the ANT_HOME variable: we want to use *our* -REM ANT version and associated JARs. -REM ****************************************************** -REM Ignore the users classpath, cause it might mess -REM things up -REM ****************************************************** - -SETLOCAL - -set NOPAUSE=true -set CLASSPATH= -set ANT_HOME= - -set ANT_OPTS=-Xmx256m -Dbuild.script=build.bat - -REM ****************************************************** -REM JDK 6 Settings -REM Uncomment when using JDK 6 -REM ****************************************************** -REM set USE_JDK6=true - -REM -REM - "for" loops have been unrolled for compatibility -REM with some WIN32 systems. -REM ****************************************************** - -set NAMES=build\tools;build\tools\ant;build\tools\apache\ant -set SUBFOLDERS=..;..\..;..\..\..;..\..\..\.. - -REM ****************************************************** -REM ********Save the command line arguments*************** -REM ****************************************************** -set BUILD_ARGS=%1 -if ""%1""=="""" goto completedArgs -shift -:processArg -if ""%1""=="""" goto completedArgs -set BUILD_ARGS=%BUILD_ARGS% %1 -shift -goto processArg - -:completedArgs - -REM ****************************************************** -REM ****************************************************** - -SET EXECUTED=FALSE -for %%i in (%NAMES%) do call :subLoop %%i %BUILD_ARGS% - -goto :EOF - -REM ****************************************************** -REM ********* Search for names in the subfolders ********* -REM ****************************************************** - -:subLoop -for %%j in (%SUBFOLDERS%) do call :testIfExists %%j\%1\bin\ant.bat %BUILD_ARGS% - -goto :EOF - -REM ****************************************************** -REM ************ Test if ANT Batch file exists *********** -REM ****************************************************** - -:testIfExists -if exist %1 call :BatchFound %1 %BUILD_ARGS% - -goto :EOF - -REM ****************************************************** -REM ************** Batch file has been found ************* -REM ****************************************************** - -:BatchFound -if (%EXECUTED%)==(FALSE) call :ExecuteBatch %1 %BUILD_ARGS% -set EXECUTED=TRUE - -goto :EOF - -REM ****************************************************** -REM ************* Execute Batch file only once *********** -REM ****************************************************** - -:ExecuteBatch -echo Calling %1 %BUILD_ARGS% - -REM set ENDORSED= -call %1 %BUILD_ARGS% - -:end - -if "%NOPAUSE%" == "" pause - Deleted: framework/trunk/build.sh =================================================================== --- trunk/integration/spi/build.sh 2007-08-02 22:39:33 UTC (rev 4126) +++ framework/trunk/build.sh 2007-08-03 04:08:01 UTC (rev 4128) @@ -1,183 +0,0 @@ -#!/bin/sh -### ====================================================================== ### -## ## -## This is the main entry point for the build system. ## -## ## -## Users should be sure to execute this file rather than 'ant' to ensure ## -## the correct version is being used with the correct configuration. ## -## ## -## NOTE: Uncomment the JDK6 property if you are running JDK 1.6 ## -## ## -### ====================================================================== ### - -# $Id: build.sh 60589 2007-02-16 16:37:13Z jfrederic.clere(a)jboss.com $ - -PROGNAME=`basename $0` -DIRNAME=`dirname $0` -GREP="grep" -ROOT="/" - -# Ignore user's ANT_HOME if it is set -ANT_HOME="" - -# Uncomment when using JDK 6 -#USE_JDK6=true - -# the default search path for ant -ANT_SEARCH_PATH="\ - tools - tools/ant \ - tools/apache/ant \ - ant \ - ../build/tools/ant \ - ../../build/tools/ant \ - ../../../build/tools/ant " - -# the default build file name -ANT_BUILD_FILE="build.xml" - -# the default arguments -ANT_OPTIONS="--noconfig -find $ANT_BUILD_FILE" - -# Use the maximum available, or set MAX_FD != -1 to use that -MAX_FD="maximum" - -# OS specific support (must be 'true' or 'false'). -cygwin=false; -darwin=false; -case "`uname`" in - CYGWIN*) - cygwin=true - ;; - - Darwin*) - darwin=true - ;; -esac - -# -# Helper to complain. -# -die() { - echo "${PROGNAME}: $*" - exit 1 -} - -# -# Helper to complain. -# -warn() { - echo "${PROGNAME}: $*" -} - -# -# Helper to source a file if it exists. -# -maybe_source() { - for file in $*; do - if [ -f "$file" ]; then - . $file - fi - done -} - -search() { - search="$*" - for d in $search; do - ANT_HOME="`pwd`/$d" - ANT="$ANT_HOME/bin/ant" - if [ -x "$ANT" ]; then - # found one - echo $ANT_HOME - break - fi - done -} - -# -# Main function. -# -main() { - # if there is a build config file. then source it - maybe_source "$DIRNAME/build.conf" "../build/build.conf" "../../build/build.conf" "../../../build/build.conf" - - # Increase the maximum file descriptors if we can - if [ $cygwin = "false" ]; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ]; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then - # use the system max - MAX_FD="$MAX_FD_LIMIT" - fi - - ulimit -n $MAX_FD - if [ $? -ne 0 ]; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query system maximum file descriptor limit: $MAX_FD_LIMIT" - fi - fi - - # try the search path - ANT_HOME=`search $ANT_SEARCH_PATH` - - # try looking up to root - if [ "x$ANT_HOME" = "x" ]; then - target="build" - _cwd=`pwd` - - while [ "x$ANT_HOME" = "x" ] && [ "$cwd" != "$ROOT" ]; do - cd .. - cwd=`pwd` - ANT_HOME=`search $ANT_SEARCH_PATH` - done - - # make sure we get back - cd $_cwd - - if [ "$cwd" != "$ROOT" ]; then - found="true" - fi - - # complain if we did not find anything - if [ "$found" != "true" ]; then - die "Could not locate Ant; check \$ANT or \$ANT_HOME." - fi - fi - - # make sure we have one - ANT=$ANT_HOME/bin/ant - if [ ! -x "$ANT" ]; then - die "Ant file is not executable: $ANT" - fi - - # Set the max memory to 256m - ANT_OPTS=-Xmx256m - - if [ "x$USE_JDK6" = "xtrue" ]; then - ANT_OPTS="$ANT_OPTS -Djava.endorsed.dirs=$ANT_HOME/endorsed" - echo "--------------------------------------" - echo "Endorsed Directory: $ANT_HOME/endorsed" - echo "--------------------------------------" - fi - - # setup some build properties - ANT_OPTS="$ANT_OPTS -Dbuild.script=$0" - - # change to the directory where the script lives so users are not forced - # to be in the same directory as build.xml - cd $DIRNAME - - # export some stuff for ant - export ANT ANT_HOME ANT_OPTS - - # run ant - $ANT $ANT_OPTIONS "$@" -} - -## -## Bootstrap -## - -main "$@" Modified: framework/trunk/build.xml =================================================================== --- trunk/integration/spi/build.xml 2007-08-02 22:39:33 UTC (rev 4126) +++ framework/trunk/build.xml 2007-08-03 04:08:01 UTC (rev 4128) @@ -11,13 +11,12 @@  -<project default="main" basedir="../.."> +<project default="main" basedir="."> - <import file="${basedir}/build/ant-import/build-setup.xml"/> + <import file="${basedir}/ant-import/build-setup.xml"/> + <import file="${basedir}/ant-import/build-release.xml"/> + <import file="${basedir}/ant-import/build-thirdparty.xml"/> - <import file="${framework.dir}/ant-import/build-release.xml"/> - <import file="${framework.dir}/ant-import/build-thirdparty.xml"/> -    @@ -76,7 +75,7 @@ <filter token="java.vm.vendor" value="${java.vm.vendor}"/> <filter token="build.id" value="${build.id}"/> <filter token="implementation.version" value="jbossws-${version.id}"/> - <filtersfile file="${build.dir}/version.properties"/> + <filtersfile file="${framework.dir}/version.properties"/> </filterset> </copy> </target> @@ -100,9 +99,7 @@ <mkdir dir="${framework.output.lib.dir}"/> <jar jarfile="${framework.output.lib.dir}/jbossws-framework.jar" manifest="${framework.output.etc.dir}/default.mf"> <fileset dir="${framework.output.classes.dir}"> - <include name="org/jboss/wsf/common/**"/> <include name="org/jboss/wsf/framework/**"/> - <include name="org/jboss/wsf/test/**"/> </fileset> </jar> Deleted: framework/trunk/spi.iml =================================================================== --- trunk/integration/spi/spi.iml 2007-08-02 22:39:33 UTC (rev 4126) +++ framework/trunk/spi.iml 2007-08-03 04:08:01 UTC (rev 4128) @@ -1,294 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module version="4" relativePaths="true" type="JAVA_MODULE"> - <component name="ModuleRootManager" /> - <component name="NewModuleRootManager" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/classes" /> - <exclude-output /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jboss-common-core-sources.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jboss-logging-log4j.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jboss-container.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jboss-common-core.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jboss-xml-binding.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jboss-javaee.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/servlet-api.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/junit.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jboss-dependency.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/stax-api.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jboss-xml-binding-sources.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/wsdl4j.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jaxws-api.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jaxrpc-api.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jboss-microcontainer.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jaxb-xjc.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/activation.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jsr181-api.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jboss-microcontainer-src.zip!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jboss-deployers-src.zip!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jaxb-impl.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jboss-deployers.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jaxb-api.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/wsdl4j-src.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/streambuffer.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/getopt.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/dom4j.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/ant.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/saaj-api.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jboss-logging-spi.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jboss-dependency-src.zip!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntryProperties /> - </component> -</module> - Added: framework/trunk/version.properties =================================================================== --- framework/trunk/version.properties (rev 0) +++ framework/trunk/version.properties 2007-08-03 04:08:01 UTC (rev 4128) @@ -0,0 +1,27 @@ + +# $Id: version.properties 3956 2007-07-19 18:03:54Z thomas.diesler(a)jboss.com $ + +specification.title=JBossWS +specification.vendor=JBoss (http://www.jboss.org) +specification.version=jbossws-2.0 + +version.id=2.0.1.CR1 +repository.id=2.0.1.CR1 + +implementation.title=JBoss Web Services - Common +implementation.url=http://www.jboss.org/products/jbossws +implementation.vendor=JBoss Inc. +implementation.vendor.id=http://www.jboss.org + +# Thirdparty library versions +jbossws-common=2.0.1.CR1 +jbossws-spi=2.0.1.CR1 + +dom4j=1.6.1 +jboss-common-core=2.0.2.GA +jboss-common-logging-spi=2.0.2.GA +jboss-javaee=5.0.0-SNAPSHOT +jboss-microcontainer=2.0.0.Beta3 +jboss-jbossxb=1.0.0.GA +sun-jaxrpc=1.1 +sun-jaxws=2.1.1

18 years, 8 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits August 2007