[jbossws-commits] JBossWS SVN: r4201 - framework/trunk/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2 and 14 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Sat Aug 4 08:08:00 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-08-04 08:07:59 -0400 (Sat, 04 Aug 2007)
New Revision: 4201
Added:
common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java
common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfigMBean.java
Removed:
common/trunk/src/main/java/org/jboss/wsf/common/management/DefaultServerConfig.java
common/trunk/src/main/java/org/jboss/wsf/common/management/DefaultServerConfigMBean.java
Modified:
framework/trunk/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml
framework/trunk/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml
framework/trunk/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml
stack/cxf/trunk/ant.properties.example
stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/xfire/CXFServerConfig.java
stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/xfire/CXFServerConfigMBean.java
stack/cxf/trunk/version.properties
stack/metro/trunk/ant.properties.example
stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/MetroServerConfig.java
stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/MetroServerConfigMBean.java
stack/metro/trunk/version.properties
stack/native/trunk/ant.properties.example
stack/native/trunk/build.xml
stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/NativeServerConfig.java
stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/NativeServerConfigMBean.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/AddressRewriteTestCase.java
Log:
Use AbstractServerConfig
Copied: common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java (from rev 4196, common/trunk/src/main/java/org/jboss/wsf/common/management/DefaultServerConfig.java)
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java (rev 0)
+++ common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java 2007-08-04 12:07:59 UTC (rev 4201)
@@ -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 at jboss.org
+ * @author darran.lofthouse at jboss.com
+ * @since 08-May-2006
+ */
+public abstract class AbstractServerConfig implements AbstractServerConfigMBean, ServerConfig
+{
+ private static final Logger log = Logger.getLogger(AbstractServerConfig.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, AbstractServerConfigMBean.OBJECT_NAME);
+ }
+
+ public void destroy() throws Exception
+ {
+ getMbeanServer().unregisterMBean(AbstractServerConfigMBean.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/AbstractServerConfigMBean.java (from rev 4196, common/trunk/src/main/java/org/jboss/wsf/common/management/DefaultServerConfigMBean.java)
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfigMBean.java (rev 0)
+++ common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfigMBean.java 2007-08-04 12:07:59 UTC (rev 4201)
@@ -0,0 +1,37 @@
+/*
+ * 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 AbstractServerConfigMBean extends ServerConfig
+{
+ /** The object name in the MBean server */
+ ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=ServerConfig");
+
+ String getImplementationTitle();
+
+ String getImplementationVersion();
+}
Deleted: common/trunk/src/main/java/org/jboss/wsf/common/management/DefaultServerConfig.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/management/DefaultServerConfig.java 2007-08-04 11:47:17 UTC (rev 4200)
+++ common/trunk/src/main/java/org/jboss/wsf/common/management/DefaultServerConfig.java 2007-08-04 12:07:59 UTC (rev 4201)
@@ -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.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 at jboss.org
- * @author darran.lofthouse at 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: common/trunk/src/main/java/org/jboss/wsf/common/management/DefaultServerConfigMBean.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/management/DefaultServerConfigMBean.java 2007-08-04 11:47:17 UTC (rev 4200)
+++ common/trunk/src/main/java/org/jboss/wsf/common/management/DefaultServerConfigMBean.java 2007-08-04 12:07:59 UTC (rev 4201)
@@ -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.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: framework/trunk/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml 2007-08-04 11:47:17 UTC (rev 4200)
+++ framework/trunk/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml 2007-08-04 12:07:59 UTC (rev 4201)
@@ -10,7 +10,9 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
-STACKNATIVE=$WORKSPACE/stack-metro
+STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=@jboss.bind.address@
JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/@hudson.jboss50.build@
JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/@hudson.jboss42.build@
@@ -25,7 +27,7 @@
#
# Undeploy stack-native
#
-cd $STACKNATIVE
+cd $STACKMETRO
cp ant.properties.example ant.properties
./build.sh $ENVIRONMENT undeploy-jboss42
@@ -39,7 +41,7 @@
#
# Build distro
#
-cd $STACKNATIVE
+cd $STACKMETRO
cp ant.properties.example ant.properties
./build.sh $ENVIRONMENT clean build-bin-dist
Modified: framework/trunk/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml 2007-08-04 11:47:17 UTC (rev 4200)
+++ framework/trunk/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml 2007-08-04 12:07:59 UTC (rev 4201)
@@ -10,7 +10,9 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
-STACKNATIVE=$WORKSPACE/stack-metro
+STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=@jboss.bind.address@
JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/@hudson.jboss50.build@
JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/@hudson.jboss42.build@
@@ -25,14 +27,14 @@
#
# Build distro
#
-cd $STACKNATIVE
+cd $STACKMETRO
cp ant.properties.example ant.properties
./build.sh $ENVIRONMENT clean build-bin-dist
#
# Undeploy stack-native
#
-cd $STACKNATIVE
+cd $STACKMETRO
cp ant.properties.example ant.properties
./build.sh $ENVIRONMENT undeploy-jboss50
Modified: framework/trunk/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml 2007-08-04 11:47:17 UTC (rev 4200)
+++ framework/trunk/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml 2007-08-04 12:07:59 UTC (rev 4201)
@@ -10,7 +10,9 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
-STACKNATIVE=$WORKSPACE/stack-cxf
+STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=@jboss.bind.address@
JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/@hudson.jboss50.build@
JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/@hudson.jboss42.build@
@@ -25,7 +27,7 @@
#
# Undeploy stack-native
#
-cd $STACKNATIVE
+cd $STACKCXF
cp ant.properties.example ant.properties
./build.sh $ENVIRONMENT undeploy-jboss42
@@ -39,7 +41,7 @@
#
# Build distro
#
-cd $STACKNATIVE
+cd $STACKCXF
cp ant.properties.example ant.properties
./build.sh $ENVIRONMENT clean build-bin-dist
Modified: framework/trunk/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml 2007-08-04 11:47:17 UTC (rev 4200)
+++ framework/trunk/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml 2007-08-04 12:07:59 UTC (rev 4201)
@@ -10,7 +10,9 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
-STACKNATIVE=$WORKSPACE/stack-cxf
+STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=@jboss.bind.address@
JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/@hudson.jboss50.build@
JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/@hudson.jboss42.build@
@@ -25,14 +27,14 @@
#
# Build distro
#
-cd $STACKNATIVE
+cd $STACKCXF
cp ant.properties.example ant.properties
./build.sh $ENVIRONMENT clean build-bin-dist
#
# Undeploy stack-native
#
-cd $STACKNATIVE
+cd $STACKCXF
cp ant.properties.example ant.properties
./build.sh $ENVIRONMENT undeploy-jboss50
Modified: framework/trunk/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-08-04 11:47:17 UTC (rev 4200)
+++ framework/trunk/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-08-04 12:07:59 UTC (rev 4201)
@@ -10,7 +10,9 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=@jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/@hudson.jboss42.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=@jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
@@ -23,7 +25,7 @@
#
# Undeploy stack-native
#
-cd $STACKNATIVE
+cd $STACKMETRO
cp ant.properties.example ant.properties
./build.sh $ENVIRONMENT undeploy-jboss42
Modified: framework/trunk/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-08-04 11:47:17 UTC (rev 4200)
+++ framework/trunk/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-08-04 12:07:59 UTC (rev 4201)
@@ -10,7 +10,9 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
STACKMETRO=$WORKSPACE/stack-metro
+STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=@jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/@hudson.jboss50.build@
ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=@jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE"
@@ -23,7 +25,7 @@
#
# Undeploy stack-native
#
-cd $STACKNATIVE
+cd $STACKMETRO
cp ant.properties.example ant.properties
./build.sh $ENVIRONMENT undeploy-jboss50
Modified: framework/trunk/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-08-04 11:47:17 UTC (rev 4200)
+++ framework/trunk/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-08-04 12:07:59 UTC (rev 4201)
@@ -10,6 +10,8 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=@jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/@hudson.jboss42.build@
@@ -23,7 +25,7 @@
#
# Undeploy stack-native
#
-cd $STACKNATIVE
+cd $STACKCXF
cp ant.properties.example ant.properties
./build.sh $ENVIRONMENT undeploy-jboss42
Modified: framework/trunk/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-08-04 11:47:17 UTC (rev 4200)
+++ framework/trunk/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-08-04 12:07:59 UTC (rev 4201)
@@ -10,6 +10,8 @@
WORKSPACE=`pwd`
FRAMEWORKDIR=$WORKSPACE/framework
+STACKNATIVE=$WORKSPACE/stack-native
+STACKMETRO=$WORKSPACE/stack-metro
STACKCXF=$WORKSPACE/stack-cxf
JBOSS_BINDADDR=@jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/@hudson.jboss50.build@
@@ -23,7 +25,7 @@
#
# Undeploy stack-native
#
-cd $STACKNATIVE
+cd $STACKCXF
cp ant.properties.example ant.properties
./build.sh $ENVIRONMENT undeploy-jboss50
Modified: stack/cxf/trunk/ant.properties.example
===================================================================
--- stack/cxf/trunk/ant.properties.example 2007-08-04 11:47:17 UTC (rev 4200)
+++ stack/cxf/trunk/ant.properties.example 2007-08-04 12:07:59 UTC (rev 4201)
@@ -3,6 +3,9 @@
#
# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler at jboss.com $
+# JDK settings
+#java.home.jdk16=/usr/java/jdk1.6
+
# Optional JBoss Home
#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3
#jboss42.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA
Modified: stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/xfire/CXFServerConfig.java
===================================================================
--- stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/xfire/CXFServerConfig.java 2007-08-04 11:47:17 UTC (rev 4200)
+++ stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/xfire/CXFServerConfig.java 2007-08-04 12:07:59 UTC (rev 4201)
@@ -24,7 +24,7 @@
//$Id: DefaultServerConfig.java 4023 2007-07-28 07:14:06Z thomas.diesler at jboss.com $
import org.jboss.logging.Logger;
-import org.jboss.wsf.common.management.DefaultServerConfig;
+import org.jboss.wsf.common.management.AbstractServerConfig;
/**
* Basic implementation of a ServerConfig
@@ -32,7 +32,7 @@
* @author Thomas.Diesler at jboss.org
* @since 08-May-2006
*/
-public class CXFServerConfig extends DefaultServerConfig implements CXFServerConfigMBean
+public class CXFServerConfig extends AbstractServerConfig implements CXFServerConfigMBean
{
private static final Logger log = Logger.getLogger(CXFServerConfig.class);
Modified: stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/xfire/CXFServerConfigMBean.java
===================================================================
--- stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/xfire/CXFServerConfigMBean.java 2007-08-04 11:47:17 UTC (rev 4200)
+++ stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/xfire/CXFServerConfigMBean.java 2007-08-04 12:07:59 UTC (rev 4201)
@@ -23,7 +23,7 @@
//$Id: DefaultServerConfig.java 4023 2007-07-28 07:14:06Z thomas.diesler at jboss.com $
-import org.jboss.wsf.common.management.DefaultServerConfigMBean;
+import org.jboss.wsf.common.management.AbstractServerConfigMBean;
/**
* Basic implementation of a ServerConfig
@@ -31,7 +31,7 @@
* @author Thomas.Diesler at jboss.org
* @since 08-May-2006
*/
-public interface CXFServerConfigMBean extends DefaultServerConfigMBean
+public interface CXFServerConfigMBean extends AbstractServerConfigMBean
{
String getImplementationTitle();
Modified: stack/cxf/trunk/version.properties
===================================================================
--- stack/cxf/trunk/version.properties 2007-08-04 11:47:17 UTC (rev 4200)
+++ stack/cxf/trunk/version.properties 2007-08-04 12:07:59 UTC (rev 4201)
@@ -1,8 +1,18 @@
# $Id: version.properties 2928 2007-04-26 10:53:56Z thomas.diesler at jboss.com $
-sunri.implementation.title=JBoss Web Services - Apache CXF
+specification.title=JBossWS
+specification.vendor=JBoss (http://www.jboss.org)
+specification.version=jbossws-2.0
+version.id=2.1.0.DEV
+repository.id=2.1.0.DEV
+
+implementation.title=JBoss Web Services - Apache CXF
+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-framework=2.0.1.CR1
Modified: stack/metro/trunk/ant.properties.example
===================================================================
--- stack/metro/trunk/ant.properties.example 2007-08-04 11:47:17 UTC (rev 4200)
+++ stack/metro/trunk/ant.properties.example 2007-08-04 12:07:59 UTC (rev 4201)
@@ -3,6 +3,9 @@
#
# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler at jboss.com $
+# JDK settings
+#java.home.jdk16=/usr/java/jdk1.6
+
# Optional JBoss Home
#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3
#jboss42.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA
Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/MetroServerConfig.java
===================================================================
--- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/MetroServerConfig.java 2007-08-04 11:47:17 UTC (rev 4200)
+++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/MetroServerConfig.java 2007-08-04 12:07:59 UTC (rev 4201)
@@ -24,7 +24,7 @@
//$Id: DefaultServerConfig.java 4023 2007-07-28 07:14:06Z thomas.diesler at jboss.com $
import org.jboss.logging.Logger;
-import org.jboss.wsf.common.management.DefaultServerConfig;
+import org.jboss.wsf.common.management.AbstractServerConfig;
/**
* Basic implementation of a ServerConfig
@@ -32,7 +32,7 @@
* @author Thomas.Diesler at jboss.org
* @since 08-May-2006
*/
-public class MetroServerConfig extends DefaultServerConfig implements MetroServerConfigMBean
+public class MetroServerConfig extends AbstractServerConfig implements MetroServerConfigMBean
{
private static final Logger log = Logger.getLogger(MetroServerConfig.class);
Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/MetroServerConfigMBean.java
===================================================================
--- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/MetroServerConfigMBean.java 2007-08-04 11:47:17 UTC (rev 4200)
+++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/MetroServerConfigMBean.java 2007-08-04 12:07:59 UTC (rev 4201)
@@ -23,7 +23,7 @@
//$Id: DefaultServerConfig.java 4023 2007-07-28 07:14:06Z thomas.diesler at jboss.com $
-import org.jboss.wsf.common.management.DefaultServerConfigMBean;
+import org.jboss.wsf.common.management.AbstractServerConfigMBean;
/**
* Basic implementation of a ServerConfig
@@ -31,9 +31,6 @@
* @author Thomas.Diesler at jboss.org
* @since 08-May-2006
*/
-public interface MetroServerConfigMBean extends DefaultServerConfigMBean
+public interface MetroServerConfigMBean extends AbstractServerConfigMBean
{
- String getImplementationTitle();
-
- String getImplementationVersion();
}
Modified: stack/metro/trunk/version.properties
===================================================================
--- stack/metro/trunk/version.properties 2007-08-04 11:47:17 UTC (rev 4200)
+++ stack/metro/trunk/version.properties 2007-08-04 12:07:59 UTC (rev 4201)
@@ -1,8 +1,18 @@
# $Id: version.properties 2928 2007-04-26 10:53:56Z thomas.diesler at jboss.com $
-sunri.implementation.title=JBoss Web Services - JBossWS/SunRI
+specification.title=JBossWS
+specification.vendor=JBoss (http://www.jboss.org)
+specification.version=jbossws-2.0
+version.id=2.1.0.DEV
+repository.id=2.1.0.DEV
+
+implementation.title=JBoss Web Services - Sun Metro
+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-framework=2.0.1.CR1
Modified: stack/native/trunk/ant.properties.example
===================================================================
--- stack/native/trunk/ant.properties.example 2007-08-04 11:47:17 UTC (rev 4200)
+++ stack/native/trunk/ant.properties.example 2007-08-04 12:07:59 UTC (rev 4201)
@@ -3,6 +3,9 @@
#
# $Id$
+# JDK settings
+#java.home.jdk16=/usr/java/jdk1.6
+
# Optional JBoss Home
#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3
#jboss42.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA
Modified: stack/native/trunk/build.xml
===================================================================
--- stack/native/trunk/build.xml 2007-08-04 11:47:17 UTC (rev 4200)
+++ stack/native/trunk/build.xml 2007-08-04 12:07:59 UTC (rev 4201)
@@ -373,7 +373,7 @@
<target name="main" description="Executes the default target (most)." depends="most"/>
- <target name="most" description="Builds almost everything." depends="jars"/>
+ <target name="most" description="Builds almost everything." depends="jars,tests-main"/>
<target name="all" description="Create a distribution zip file" depends="most">
</target>
Modified: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/NativeServerConfig.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/NativeServerConfig.java 2007-08-04 11:47:17 UTC (rev 4200)
+++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/NativeServerConfig.java 2007-08-04 12:07:59 UTC (rev 4201)
@@ -24,7 +24,7 @@
//$Id: DefaultServerConfig.java 4023 2007-07-28 07:14:06Z thomas.diesler at jboss.com $
import org.jboss.logging.Logger;
-import org.jboss.wsf.common.management.DefaultServerConfig;
+import org.jboss.wsf.common.management.AbstractServerConfig;
/**
* Basic implementation of a ServerConfig
@@ -32,7 +32,7 @@
* @author Thomas.Diesler at jboss.org
* @since 08-May-2006
*/
-public class NativeServerConfig extends DefaultServerConfig implements NativeServerConfigMBean
+public class NativeServerConfig extends AbstractServerConfig implements NativeServerConfigMBean
{
private static final Logger log = Logger.getLogger(NativeServerConfig.class);
Modified: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/NativeServerConfigMBean.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/NativeServerConfigMBean.java 2007-08-04 11:47:17 UTC (rev 4200)
+++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/NativeServerConfigMBean.java 2007-08-04 12:07:59 UTC (rev 4201)
@@ -23,7 +23,7 @@
//$Id: DefaultServerConfig.java 4023 2007-07-28 07:14:06Z thomas.diesler at jboss.com $
-import org.jboss.wsf.common.management.DefaultServerConfigMBean;
+import org.jboss.wsf.common.management.AbstractServerConfigMBean;
/**
* Basic implementation of a ServerConfig
@@ -31,7 +31,7 @@
* @author Thomas.Diesler at jboss.org
* @since 08-May-2006
*/
-public interface NativeServerConfigMBean extends DefaultServerConfigMBean
+public interface NativeServerConfigMBean extends AbstractServerConfigMBean
{
String getImplementationTitle();
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/AddressRewriteTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/AddressRewriteTestCase.java 2007-08-04 11:47:17 UTC (rev 4200)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/AddressRewriteTestCase.java 2007-08-04 12:07:59 UTC (rev 4201)
@@ -31,7 +31,6 @@
import javax.xml.rpc.ServiceFactory;
import org.jboss.wsf.common.ObjectNameFactory;
-import org.jboss.wsf.common.management.DefaultServerConfigMBean;
import org.jboss.wsf.test.JBossWSTest;
/**
More information about the jbossws-commits
mailing list