Author: thomas.diesler(a)jboss.com Date: 2007-05-10 12:10:45 -0400 (Thu, 10 May 2007) New Revision: 3042 Added: projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/EndpointHandlerDeployer.java projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/EndpointLifecycleDeployer.java projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws-context.war/ projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws-context.war/WEB-INF/ projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws-context.war/index.html projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws-context.war/styles.css projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws-context.war/ projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.sar/ Removed: projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws-context.war/WEB-INF/ projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws-context.war/index.html projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws-context.war/styles.css projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws.war/ projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbosswsri-context.war/ projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbosswsri.sar/ Modified: projects/wsintegration/jbossws-spi/trunk/build.xml projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/EndpointRegistry.java projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/ServerConfig.java projects/wsintegration/jbossws-spi/trunk/version.properties projects/wsintegration/jbws-jboss42/trunk/src/main/etc/ant-import/build-deploy.xml projects/wsintegration/jbws-jboss42/trunk/version.properties projects/wsintegration/jbws-jboss50/trunk/build.xml projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import/build-deploy.xml projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml projects/wsintegration/jbws-jboss50/trunk/version.properties projects/wsintegration/sunri-jboss50/trunk/build.xml projects/wsintegration/sunri-jboss50/trunk/src/main/etc/ant-import/build-deploy.xml Log: More sunri Modified: projects/wsintegration/jbossws-spi/trunk/build.xml =================================================================== --- projects/wsintegration/jbossws-spi/trunk/build.xml 2007-05-10 15:45:12 UTC (rev 3041) +++ projects/wsintegration/jbossws-spi/trunk/build.xml 2007-05-10 16:10:45 UTC (rev 3042) @@ -31,6 +31,7 @@ <property name="spi.resources.dir" value="${spi.src.dir}/resources"/> <property name="spi.output.dir" value="${spi.dir}/output"/> <property name="spi.output.apidocs.dir" value="${spi.output.dir}/apidocs"/> + <property name="spi.output.etc.dir" value="${spi.output.dir}/etc"/> <property name="spi.output.classes.dir" value="${spi.output.dir}/classes"/> <property name="spi.output.lib.dir" value="${spi.output.dir}/lib"/> @@ -94,6 +95,20 @@ <!-- Compile etc files (manifests and such) --> <target name="spi-compile-etc" depends="spi-init"> + <mkdir dir="${spi.output.etc.dir}"/> + <copy todir="${spi.output.etc.dir}" filtering="yes" overwrite="yes"> + <fileset dir="${spi.etc.dir}"> + <include name="component-info.xml"/> + <include name="default.mf"/> + </fileset> + <filterset> + <filter token="java.vm.version" value="${java.vm.version}"/> + <filter token="java.vm.vendor" value="${java.vm.vendor}"/> + <filter token="build.id" value="${build.id}"/> + <filter token="implementation.version" value="jbossws-spi-${version.id}"/> + <filtersfile file="${basedir}/version.properties"/> + </filterset> + </copy> </target> <!-- ================================================================== --> @@ -113,7 +128,7 @@ <!-- Build jbossws-spi.jar --> <mkdir dir="${spi.output.lib.dir}"/> - <jar jarfile="${spi.output.lib.dir}/jbossws-spi.jar" manifest="${spi.etc.dir}/default.mf"> + <jar jarfile="${spi.output.lib.dir}/jbossws-spi.jar" manifest="${spi.output.etc.dir}/default.mf"> <fileset dir="${spi.output.classes.dir}"> <include name="org/jboss/ws/**"/> </fileset> Copied: projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/EndpointHandlerDeployer.java (from rev 3022, trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/EndpointHandlerDeployer.java) =================================================================== --- projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/EndpointHandlerDeployer.java (rev 0) +++ projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/EndpointHandlerDeployer.java 2007-05-10 16:10:45 UTC (rev 3042) @@ -0,0 +1,113 @@ +/* + * 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.ws.integration.deployment; + +//$Id$ + +import java.util.Map; + +import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.integration.LifecycleHandler; +import org.jboss.ws.integration.RequestHandler; +import org.jboss.ws.integration.invocation.InvocationHandler; + +/** + * A deployer that assigns the handlers to the Endpoint + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class EndpointHandlerDeployer extends AbstractDeployer +{ + private String requestHandler; + private String lifecycleHandler; + private Map<String,String> invocationHandler; + + public void setLifecycleHandler(String handler) + { + this.lifecycleHandler = handler; + } + + public void setRequestHandler(String handler) + { + this.requestHandler = handler; + } + + public void setInvocationHandler(Map<String,String> handlers) + { + this.invocationHandler = handlers; + } + + @Override + public void create(Deployment dep) + { + for (Endpoint ep : dep.getService().getEndpoints()) + { + ep.setRequestHandler(getRequestHandler(dep)); + ep.setLifecycleHandler(getLifecycleHandler(dep)); + ep.setInvocationHandler(getInvocationHandler(dep)); + } + } + + private RequestHandler getRequestHandler(Deployment dep) + { + try + { + Class<?> handlerClass = dep.getClassLoader().loadClass(requestHandler); + return (RequestHandler)handlerClass.newInstance(); + } + catch (Exception e) + { + throw new IllegalStateException("Cannot load request handler: " + requestHandler); + } + } + + private LifecycleHandler getLifecycleHandler(Deployment dep) + { + try + { + Class<?> handlerClass = dep.getClassLoader().loadClass(lifecycleHandler); + return (LifecycleHandler)handlerClass.newInstance(); + } + catch (Exception e) + { + throw new IllegalStateException("Cannot load lifecycle handler: " + lifecycleHandler); + } + } + + private InvocationHandler getInvocationHandler(Deployment dep) + { + String className = invocationHandler.get(dep.getType().toString()); + if (className == null) + throw new IllegalStateException("Cannot obtain invocation handler for: " + dep.getType()); + + try + { + Class<?> handlerClass = dep.getClassLoader().loadClass(className); + return (InvocationHandler)handlerClass.newInstance(); + } + catch (Exception e) + { + throw new IllegalStateException("Cannot load invocation handler: " + className); + } + } +} \ No newline at end of file Copied: projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/EndpointLifecycleDeployer.java (from rev 3022, trunk/jbossws-core/src/java/org/jboss/ws/core/deployment/EndpointLifecycleDeployer.java) =================================================================== --- projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/EndpointLifecycleDeployer.java (rev 0) +++ projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/deployment/EndpointLifecycleDeployer.java 2007-05-10 16:10:45 UTC (rev 3042) @@ -0,0 +1,78 @@ +/* + * 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.ws.integration.deployment; + +//$Id$ + +import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.integration.Service; + +/** + * A deployer that that calls the endpoint lifecycle handler + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class EndpointLifecycleDeployer extends AbstractDeployer +{ + @Override + public void create(Deployment dep) + { + for (Endpoint ep : dep.getService().getEndpoints()) + ep.getLifecycleHandler().create(ep); + } + + @Override + public void start(Deployment dep) + { + for (Endpoint ep : dep.getService().getEndpoints()) + { + ep.getLifecycleHandler().start(ep); + } + } + + @Override + public void stop(Deployment dep) + { + Service service = dep.getService(); + if (service != null) + { + for (Endpoint ep : service.getEndpoints()) + { + ep.getLifecycleHandler().stop(ep); + } + } + } + + @Override + public void destroy(Deployment dep) + { + Service service = dep.getService(); + if (service != null) + { + for (Endpoint ep : service.getEndpoints()) + { + ep.getLifecycleHandler().destroy(ep); + } + } + } +} Modified: projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/EndpointRegistry.java =================================================================== --- projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/EndpointRegistry.java 2007-05-10 15:45:12 UTC (rev 3041) +++ projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/EndpointRegistry.java 2007-05-10 16:10:45 UTC (rev 3042) @@ -62,6 +62,7 @@ import javax.management.ObjectName; import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.utils.ObjectNameFactory; /** * A general endpoint registry. @@ -72,7 +73,10 @@ public interface EndpointRegistry { /** The bean name in the kernel registry */ - static String BEAN_NAME = "WSEndpointRegistry"; + String BEAN_NAME = "WSEndpointRegistry"; + + /** The object name in the MBean server */ + ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=EndpointRegistry"); /** Get the list of registered endpoints */ Set<ObjectName> getEndpoints(); Modified: projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/ServerConfig.java =================================================================== --- projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/ServerConfig.java 2007-05-10 15:45:12 UTC (rev 3041) +++ projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/ServerConfig.java 2007-05-10 16:10:45 UTC (rev 3042) @@ -26,6 +26,10 @@ import java.io.File; import java.net.UnknownHostException; +import javax.management.ObjectName; + +import org.jboss.ws.utils.ObjectNameFactory; + /** * Interface to container independent config * @@ -34,12 +38,15 @@ */ public interface ServerConfig { - // The host name that is returned if there is no other defined - static String UNDEFINED_HOSTNAME = "jbossws.undefined.host"; + /** The default bean name */ + String BEAN_NAME = "WSServerConfig"; + + /** The object name in the MBean server */ + ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=ServerConfig"); - // The default bean name - static final String BEAN_NAME = "WSServerConfig"; - + /** The host name that is returned if there is no other defined */ + String UNDEFINED_HOSTNAME = "jbossws.undefined.host"; + File getServerTempDir(); File getServerDataDir(); Modified: projects/wsintegration/jbossws-spi/trunk/version.properties =================================================================== --- projects/wsintegration/jbossws-spi/trunk/version.properties 2007-05-10 15:45:12 UTC (rev 3041) +++ projects/wsintegration/jbossws-spi/trunk/version.properties 2007-05-10 16:10:45 UTC (rev 3042) @@ -8,7 +8,7 @@ version.id=2.1.0.DEV repository.id=SNAPSHOT -implementation.title=JBoss Web Services SPI (JBossWS-SPI) +implementation.title=JBoss Web Services - JBossWS/SPI implementation.url=http://www.jboss.org/products/jbossws implementation.vendor=JBoss Inc. implementation.vendor.id=http://www.jboss.org Modified: projects/wsintegration/jbws-jboss42/trunk/src/main/etc/ant-import/build-deploy.xml =================================================================== --- projects/wsintegration/jbws-jboss42/trunk/src/main/etc/ant-import/build-deploy.xml 2007-05-10 15:45:12 UTC (rev 3041) +++ projects/wsintegration/jbws-jboss42/trunk/src/main/etc/ant-import/build-deploy.xml 2007-05-10 16:10:45 UTC (rev 3042) @@ -18,7 +18,7 @@ <!-- ================================================================== --> <!-- Deploy jbossws to jboss42 --> - <target name="deploy-jboss42" depends="jboss42-jars" description="Deploy jbossws"> + <target name="deploy" depends="jboss42-jars" description="Deploy jbossws"> <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> Modified: projects/wsintegration/jbws-jboss42/trunk/version.properties =================================================================== --- projects/wsintegration/jbws-jboss42/trunk/version.properties 2007-05-10 15:45:12 UTC (rev 3041) +++ projects/wsintegration/jbws-jboss42/trunk/version.properties 2007-05-10 16:10:45 UTC (rev 3042) @@ -8,7 +8,7 @@ version.id=2.1.0.DEV repository.id=SNAPSHOT -implementation.title=JBoss Web Services (JBossWS) +implementation.title=JBoss Web Services - JBossWS implementation.url=http://www.jboss.org/products/jbossws implementation.vendor=JBoss Inc. implementation.vendor.id=http://www.jboss.org Modified: projects/wsintegration/jbws-jboss50/trunk/build.xml =================================================================== --- projects/wsintegration/jbws-jboss50/trunk/build.xml 2007-05-10 15:45:12 UTC (rev 3041) +++ projects/wsintegration/jbws-jboss50/trunk/build.xml 2007-05-10 16:10:45 UTC (rev 3042) @@ -137,7 +137,7 @@ <!-- Build jbossws-jboss50.jar --> <mkdir dir="${jboss50.output.lib.dir}"/> - <jar jarfile="${jboss50.output.lib.dir}/jbossws-jboss50.jar" manifest="${jboss50.etc.dir}/default.mf"> + <jar jarfile="${jboss50.output.lib.dir}/jbossws-jboss50.jar" manifest="${jboss50.output.etc.dir}/default.mf"> <fileset dir="${jboss50.output.classes.dir}"> <include name="org/jboss/ws/integration/jboss50/**"/> </fileset> @@ -145,18 +145,18 @@ </jar> <!-- Build jbossws-context.war --> - <war warfile="${jboss50.output.lib.dir}/jbossws-context.war" webxml="${jboss50.resources.dir}/jbossws.war/WEB-INF/web.xml"> - <fileset dir="${jboss50.resources.dir}/jbossws.war"> + <war warfile="${jboss50.output.lib.dir}/jbossws50-context.war" webxml="${jboss50.resources.dir}/jbossws-context.war/WEB-INF/web.xml"> + <fileset dir="${jboss50.resources.dir}/jbossws-context.war"> <include name="index.html"/> <include name="styles.css"/> </fileset> - <webinf dir="${jboss50.resources.dir}/jbossws.war/WEB-INF"> + <webinf dir="${jboss50.resources.dir}/jbossws-context.war/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> <!-- Build jbossws50.sar --> - <jar jarfile="${jboss50.output.lib.dir}/jbossws50.sar" manifest="${jboss50.etc.dir}/default.mf"> + <jar jarfile="${jboss50.output.lib.dir}/jbossws50.sar" manifest="${jboss50.output.etc.dir}/default.mf"> <!-- [JBAS-4379] MC beans deployed twice because of jacc service <fileset dir="${jboss50.output.lib.dir}"> <include name="jbossws-context.war"/> Modified: projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import/build-deploy.xml =================================================================== --- projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import/build-deploy.xml 2007-05-10 15:45:12 UTC (rev 3041) +++ projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import/build-deploy.xml 2007-05-10 16:10:45 UTC (rev 3042) @@ -18,10 +18,8 @@ <!-- ================================================================== --> <!-- Deploy jbossws to jboss50 --> - <target name="deploy-jboss50" depends="jboss50-jars" description="Deploy jbossws"> + <target name="deploy" depends="jboss50-jars,remove-jbossws,remove-jbosswsri" description="Deploy jbossws"> - <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> - <copy todir="${jboss50.home}/bin" overwrite="true"> <fileset dir="${thirdparty.dir}/jbossws-resources"> <include name="*.bat"/> @@ -53,14 +51,43 @@ <include name="jboss-saaj.jar"/> </fileset> </copy> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${jboss50.output.lib.dir}/jbossws50-deployer.zip"/> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss50.output.lib.dir}/jbossws50.sar"/> + <copy file="${jboss50.output.lib.dir}/jbossws50-context.war" tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" overwrite="true"/> + </target> + + <!-- Remove jbossws from jboss50 --> + <target name="remove-jbossws" depends="prepare" description="Remove jbossws"> - <copy todir="${jboss50.home}/server/${jboss.server.instance}/deploy" file="${jboss50.output.lib.dir}/jbossws-context.war" overwrite="true"/> + <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> + + <delete> + <fileset dir="${jboss50.home}/client"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <include name="wsdl4j.jar"/> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </delete> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/> </target> - + + <!-- Remove jbossws/sunri from jboss50 --> + <target name="remove-jbosswsri" depends="prepare" description="Remove jbossws/sunri"> + + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbosswsri.deployer"/> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbosswsri.sar"/> + </target> + </project> Copied: projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws-context.war (from rev 3033, projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws.war) Copied: projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws-context.war/WEB-INF (from rev 3041, projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws.war/WEB-INF) Deleted: projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws-context.war/index.html =================================================================== --- projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws.war/index.html 2007-05-10 03:28:26 UTC (rev 3033) +++ projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws-context.war/index.html 2007-05-10 16:10:45 UTC (rev 3042) @@ -1,63 +0,0 @@ -<html><head> -<meta http-equiv='Content-Type content='text/html; charset=iso-8859-1'> -<title>JBossWS / jbossws-2.0.0.CR3 (date=200702012001)</title> -<link rel='stylesheet' href='./styles.css'> -</head> -<body> - -<div class='pageHeader'>Welcome to JBoss Web Services</div> - -<div class="pageSection"> -<h2>J2EE compatible web services</h2> -JBossWS is a JAX-WS compliant web service stack developed to be part of JBoss' JavaEE5 offering. -</div> - -<div class="pageSection"> -<h3>Administration</h3> - -<fieldset> - <legend><b>Runtime information</b></legend> -<ul> - <li><a href="services">View a list of deployed services</a></li> - <!--li><a href="depends">View installed dependencies</a></li--> - <li><a href="/jmx-console/">Access JMX console</a></li> -</ul> -</fieldset> -</div> - -<div class="pageSection"> -<h3>Project information</h3> - -<fieldset> - <legend><b>Documentation</b></legend> - -<ul> - <li><a href="http://labs.jboss.com/portal/jbossws/downloads">Latest download and samples</a></li> - <li><a href="http://www.jboss.org/wiki/Wiki.jsp?page=JBWSFAQ">FAQ&l... - <li><a href="http://labs.jboss.com/jbossws/user-guide/en/html/index.html&qu... guide</a></li> - <li><a href="http://www.jboss.org/wiki/Wiki.jsp?page=JBossWS">JBossWS WIKI</a></li> -</ul> -</fieldset> - -</br> -<fieldset> - <legend><b>Community</b></legend> -<ul> - <li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&... forum</a></li> - <li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&... forum</a></li> - <li><a href="https://lists.jboss.org/mailman/listinfo/jbossws-users"&g... list</a></li> -</ul> -</fieldset> - -</br> -<fieldset> - <legend><b>Source repository</b></legend> -<ul> - <li><a href="http://wiki.jboss.org/wiki/Wiki.jsp?page=JBWSFAQSourceReposito... repository</a></li> - <li><a href="http://fisheye.jboss.com/viewrep/JBossWS">Browse sources online</a></li> -</ul> -</fieldset> -</div> - -</body> -</html> Copied: projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws-context.war/index.html (from rev 3041, projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws.war/index.html) =================================================================== --- projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws-context.war/index.html (rev 0) +++ projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws-context.war/index.html 2007-05-10 16:10:45 UTC (rev 3042) @@ -0,0 +1,63 @@ +<html><head> +<meta http-equiv='Content-Type content='text/html; charset=iso-8859-1'> +<title>JBossWS / jbossws-2.0.0.CR3 (date=200702012001)</title> +<link rel='stylesheet' href='./styles.css'> +</head> +<body> + +<div class='pageHeader'>Welcome to JBoss Web Services</div> + +<div class="pageSection"> +<h2>J2EE compatible web services</h2> +JBossWS is a JAX-WS compliant web service stack developed to be part of JBoss' JavaEE5 offering. +</div> + +<div class="pageSection"> +<h3>Administration</h3> + +<fieldset> + <legend><b>Runtime information</b></legend> +<ul> + <li><a href="services">View a list of deployed services</a></li> + <!--li><a href="depends">View installed dependencies</a></li--> + <li><a href="/jmx-console/">Access JMX console</a></li> +</ul> +</fieldset> +</div> + +<div class="pageSection"> +<h3>Project information</h3> + +<fieldset> + <legend><b>Documentation</b></legend> + +<ul> + <li><a href="http://labs.jboss.com/portal/jbossws/downloads">Latest download and samples</a></li> + <li><a href="http://www.jboss.org/wiki/Wiki.jsp?page=JBWSFAQ">FAQ&l... + <li><a href="http://labs.jboss.com/jbossws/user-guide/en/html/index.html&qu... guide</a></li> + <li><a href="http://www.jboss.org/wiki/Wiki.jsp?page=JBossWS">JBossWS WIKI</a></li> +</ul> +</fieldset> + +</br> +<fieldset> + <legend><b>Community</b></legend> +<ul> + <li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&... forum</a></li> + <li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&... forum</a></li> + <li><a href="https://lists.jboss.org/mailman/listinfo/jbossws-users"&g... list</a></li> +</ul> +</fieldset> + +</br> +<fieldset> + <legend><b>Source repository</b></legend> +<ul> + <li><a href="http://wiki.jboss.org/wiki/Wiki.jsp?page=JBWSFAQSourceReposito... repository</a></li> + <li><a href="http://fisheye.jboss.com/viewrep/JBossWS">Browse sources online</a></li> +</ul> +</fieldset> +</div> + +</body> +</html> Deleted: projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws-context.war/styles.css =================================================================== --- projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws.war/styles.css 2007-05-10 03:28:26 UTC (rev 3033) +++ projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws-context.war/styles.css 2007-05-10 16:10:45 UTC (rev 3042) @@ -1,186 +0,0 @@ - -/* table for list views */ -.table_list { -} - -/* table for detail views */ -.table_form { -} - -.pageHeader { - font-size: 14pt; - font-weight: BOLD; - color: #ffffff; - border-bottom-width:1px; - border-bottom-style:solid; - border-color:#000066; - margin-bottom:15px; - padding-left:15px; - padding-top:5px; - padding-bottom:5px; - background-color: #aaaadd; - max-width: 900px; -} - -.pageSection { - padding-left:15px; - margin-bottom: 5px; - max-width: 900px; -} - -.metrics -{ - font-size: 6pt; - background-color: #dddddd; - width: 100%; -} - -/* table row header */ -.list_tr_head { - font-family: Verdana, sans-serif; - font-size: 8pt; - font-weight: 600; - text-align: center; - background-color: #aaaadd; -} - -/* table row list view */ -.list_tr { - font-family: Verdana, sans-serif; - font-size: 8pt; - color: #000066; - vertical-align: top; - background-color: #ffffff; -} - -/* table row list view odd lines */ -.list_tr_even { - font-family: Verdana, sans-serif; - font-size: 8pt; - color: #000066; - vertical-align: top; - background-color: #ffffff; -} - -/* table row list view even lines */ -.list_tr_odd { - font-family: Verdana, sans-serif; - font-size: 8pt; - color: #000066; - vertical-align: top; - background-color: #dddddd; -} - -/* form label */ -.form_label { - font-family: Verdana, sans-serif; - font-weight: 500; - font-size: 8pt; - color: #000066; - vertical-align: top; - background-color: #dddddd; - padding-top: 2px; - padding-bottom: 2px; -} - -/* form value */ -.form_value { - font-family: Verdana, sans-serif; - font-size: 8pt; - color: #000066; - vertical-align: baseline; -} - -/* tiny writing */ -.tiny { - font-family: Verdana, sans-serif; - font-size: 8pt; - color: #666666; -} - -/* required input fields */ -.inputmust { - background-color: #dddddd; -} - -/* error message */ -.error { - font-family: Courier New; - color: #990000; -} - -/* error message */ -.error_trace { - font-family: Courier New; -} - -/* active tree node */ -.tree_active_label { - font-weight: bold; -} - -body { - font-family: Verdana,, sans-serif; - font-size: 8pt; - color: #000066; - background-color: #ffffff; -} - -/* title style */ -h1 { - font-family: Verdana, sans-serif; - font-size: 14pt; - font-weight: 600; - color: #000066; -} - -h2 { - font-family: Verdana, sans-serif; - font-size: 12pt; - font-weight: 600; - color: #000066; -} - -h3 { - font-family: Verdana, sans-serif; - font-size: 10pt; - font-weight: 600; - color: #000066; -} - -h4 { - font-family: Verdana, sans-serif; - font-size: 10pt; - font-weight: 500; - color: #000066; -} - -/* table desk */ -td { - font-family: Verdana, sans-serif; - font-size: 8pt; - padding-left: 5px; - padding-right: 5px; -} - -input, textarea, select, option { - font-family: Verdana, sans-serif; - font-size: 8pt; - color: #000066; -} - -a { - font-family: Verdana, sans-serif; - color: #0000dd; - text-decoration: none; -} - -a:hover{ - font-family: Verdana, sans-serif; - color: #cc0000; - text-decoration: none; -} - -pre { - background:#dddddd -} \ No newline at end of file Copied: projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws-context.war/styles.css (from rev 3041, projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws.war/styles.css) =================================================================== --- projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws-context.war/styles.css (rev 0) +++ projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws-context.war/styles.css 2007-05-10 16:10:45 UTC (rev 3042) @@ -0,0 +1,186 @@ + +/* table for list views */ +.table_list { +} + +/* table for detail views */ +.table_form { +} + +.pageHeader { + font-size: 14pt; + font-weight: BOLD; + color: #ffffff; + border-bottom-width:1px; + border-bottom-style:solid; + border-color:#000066; + margin-bottom:15px; + padding-left:15px; + padding-top:5px; + padding-bottom:5px; + background-color: #aaaadd; + max-width: 900px; +} + +.pageSection { + padding-left:15px; + margin-bottom: 5px; + max-width: 900px; +} + +.metrics +{ + font-size: 6pt; + background-color: #dddddd; + width: 100%; +} + +/* table row header */ +.list_tr_head { + font-family: Verdana, sans-serif; + font-size: 8pt; + font-weight: 600; + text-align: center; + background-color: #aaaadd; +} + +/* table row list view */ +.list_tr { + font-family: Verdana, sans-serif; + font-size: 8pt; + color: #000066; + vertical-align: top; + background-color: #ffffff; +} + +/* table row list view odd lines */ +.list_tr_even { + font-family: Verdana, sans-serif; + font-size: 8pt; + color: #000066; + vertical-align: top; + background-color: #ffffff; +} + +/* table row list view even lines */ +.list_tr_odd { + font-family: Verdana, sans-serif; + font-size: 8pt; + color: #000066; + vertical-align: top; + background-color: #dddddd; +} + +/* form label */ +.form_label { + font-family: Verdana, sans-serif; + font-weight: 500; + font-size: 8pt; + color: #000066; + vertical-align: top; + background-color: #dddddd; + padding-top: 2px; + padding-bottom: 2px; +} + +/* form value */ +.form_value { + font-family: Verdana, sans-serif; + font-size: 8pt; + color: #000066; + vertical-align: baseline; +} + +/* tiny writing */ +.tiny { + font-family: Verdana, sans-serif; + font-size: 8pt; + color: #666666; +} + +/* required input fields */ +.inputmust { + background-color: #dddddd; +} + +/* error message */ +.error { + font-family: Courier New; + color: #990000; +} + +/* error message */ +.error_trace { + font-family: Courier New; +} + +/* active tree node */ +.tree_active_label { + font-weight: bold; +} + +body { + font-family: Verdana,, sans-serif; + font-size: 8pt; + color: #000066; + background-color: #ffffff; +} + +/* title style */ +h1 { + font-family: Verdana, sans-serif; + font-size: 14pt; + font-weight: 600; + color: #000066; +} + +h2 { + font-family: Verdana, sans-serif; + font-size: 12pt; + font-weight: 600; + color: #000066; +} + +h3 { + font-family: Verdana, sans-serif; + font-size: 10pt; + font-weight: 600; + color: #000066; +} + +h4 { + font-family: Verdana, sans-serif; + font-size: 10pt; + font-weight: 500; + color: #000066; +} + +/* table desk */ +td { + font-family: Verdana, sans-serif; + font-size: 8pt; + padding-left: 5px; + padding-right: 5px; +} + +input, textarea, select, option { + font-family: Verdana, sans-serif; + font-size: 8pt; + color: #000066; +} + +a { + font-family: Verdana, sans-serif; + color: #0000dd; + text-decoration: none; +} + +a:hover{ + font-family: Verdana, sans-serif; + color: #cc0000; + text-decoration: none; +} + +pre { + background:#dddddd +} \ No newline at end of file Modified: projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml =================================================================== --- projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml 2007-05-10 15:45:12 UTC (rev 3041) +++ projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml 2007-05-10 16:10:45 UTC (rev 3042) @@ -3,7 +3,7 @@ <deployment xmlns="urn:jboss:bean-deployer:2.0"> <!-- An abstraction of server configuration aspects. --> - <bean name="WSServerConfig" class="org.jboss.ws.core.server.ManagedServerConfig"> + <bean name="WSServerConfig" class="org.jboss.ws.integration.jboss50.common.ManagedServerConfig"> <!-- The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address> element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address. @@ -130,7 +130,7 @@ --> <bean name="WSClassLoaderInjectionDeployer" class="org.jboss.ws.integration.jboss50.jbossws.ClassLoaderInjectionDeployer"/> <bean name="WSEagerInitializeDeployer" class="org.jboss.ws.core.deployment.EagerInitializeDeployer"/> - <bean name="WSEndpointHandlerDeployer" class="org.jboss.ws.core.deployment.EndpointHandlerDeployer"> + <bean name="WSEndpointHandlerDeployer" class="org.jboss.ws.integration.deployment.EndpointHandlerDeployer"> <property name="requestHandler">org.jboss.ws.core.server.RequestHandlerImpl</property> <property name="lifecycleHandler">org.jboss.ws.core.server.LifecycleHandlerImpl</property> <property name="invocationHandler"> @@ -142,7 +142,7 @@ </map> </property> </bean> - <bean name="WSEndpointLifecycleDeployer" class="org.jboss.ws.core.deployment.EndpointLifecycleDeployer"/> + <bean name="WSEndpointLifecycleDeployer" class="org.jboss.ws.integration.deployment.EndpointLifecycleDeployer"/> <bean name="WSEndpointNameDeployer" class="org.jboss.ws.core.deployment.EndpointNameDeployer"/> <bean name="WSEndpointRegistryDeployer" class="org.jboss.ws.integration.deployment.EndpointRegistryDeployer"/> <bean name="WSEventingDeployer" class="org.jboss.ws.core.deployment.EventingDeployer"/> Modified: projects/wsintegration/jbws-jboss50/trunk/version.properties =================================================================== --- projects/wsintegration/jbws-jboss50/trunk/version.properties 2007-05-10 15:45:12 UTC (rev 3041) +++ projects/wsintegration/jbws-jboss50/trunk/version.properties 2007-05-10 16:10:45 UTC (rev 3042) @@ -8,7 +8,7 @@ version.id=2.1.0.DEV repository.id=SNAPSHOT -implementation.title=JBoss Web Services (JBossWS) +implementation.title=JBoss Web Services - JBossWS implementation.url=http://www.jboss.org/products/jbossws implementation.vendor=JBoss Inc. implementation.vendor.id=http://www.jboss.org Modified: projects/wsintegration/sunri-jboss50/trunk/build.xml =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/build.xml 2007-05-10 15:45:12 UTC (rev 3041) +++ projects/wsintegration/sunri-jboss50/trunk/build.xml 2007-05-10 16:10:45 UTC (rev 3042) @@ -144,12 +144,12 @@ </jar> <!-- Build jbosswsri-context.war --> - <war warfile="${jboss50.output.lib.dir}/jbosswsri50-context.war" webxml="${jboss50.resources.dir}/jbosswsri-context.war/WEB-INF/web.xml"> - <fileset dir="${jboss50.resources.dir}/jbossws.war"> + <war warfile="${jboss50.output.lib.dir}/jbosswsri50-context.war" webxml="${jboss50.resources.dir}/jbossws-context.war/WEB-INF/web.xml"> + <fileset dir="${jboss50.resources.dir}/jbossws-context.war"> <include name="index.html"/> <include name="styles.css"/> </fileset> - <webinf dir="${jboss50.resources.dir}/jbosswsri-context.war/WEB-INF"> + <webinf dir="${jboss50.resources.dir}/jbossws-context.war/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> @@ -176,7 +176,7 @@ <include name="stax-ex.jar"/> <include name="streambuffer.jar"/> </fileset> - <metainf dir="${jboss50.resources.dir}/jbosswsri.sar/META-INF"> + <metainf dir="${jboss50.resources.dir}/jbossws.sar/META-INF"> <include name="jbossws-beans.xml"/> </metainf> </jar> Modified: projects/wsintegration/sunri-jboss50/trunk/src/main/etc/ant-import/build-deploy.xml =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/etc/ant-import/build-deploy.xml 2007-05-10 15:45:12 UTC (rev 3041) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/etc/ant-import/build-deploy.xml 2007-05-10 16:10:45 UTC (rev 3042) @@ -38,7 +38,7 @@ <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbosswsri.deployer" src="${jboss50.output.lib.dir}/jbosswsri50-deployer.zip"/> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbosswsri.sar"/> <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbosswsri.sar" src="${jboss50.output.lib.dir}/jbosswsri50.sar"/> - <copy todir="${jboss50.home}/server/${jboss.server.instance}/deploy" file="${jboss50.output.lib.dir}/jbosswsri50-context.war" overwrite="true"/> + <copy file="${jboss50.output.lib.dir}/jbosswsri50-context.war" tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" overwrite="true"/> </target> <!-- Remove jbossws from jboss50 --> Copied: projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws-context.war (from rev 3041, projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbosswsri-context.war) Copied: projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.sar (from rev 3041, projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbosswsri.sar)