Author: thomas.diesler(a)jboss.com Date: 2006-11-17 06:34:36 -0500 (Fri, 17 Nov 2006) New Revision: 1458 Added: trunk/src/main/java/org/jboss/ws/integration/jboss50/ServerConfigImpl.java Removed: trunk/src/main/java/org/jboss/ws/integration/jboss/ trunk/src/main/java/org/jboss/ws/integration/jboss40/ Modified: trunk/.classpath trunk/build.xml trunk/src/main/java/org/jboss/ws/deployment/ServiceEndpointDeployer.java trunk/src/main/java/org/jboss/ws/server/AbstractServiceEndpointServlet.java trunk/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml Log: remove stale jboss40 integration Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2006-11-17 09:41:56 UTC (rev 1457) +++ trunk/.classpath 2006-11-17 11:34:36 UTC (rev 1458) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry excluding="org/jboss/ws/integration/jboss40/" kind="src" path="src/main/java"/> + <classpathentry kind="src" path="src/main/java"/> <classpathentry excluding="org/jboss/test/ws/interop/" kind="src" path="src/test/java"/> <classpathentry kind="lib" path="thirdparty/activation.jar"/> <classpathentry kind="lib" path="thirdparty/mailapi.jar"/> @@ -23,12 +23,12 @@ <classpathentry kind="lib" path="thirdparty/wstx-lgpl-2.0.6.jar"/> <classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/> <classpathentry kind="lib" path="thirdparty/ant.jar"/> - <classpathentry sourcepath="/home/tdiesler/svn/jbossmc/trunk/container/src/main" kind="lib" path="thirdparty/jboss-container.jar"/> + <classpathentry kind="lib" path="thirdparty/jboss-container.jar" sourcepath="/home/tdiesler/svn/jbossmc/trunk/container/src/main"/> <classpathentry kind="lib" path="thirdparty/jboss-microcontainer.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-remoting.jar"/> <classpathentry kind="lib" path="thirdparty/jaxb-xjc.jar"/> <classpathentry kind="lib" path="thirdparty/jaxb-impl.jar"/> - <classpathentry sourcepath="/home/tdiesler/svn/jbossmc/trunk/deployers/src/main" kind="lib" path="thirdparty/jboss-deployers.jar"/> + <classpathentry kind="lib" path="thirdparty/jboss-deployers.jar" sourcepath="/home/tdiesler/svn/jbossmc/trunk/deployers/src/main"/> <classpathentry kind="lib" path="thirdparty/jboss-common-core.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-dependency.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-logging-spi.jar"/> Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2006-11-17 09:41:56 UTC (rev 1457) +++ trunk/build.xml 2006-11-17 11:34:36 UTC (rev 1458) @@ -158,8 +158,6 @@ <javac srcdir="${src.java.dir}" sourcepath="" destdir="${build.classes.dir}" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <include name="org/jboss/ws/integration/**"/> - <!-- Exclude JBoss40 deployer interceptors --> - <exclude name="org/jboss/ws/integration/jboss40/**"/> <classpath path="${build.classes14.dir}"/> <classpath refid="integration.classpath"/> </javac> @@ -246,7 +244,6 @@ <jar jarfile="${build.lib.dir}/jbossws-jboss-integration.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${build.classes.dir}"> <include name="org/jboss/ws/integration/*.class"/> - <include name="org/jboss/ws/integration/jboss/**"/> <include name="org/jboss/ws/integration/jboss50/**"/> </fileset> </jar> @@ -263,7 +260,7 @@ <fileset dir="${build.classes.dir}"> <include name="javax/**"/> <include name="org/jboss/ws/**"/> - <exclude name="org/jboss/ws/integration/jboss/**"/> + <exclude name="org/jboss/ws/integration/jboss50/**"/> <exclude name="org/jboss/ws/integration/tomcat/**"/> </fileset> <fileset dir="${build.resources.dir}/jbossws.sar"> Modified: trunk/src/main/java/org/jboss/ws/deployment/ServiceEndpointDeployer.java =================================================================== --- trunk/src/main/java/org/jboss/ws/deployment/ServiceEndpointDeployer.java 2006-11-17 09:41:56 UTC (rev 1457) +++ trunk/src/main/java/org/jboss/ws/deployment/ServiceEndpointDeployer.java 2006-11-17 11:34:36 UTC (rev 1458) @@ -40,7 +40,10 @@ * The POJO deployer for web service endpoints. This Deployer is already decoupled from the target * container (i.e. JBoss, Tomcat). The containers deployer architecture should be used to populate * the UnifiedDeploymentInfo object. - * + * + * @deprecated + * This functionality should be handled by the ServiceEndpointManager + * * @author Thomas.Diesler(a)jboss.org * @since 12-May-2006 */ Copied: trunk/src/main/java/org/jboss/ws/integration/jboss50/ServerConfigImpl.java (from rev 1457, trunk/src/main/java/org/jboss/ws/integration/jboss/ServerConfigImpl.java) =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/jboss/ServerConfigImpl.java 2006-11-17 09:41:56 UTC (rev 1457) +++ trunk/src/main/java/org/jboss/ws/integration/jboss50/ServerConfigImpl.java 2006-11-17 11:34:36 UTC (rev 1458) @@ -0,0 +1,73 @@ +/* + * 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.jboss50; + +//$Id$ + +import java.io.File; + +import javax.management.JMException; +import javax.management.MBeanServer; +import javax.management.ObjectName; + +import org.jboss.mx.util.MBeanServerLocator; +import org.jboss.ws.server.ServerConfig; +import org.jboss.ws.utils.ObjectNameFactory; + +/** + * JBoss specific implementation of a ServerConfig + * + * @author Thomas.Diesler(a)jboss.org + * @since 08-May-2006 + */ +public class ServerConfigImpl implements ServerConfig +{ + public File getServerTempDir() + { + try + { + MBeanServer server = MBeanServerLocator.locateJBoss(); + ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig"); + File tmpdir = (File)server.getAttribute(oname, "ServerTempDir"); + return tmpdir; + } + catch (JMException e) + { + return null; + } + } + + public File getServerDataDir() + { + try + { + MBeanServer server = MBeanServerLocator.locateJBoss(); + ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig"); + File tmpdir = (File)server.getAttribute(oname, "ServerDataDir"); + return tmpdir; + } + catch (JMException e) + { + return null; + } + } +} Property changes on: trunk/src/main/java/org/jboss/ws/integration/jboss50/ServerConfigImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/src/main/java/org/jboss/ws/server/AbstractServiceEndpointServlet.java =================================================================== --- trunk/src/main/java/org/jboss/ws/server/AbstractServiceEndpointServlet.java 2006-11-17 09:41:56 UTC (rev 1457) +++ trunk/src/main/java/org/jboss/ws/server/AbstractServiceEndpointServlet.java 2006-11-17 11:34:36 UTC (rev 1458) @@ -36,9 +36,7 @@ import javax.xml.rpc.JAXRPCException; import org.jboss.logging.Logger; -import org.jboss.util.NotImplementedException; import org.jboss.ws.WSException; -import org.jboss.ws.jaxrpc.ServletEndpointContextImpl; import org.jboss.ws.metadata.ServerEndpointMetaData; import org.jboss.ws.utils.ObjectNameFactory; Modified: trunk/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- trunk/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2006-11-17 09:41:56 UTC (rev 1457) +++ trunk/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2006-11-17 11:34:36 UTC (rev 1458) @@ -19,9 +19,11 @@ <property name="alwaysModifySOAPAddress">true</property> <property name="serviceEndpointInvokerJSE">org.jboss.ws.server.ServiceEndpointInvokerJSE</property> - <property name="serviceEndpointInvokerEJB21">org.jboss.ws.integration.jboss.ServiceEndpointInvokerEJB21</property> <property name="serviceEndpointInvokerEJB3">org.jboss.ws.integration.jboss50.ServiceEndpointInvokerEJB3</property> - <property name="serviceEndpointInvokerMDB">org.jboss.ws.integration.jboss.ServiceEndpointInvokerMDB</property> + <!-- Not implemented + <property name="serviceEndpointInvokerEJB21">org.jboss.ws.integration.jboss50.ServiceEndpointInvokerEJB21</property> + <property name="serviceEndpointInvokerMDB">org.jboss.ws.integration.jboss50.ServiceEndpointInvokerMDB</property> + --> </bean> <bean name="ServiceEndpointDeployer" class="org.jboss.ws.deployment.ServiceEndpointDeployer"> @@ -32,7 +34,7 @@ <bean name="ServiceEndpointPublisher" class="org.jboss.ws.integration.jboss50.ServiceEndpointPublisher"> <property name="mainDeployer"><inject bean="MainDeployer"/></property> - <property name="serviceEndpointServlet">org.jboss.ws.integration.jboss.ServiceEndpointServlet</property> + <property name="serviceEndpointServlet">org.jboss.ws.integration.jboss50.JBossServiceEndpointServlet</property> </bean> <!-- Bind JAXRPC Service objects in application client environment context --> @@ -41,7 +43,7 @@ <!-- A subscription manager for WS-Eventing --> <bean name="SubscriptionManager" class="org.jboss.ws.eventing.mgmt.SubscriptionManager"/> - <bean name="ServerConfig" class="org.jboss.ws.integration.jboss.ServerConfigImpl"/> + <bean name="ServerConfig" class="org.jboss.ws.integration.jboss50.ServerConfigImpl"/> <bean name="KernelLocator" class="org.jboss.ws.server.KernelLocator"> <!--property name="kernel">