JBossWS SVN: r1701 - branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-21 09:41:08 -0500 (Thu, 21 Dec 2006)
New Revision: 1701
Added:
branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointPublisher.java
Removed:
branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBoss42ServiceEndpointPublisher.java
Modified:
branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java
branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java
Log:
partial commit
Modified: branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java
===================================================================
--- branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java 2006-12-21 14:41:02 UTC (rev 1700)
+++ branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java 2006-12-21 14:41:08 UTC (rev 1701)
@@ -33,7 +33,7 @@
import org.jboss.mx.util.MBeanProxy;
import org.jboss.ws.core.server.KernelLocator;
import org.jboss.ws.core.server.ServiceEndpointDeployer;
-import org.jboss.ws.core.server.ServiceEndpointPublisher;
+import org.jboss.ws.core.server.AbstractServiceEndpointPublisher;
import org.jboss.ws.core.server.UnifiedDeploymentInfo;
/**
@@ -144,11 +144,11 @@
return (ServiceEndpointDeployer)entry.getTarget();
}
- protected ServiceEndpointPublisher getServiceEndpointPublisher()
+ protected AbstractServiceEndpointPublisher getServiceEndpointPublisher()
{
KernelRegistry registry = KernelLocator.getKernel().getRegistry();
- KernelRegistryEntry entry = registry.getEntry(ServiceEndpointPublisher.BEAN_NAME);
- return (ServiceEndpointPublisher)entry.getTarget();
+ KernelRegistryEntry entry = registry.getEntry(AbstractServiceEndpointPublisher.BEAN_NAME);
+ return (AbstractServiceEndpointPublisher)entry.getTarget();
}
/** Return true if the deployment contains a web service endpoint
Modified: branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java
===================================================================
--- branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java 2006-12-21 14:41:02 UTC (rev 1700)
+++ branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java 2006-12-21 14:41:08 UTC (rev 1701)
@@ -32,7 +32,7 @@
import org.jboss.mx.server.Invocation;
import org.jboss.ws.WSException;
import org.jboss.ws.core.server.JAXWSDeployment;
-import org.jboss.ws.core.server.ServiceEndpointPublisher;
+import org.jboss.ws.core.server.AbstractServiceEndpointPublisher;
import org.jboss.ws.core.server.UnifiedDeploymentInfo;
import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType;
import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCDeployment;
@@ -85,7 +85,7 @@
UnifiedDeploymentInfo udi = getServiceEndpointDeployment(di);
if (udi != null)
{
- ServiceEndpointPublisher endpointPublisher = getServiceEndpointPublisher();
+ AbstractServiceEndpointPublisher endpointPublisher = getServiceEndpointPublisher();
endpointPublisher.rewriteWebXml(udi);
}
return retn;
Deleted: branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBoss42ServiceEndpointPublisher.java
===================================================================
--- branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBoss42ServiceEndpointPublisher.java 2006-12-21 14:41:02 UTC (rev 1700)
+++ branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBoss42ServiceEndpointPublisher.java 2006-12-21 14:41:08 UTC (rev 1701)
@@ -1,78 +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.ws.integration.jboss42;
-
-// $Id$
-
-import java.net.URL;
-
-import javax.management.MBeanServer;
-
-import org.jboss.deployment.DeploymentInfo;
-import org.jboss.deployment.MainDeployerMBean;
-import org.jboss.logging.Logger;
-import org.jboss.mx.util.MBeanProxy;
-import org.jboss.mx.util.MBeanProxyCreationException;
-import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.ws.core.server.ServiceEndpointPublisher;
-import org.jboss.ws.core.server.UnifiedDeploymentInfo;
-
-/**
- * Publish the HTTP service endpoint to Tomcat
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 12-May-2006
- */
-public class JBoss42ServiceEndpointPublisher extends ServiceEndpointPublisher
-{
- // provide logging
- private static Logger log = Logger.getLogger(JBoss42ServiceEndpointPublisher.class);
-
- public String publishServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception
- {
- URL warURL = udi.localUrl;
- DeploymentInfo di = (DeploymentInfo)udi.context.get(DeploymentInfo.class.getName());
- if (di == null)
- throw new IllegalStateException("Cannot obtain DeploymentInfo from context");
-
- rewriteWebXml(udi);
-
- // Preserve the repository config
- DeploymentInfo auxdi = new DeploymentInfo(warURL, null, MBeanServerLocator.locateJBoss());
- auxdi.repositoryConfig = di.getTopRepositoryConfig();
- getMainDeployer().deploy(auxdi);
- return "OK";
- }
-
- public String destroyServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception
- {
- getMainDeployer().undeploy(udi.localUrl);
- return "OK";
- }
-
- private MainDeployerMBean getMainDeployer() throws MBeanProxyCreationException
- {
- MBeanServer server = MBeanServerLocator.locateJBoss();
- MainDeployerMBean mainDeployer = (MainDeployerMBean)MBeanProxy.get(MainDeployerMBean.class, MainDeployerMBean.OBJECT_NAME, server);
- return mainDeployer;
- }
-}
Copied: branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointPublisher.java (from rev 1689, branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBoss42ServiceEndpointPublisher.java)
===================================================================
--- branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBoss42ServiceEndpointPublisher.java 2006-12-21 13:46:51 UTC (rev 1689)
+++ branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointPublisher.java 2006-12-21 14:41:08 UTC (rev 1701)
@@ -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.jboss42;
+
+// $Id$
+
+import java.net.URL;
+
+import javax.management.MBeanServer;
+
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.deployment.MainDeployerMBean;
+import org.jboss.logging.Logger;
+import org.jboss.mx.util.MBeanProxy;
+import org.jboss.mx.util.MBeanProxyCreationException;
+import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.ws.core.server.AbstractServiceEndpointPublisher;
+import org.jboss.ws.core.server.UnifiedDeploymentInfo;
+
+/**
+ * Publish the HTTP service endpoint to Tomcat
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 12-May-2006
+ */
+public class ServiceEndpointPublisher extends AbstractServiceEndpointPublisher
+{
+ // provide logging
+ private static Logger log = Logger.getLogger(ServiceEndpointPublisher.class);
+
+ public String publishServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception
+ {
+ URL warURL = udi.localUrl;
+ DeploymentInfo di = (DeploymentInfo)udi.context.get(DeploymentInfo.class.getName());
+ if (di == null)
+ throw new IllegalStateException("Cannot obtain DeploymentInfo from context");
+
+ rewriteWebXml(udi);
+
+ // Preserve the repository config
+ DeploymentInfo auxdi = new DeploymentInfo(warURL, null, MBeanServerLocator.locateJBoss());
+ auxdi.repositoryConfig = di.getTopRepositoryConfig();
+ getMainDeployer().deploy(auxdi);
+ return "OK";
+ }
+
+ public String destroyServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception
+ {
+ getMainDeployer().undeploy(udi.localUrl);
+ return "OK";
+ }
+
+ private MainDeployerMBean getMainDeployer() throws MBeanProxyCreationException
+ {
+ MBeanServer server = MBeanServerLocator.locateJBoss();
+ MainDeployerMBean mainDeployer = (MainDeployerMBean)MBeanProxy.get(MainDeployerMBean.class, MainDeployerMBean.OBJECT_NAME, server);
+ return mainDeployer;
+ }
+}
18 years, 10 months
- 1
- 0
JBossWS SVN: r1700 - branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-21 09:41:02 -0500 (Thu, 21 Dec 2006)
New Revision: 1700
Added:
branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointPublisher.java
Removed:
branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JBoss50ServiceEndpointPublisher.java
Modified:
branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java
branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractJSEDeployer.java
Log:
partial commit
Modified: branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java
===================================================================
--- branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java 2006-12-21 14:40:58 UTC (rev 1699)
+++ branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java 2006-12-21 14:41:02 UTC (rev 1700)
@@ -28,7 +28,7 @@
import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
-import org.jboss.ws.core.server.ServiceEndpointPublisher;
+import org.jboss.ws.core.server.AbstractServiceEndpointPublisher;
import org.jboss.ws.core.server.KernelLocator;
import org.jboss.ws.core.server.ServiceEndpointDeployer;
import org.jboss.ws.core.server.UnifiedDeploymentInfo;
@@ -153,10 +153,10 @@
return (ServiceEndpointDeployer)entry.getTarget();
}
- protected JBoss50ServiceEndpointPublisher getServiceEndpointPublisher()
+ protected ServiceEndpointPublisher getServiceEndpointPublisher()
{
KernelRegistry registry = KernelLocator.getKernel().getRegistry();
- KernelRegistryEntry entry = registry.getEntry(ServiceEndpointPublisher.BEAN_NAME);
- return (JBoss50ServiceEndpointPublisher)entry.getTarget();
+ KernelRegistryEntry entry = registry.getEntry(AbstractServiceEndpointPublisher.BEAN_NAME);
+ return (ServiceEndpointPublisher)entry.getTarget();
}
}
Modified: branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractJSEDeployer.java
===================================================================
--- branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractJSEDeployer.java 2006-12-21 14:40:58 UTC (rev 1699)
+++ branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractJSEDeployer.java 2006-12-21 14:41:02 UTC (rev 1700)
@@ -33,7 +33,7 @@
import org.jboss.metadata.NameValuePair;
import org.jboss.metadata.WebMetaData;
import org.jboss.metadata.web.Servlet;
-import org.jboss.ws.core.server.ServiceEndpointPublisher;
+import org.jboss.ws.core.server.AbstractServiceEndpointPublisher;
/**
* An abstract deployer for JSE Endpoints
@@ -90,7 +90,7 @@
if (isAlreadyModified(servlet) == false)
{
servlet.setServletClass(serviceEndpointServlet);
- NameValuePair initParam = new NameValuePair(ServiceEndpointPublisher.INIT_PARAM_SERVICE_ENDPOINT_IMPL, servletClassName);
+ NameValuePair initParam = new NameValuePair(AbstractServiceEndpointPublisher.INIT_PARAM_SERVICE_ENDPOINT_IMPL, servletClassName);
servlet.addInitParam(initParam);
}
}
@@ -111,7 +111,7 @@
while (itParams.hasNext())
{
NameValuePair pair = (NameValuePair)itParams.next();
- if (ServiceEndpointPublisher.INIT_PARAM_SERVICE_ENDPOINT_IMPL.equals(pair.getName()))
+ if (AbstractServiceEndpointPublisher.INIT_PARAM_SERVICE_ENDPOINT_IMPL.equals(pair.getName()))
return true;
}
return false;
Deleted: branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JBoss50ServiceEndpointPublisher.java
===================================================================
--- branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JBoss50ServiceEndpointPublisher.java 2006-12-21 14:40:58 UTC (rev 1699)
+++ branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JBoss50ServiceEndpointPublisher.java 2006-12-21 14:41:02 UTC (rev 1700)
@@ -1,101 +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.ws.integration.jboss50;
-
-// $Id$
-
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.jboss.deployers.plugins.structure.AbstractDeploymentContext;
-import org.jboss.deployers.spi.deployment.MainDeployer;
-import org.jboss.deployers.spi.structure.DeploymentContext;
-import org.jboss.deployers.spi.structure.DeploymentState;
-import org.jboss.logging.Logger;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.ws.core.server.ServiceEndpointPublisher;
-import org.jboss.ws.core.server.UnifiedDeploymentInfo;
-
-/**
- * Publish the HTTP service endpoint to Tomcat
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 12-May-2006
- */
-public class JBoss50ServiceEndpointPublisher extends ServiceEndpointPublisher
-{
- // provide logging
- private static Logger log = Logger.getLogger(JBoss50ServiceEndpointPublisher.class);
-
- private MainDeployer mainDeployer;
- private Map<String, DeploymentContext> contextMap = new HashMap<String, DeploymentContext>();
-
- public MainDeployer getMainDeployer()
- {
- return mainDeployer;
- }
-
- public void setMainDeployer(MainDeployer mainDeployer)
- {
- this.mainDeployer = mainDeployer;
- }
-
- public String publishServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception
- {
- URL warURL = udi.expandedWebApp;
- log.debug("publishServiceEndpoint: " + warURL);
-
- rewriteWebXml(warURL);
- DeploymentContext context = createDeploymentContext(warURL);
-
- mainDeployer.addDeploymentContext(context);
- mainDeployer.process();
-
- contextMap.put(warURL.toExternalForm(), context);
- return "OK";
- }
-
- public String destroyServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception
- {
- URL warURL = udi.expandedWebApp;
- log.debug("destroyServiceEndpoint: " + warURL);
-
- DeploymentContext context = contextMap.get(warURL.toExternalForm());
- if (context != null)
- {
- context.setState(DeploymentState.UNDEPLOYING);
- mainDeployer.process();
- mainDeployer.removeDeploymentContext(context.getName());
-
- contextMap.remove(warURL.toExternalForm());
- }
- return "OK";
- }
-
- private DeploymentContext createDeploymentContext(URL warURL) throws Exception
- {
- VirtualFile file = VFS.getRoot(warURL);
- return new AbstractDeploymentContext(file);
- }
-}
Copied: branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointPublisher.java (from rev 1689, branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JBoss50ServiceEndpointPublisher.java)
===================================================================
--- branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JBoss50ServiceEndpointPublisher.java 2006-12-21 13:46:51 UTC (rev 1689)
+++ branches/tdiesler/trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointPublisher.java 2006-12-21 14:41:02 UTC (rev 1700)
@@ -0,0 +1,101 @@
+/*
+ * 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.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jboss.deployers.plugins.structure.AbstractDeploymentContext;
+import org.jboss.deployers.spi.deployment.MainDeployer;
+import org.jboss.deployers.spi.structure.DeploymentContext;
+import org.jboss.deployers.spi.structure.DeploymentState;
+import org.jboss.logging.Logger;
+import org.jboss.virtual.VFS;
+import org.jboss.virtual.VirtualFile;
+import org.jboss.ws.core.server.AbstractServiceEndpointPublisher;
+import org.jboss.ws.core.server.UnifiedDeploymentInfo;
+
+/**
+ * Publish the HTTP service endpoint to Tomcat
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 12-May-2006
+ */
+public class ServiceEndpointPublisher extends AbstractServiceEndpointPublisher
+{
+ // provide logging
+ private static Logger log = Logger.getLogger(ServiceEndpointPublisher.class);
+
+ private MainDeployer mainDeployer;
+ private Map<String, DeploymentContext> contextMap = new HashMap<String, DeploymentContext>();
+
+ public MainDeployer getMainDeployer()
+ {
+ return mainDeployer;
+ }
+
+ public void setMainDeployer(MainDeployer mainDeployer)
+ {
+ this.mainDeployer = mainDeployer;
+ }
+
+ public String publishServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception
+ {
+ URL warURL = udi.expandedWebApp;
+ log.debug("publishServiceEndpoint: " + warURL);
+
+ rewriteWebXml(warURL);
+ DeploymentContext context = createDeploymentContext(warURL);
+
+ mainDeployer.addDeploymentContext(context);
+ mainDeployer.process();
+
+ contextMap.put(warURL.toExternalForm(), context);
+ return "OK";
+ }
+
+ public String destroyServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception
+ {
+ URL warURL = udi.expandedWebApp;
+ log.debug("destroyServiceEndpoint: " + warURL);
+
+ DeploymentContext context = contextMap.get(warURL.toExternalForm());
+ if (context != null)
+ {
+ context.setState(DeploymentState.UNDEPLOYING);
+ mainDeployer.process();
+ mainDeployer.removeDeploymentContext(context.getName());
+
+ contextMap.remove(warURL.toExternalForm());
+ }
+ return "OK";
+ }
+
+ private DeploymentContext createDeploymentContext(URL warURL) throws Exception
+ {
+ VirtualFile file = VFS.getRoot(warURL);
+ return new AbstractDeploymentContext(file);
+ }
+}
18 years, 10 months
- 1
- 0
JBossWS SVN: r1699 - branches/tdiesler/trunk/build
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-21 09:40:58 -0500 (Thu, 21 Dec 2006)
New Revision: 1699
Modified:
branches/tdiesler/trunk/build/build.xml
Log:
partial commit
Modified: branches/tdiesler/trunk/build/build.xml
===================================================================
--- branches/tdiesler/trunk/build/build.xml 2006-12-21 14:40:52 UTC (rev 1698)
+++ branches/tdiesler/trunk/build/build.xml 2006-12-21 14:40:58 UTC (rev 1699)
@@ -370,7 +370,7 @@
<!-- Build jbossws.deployer -->
<jar jarfile="${build.lib.dir}/jbossws50.deployer" manifest="${build.etc.dir}/default.mf">
<fileset dir="${build.lib.dir}">
- <include name="jbossws-jboss-integration.jar"/>
+ <include name="jbossws-jboss50-integration.jar"/>
<include name="jbossws-core.jar"/>
<include name="jboss-jaxws.jar"/>
</fileset>
@@ -385,6 +385,9 @@
<!-- Build jbossws42.sar -->
<jar jarfile="${build.lib.dir}/jbossws42.sar" manifest="${build.etc.dir}/default.mf">
<fileset dir="${build.lib.dir}">
+ <include name="jbossws-jboss42-integration.jar"/>
+ <include name="jbossws-core.jar"/>
+ <include name="jboss-jaxws.jar"/>
<include name="jbossws-context.war"/>
</fileset>
<fileset dir="${thirdparty.dir}">
18 years, 10 months
- 1
- 0
JBossWS SVN: r1698 - branches/tdiesler/trunk/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-21 09:40:52 -0500 (Thu, 21 Dec 2006)
New Revision: 1698
Modified:
branches/tdiesler/trunk/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java
branches/tdiesler/trunk/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointPublisher.java
Log:
partial commit
Modified: branches/tdiesler/trunk/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java
===================================================================
--- branches/tdiesler/trunk/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java 2006-12-21 14:40:46 UTC (rev 1697)
+++ branches/tdiesler/trunk/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java 2006-12-21 14:40:52 UTC (rev 1698)
@@ -37,7 +37,7 @@
import javax.servlet.ServletContext;
import org.jboss.ws.WSException;
-import org.jboss.ws.core.server.ServiceEndpointPublisher;
+import org.jboss.ws.core.server.AbstractServiceEndpointPublisher;
import org.jboss.ws.core.server.UnifiedDeploymentInfo;
import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData;
@@ -138,7 +138,7 @@
Element ipel = (Element)itParams.next();
String paramName = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(ipel, "param-name"));
String paramValue = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(ipel, "param-value"));
- if (ServiceEndpointPublisher.INIT_PARAM_SERVICE_ENDPOINT_IMPL.equals(paramName))
+ if (AbstractServiceEndpointPublisher.INIT_PARAM_SERVICE_ENDPOINT_IMPL.equals(paramName))
{
servletClassMap.put(servletName, paramValue);
}
Modified: branches/tdiesler/trunk/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointPublisher.java
===================================================================
--- branches/tdiesler/trunk/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointPublisher.java 2006-12-21 14:40:46 UTC (rev 1697)
+++ branches/tdiesler/trunk/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointPublisher.java 2006-12-21 14:40:52 UTC (rev 1698)
@@ -32,7 +32,7 @@
import org.jboss.logging.Logger;
import org.jboss.util.NotImplementedException;
-import org.jboss.ws.core.server.ServiceEndpointPublisher;
+import org.jboss.ws.core.server.AbstractServiceEndpointPublisher;
import org.jboss.ws.core.server.UnifiedDeploymentInfo;
/**
@@ -41,7 +41,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 12-May-2006
*/
-public class TomcatServiceEndpointPublisher extends ServiceEndpointPublisher
+public class TomcatServiceEndpointPublisher extends AbstractServiceEndpointPublisher
{
// logging support
private static Logger log = Logger.getLogger(TomcatServiceEndpointPublisher.class);
18 years, 10 months
- 1
- 0
JBossWS SVN: r1697 - branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-21 09:40:46 -0500 (Thu, 21 Dec 2006)
New Revision: 1697
Added:
branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointPublisher.java
Removed:
branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/ServiceEndpointPublisher.java
Log:
partial commit
Copied: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointPublisher.java (from rev 1685, branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/ServiceEndpointPublisher.java)
===================================================================
--- branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/ServiceEndpointPublisher.java 2006-12-21 12:54:28 UTC (rev 1685)
+++ branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointPublisher.java 2006-12-21 14:40:46 UTC (rev 1697)
@@ -0,0 +1,260 @@
+/*
+ * 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.core.server;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.servlet.Servlet;
+
+import org.jboss.logging.Logger;
+import org.jboss.ws.WSException;
+import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.core.utils.DOMWriter;
+import org.jboss.ws.core.utils.IOUtils;
+import org.jboss.ws.core.utils.JavaUtils;
+import org.w3c.dom.Element;
+
+/**
+ * The publisher for web service endpoints
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 12-May-2006
+ */
+public abstract class AbstractServiceEndpointPublisher
+{
+ // default bean name
+ public static final String BEAN_NAME = "ServiceEndpointPublisher";
+
+ // The servlet init param in web.xml that is the service endpoint class
+ public static final String INIT_PARAM_SERVICE_ENDPOINT_IMPL = "ServiceEndpointImpl";
+
+ // logging support
+ private static Logger log = Logger.getLogger(AbstractServiceEndpointPublisher.class);
+
+ // The configured service endpoint servlet
+ protected String servletName;
+
+ public String getServiceEndpointServlet()
+ {
+ return servletName;
+ }
+
+ public void setServiceEndpointServlet(String servletName)
+ {
+ this.servletName = servletName;
+ }
+
+ public abstract String publishServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception;
+
+ public abstract String destroyServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception;
+
+ public URL rewriteWebXml(UnifiedDeploymentInfo udi)
+ {
+ URL warURL = udi.expandedWebApp;
+ return rewriteWebXml(warURL);
+ }
+
+ public URL rewriteWebXml(URL warURL)
+ {
+ File warFile = new File(warURL.getFile());
+ if (warFile.isDirectory() == false)
+ throw new WSException("Expected a war directory: " + warURL);
+
+ File webXML = new File(warURL.getFile() + "/WEB-INF/web.xml");
+ if (webXML.isFile() == false)
+ throw new WSException("Cannot find web.xml: " + webXML);
+
+ try
+ {
+ // After redeployment there might be a stale copy of the original web.xml.org, we delete it
+ File orgWebXML = new File(webXML.getCanonicalPath() + ".org");
+ orgWebXML.delete();
+
+ // Rename the web.xml
+ if (webXML.renameTo(orgWebXML) == false)
+ throw new WSException("Cannot rename web.xml: " + orgWebXML);
+
+ FileInputStream stream = new FileInputStream(orgWebXML);
+ return rewriteWebXml(stream, webXML, null);
+ }
+ catch (RuntimeException rte)
+ {
+ throw rte;
+ }
+ catch (Exception e)
+ {
+ throw new WSException(e);
+ }
+ }
+
+ public URL rewriteWebXml(InputStream source, File dest, ClassLoader loader) throws Exception
+ {
+ if (dest == null)
+ {
+ dest = File.createTempFile("jbossws-alt-web", "xml", IOUtils.createTempDirectory());
+ dest.deleteOnExit();
+ }
+
+ Element root = DOMUtils.parse(source);
+ modifyServletConfig(root, loader);
+
+ FileOutputStream fos = new FileOutputStream(dest);
+ new DOMWriter(fos).setPrettyprint(true).print(root);
+ fos.flush();
+ fos.close();
+
+ return dest.toURL();
+ }
+
+ private void modifyServletConfig(Element root, ClassLoader loader) throws ClassNotFoundException
+ {
+ Iterator itServlets = DOMUtils.getChildElements(root, "servlet");
+ while (itServlets.hasNext())
+ {
+ Element servletElement = (Element)itServlets.next();
+ String linkName = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(servletElement, "servlet-name"));
+
+ // find the servlet-class
+ Element classElement = DOMUtils.getFirstChildElement(servletElement, "servlet-class");
+
+ // JSP
+ if (classElement == null)
+ continue;
+
+ String servletClassName = DOMUtils.getTextContent(classElement).trim();
+
+ // Get the servlet class
+ Class servletClass = null;
+ if (loader != null)
+ {
+ try
+ {
+ servletClass = loader.loadClass(servletClassName);
+ }
+ catch (ClassNotFoundException ex)
+ {
+ log.warn("Cannot load servlet class: " + servletClassName);
+ }
+ }
+
+ String targetBeanName = null;
+
+ // Nothing to do if we have an <init-param>
+ if (isAlreadyModified(servletElement) == false)
+ {
+ // Check if it is a real servlet that we can ignore
+ if (servletClass != null && JavaUtils.isAssignableFrom(Servlet.class, servletClass))
+ {
+ log.info("Ignore servlet: " + servletClassName);
+ continue;
+ }
+ else if (servletClassName.endsWith("Servlet"))
+ {
+ log.info("Ignore <servlet-class> that ends with 'Servlet': " + servletClassName);
+ continue;
+ }
+
+ // build a list of detached elements that come after <servlet-class>
+ boolean startDetach = false;
+ List<Element> detachedElements = new ArrayList<Element>();
+ Iterator itDetached = DOMUtils.getChildElements(servletElement);
+ while (itDetached.hasNext())
+ {
+ Element el = (Element)itDetached.next();
+ if (startDetach == true)
+ {
+ detachedElements.add(el);
+ servletElement.removeChild(el);
+ }
+ if (el.equals(classElement))
+ {
+ servletElement.removeChild(el);
+ startDetach = true;
+ }
+ }
+
+ // replace the class name
+ classElement = (Element)DOMUtils.createElement("servlet-class");
+ classElement.appendChild(DOMUtils.createTextNode(servletName));
+ classElement = (Element)servletElement.getOwnerDocument().importNode(classElement, true);
+ servletElement.appendChild(classElement);
+
+ // add additional init params
+ if (servletClassName.equals(servletName) == false)
+ {
+ Element paramElement = DOMUtils.createElement("init-param");
+ paramElement.appendChild(DOMUtils.createElement("param-name")).appendChild(DOMUtils.createTextNode(INIT_PARAM_SERVICE_ENDPOINT_IMPL));
+ paramElement.appendChild(DOMUtils.createElement("param-value")).appendChild(DOMUtils.createTextNode(servletClassName));
+ paramElement = (Element)servletElement.getOwnerDocument().importNode(paramElement, true);
+ servletElement.appendChild(paramElement);
+ targetBeanName = servletClassName;
+ }
+
+ // reattach the elements
+ itDetached = detachedElements.iterator();
+ while (itDetached.hasNext())
+ {
+ Element el = (Element)itDetached.next();
+ servletElement.appendChild(el);
+ }
+ }
+ else
+ {
+ Iterator itParams = DOMUtils.getChildElements(servletElement, "init-param");
+ while (itParams.hasNext())
+ {
+ Element elParam = (Element)itParams.next();
+ Element elParamName = DOMUtils.getFirstChildElement(elParam, "param-name");
+ Element elParamValue = DOMUtils.getFirstChildElement(elParam, "param-value");
+ if (INIT_PARAM_SERVICE_ENDPOINT_IMPL.equals(DOMUtils.getTextContent(elParamName)))
+ {
+ targetBeanName = DOMUtils.getTextContent(elParamValue);
+ }
+ }
+ }
+
+ if (targetBeanName == null)
+ throw new IllegalStateException("Cannot obtain service endpoint bean for: " + linkName);
+ }
+ }
+
+ // Return true if the web.xml is already modified
+ private boolean isAlreadyModified(Element servletElement)
+ {
+ Iterator itParams = DOMUtils.getChildElements(servletElement, "init-param");
+ while (itParams.hasNext())
+ {
+ Element elParam = (Element)itParams.next();
+ Element elParamName = DOMUtils.getFirstChildElement(elParam, "param-name");
+ if (INIT_PARAM_SERVICE_ENDPOINT_IMPL.equals(DOMUtils.getTextContent(elParamName)))
+ return true;
+ }
+ return false;
+ }
+}
\ No newline at end of file
Deleted: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/ServiceEndpointPublisher.java
===================================================================
--- branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/ServiceEndpointPublisher.java 2006-12-21 14:33:35 UTC (rev 1696)
+++ branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/ServiceEndpointPublisher.java 2006-12-21 14:40:46 UTC (rev 1697)
@@ -1,260 +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.ws.core.server;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.servlet.Servlet;
-
-import org.jboss.logging.Logger;
-import org.jboss.ws.WSException;
-import org.jboss.ws.core.utils.DOMUtils;
-import org.jboss.ws.core.utils.DOMWriter;
-import org.jboss.ws.core.utils.IOUtils;
-import org.jboss.ws.core.utils.JavaUtils;
-import org.w3c.dom.Element;
-
-/**
- * The publisher for web service endpoints
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 12-May-2006
- */
-public abstract class ServiceEndpointPublisher
-{
- // default bean name
- public static final String BEAN_NAME = "ServiceEndpointPublisher";
-
- // The servlet init param in web.xml that is the service endpoint class
- public static final String INIT_PARAM_SERVICE_ENDPOINT_IMPL = "ServiceEndpointImpl";
-
- // logging support
- private static Logger log = Logger.getLogger(ServiceEndpointPublisher.class);
-
- // The configured service endpoint servlet
- protected String servletName;
-
- public String getServiceEndpointServlet()
- {
- return servletName;
- }
-
- public void setServiceEndpointServlet(String servletName)
- {
- this.servletName = servletName;
- }
-
- public abstract String publishServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception;
-
- public abstract String destroyServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception;
-
- public URL rewriteWebXml(UnifiedDeploymentInfo udi)
- {
- URL warURL = udi.expandedWebApp;
- return rewriteWebXml(warURL);
- }
-
- public URL rewriteWebXml(URL warURL)
- {
- File warFile = new File(warURL.getFile());
- if (warFile.isDirectory() == false)
- throw new WSException("Expected a war directory: " + warURL);
-
- File webXML = new File(warURL.getFile() + "/WEB-INF/web.xml");
- if (webXML.isFile() == false)
- throw new WSException("Cannot find web.xml: " + webXML);
-
- try
- {
- // After redeployment there might be a stale copy of the original web.xml.org, we delete it
- File orgWebXML = new File(webXML.getCanonicalPath() + ".org");
- orgWebXML.delete();
-
- // Rename the web.xml
- if (webXML.renameTo(orgWebXML) == false)
- throw new WSException("Cannot rename web.xml: " + orgWebXML);
-
- FileInputStream stream = new FileInputStream(orgWebXML);
- return rewriteWebXml(stream, webXML, null);
- }
- catch (RuntimeException rte)
- {
- throw rte;
- }
- catch (Exception e)
- {
- throw new WSException(e);
- }
- }
-
- public URL rewriteWebXml(InputStream source, File dest, ClassLoader loader) throws Exception
- {
- if (dest == null)
- {
- dest = File.createTempFile("jbossws-alt-web", "xml", IOUtils.createTempDirectory());
- dest.deleteOnExit();
- }
-
- Element root = DOMUtils.parse(source);
- modifyServletConfig(root, loader);
-
- FileOutputStream fos = new FileOutputStream(dest);
- new DOMWriter(fos).setPrettyprint(true).print(root);
- fos.flush();
- fos.close();
-
- return dest.toURL();
- }
-
- private void modifyServletConfig(Element root, ClassLoader loader) throws ClassNotFoundException
- {
- Iterator itServlets = DOMUtils.getChildElements(root, "servlet");
- while (itServlets.hasNext())
- {
- Element servletElement = (Element)itServlets.next();
- String linkName = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(servletElement, "servlet-name"));
-
- // find the servlet-class
- Element classElement = DOMUtils.getFirstChildElement(servletElement, "servlet-class");
-
- // JSP
- if (classElement == null)
- continue;
-
- String servletClassName = DOMUtils.getTextContent(classElement).trim();
-
- // Get the servlet class
- Class servletClass = null;
- if (loader != null)
- {
- try
- {
- servletClass = loader.loadClass(servletClassName);
- }
- catch (ClassNotFoundException ex)
- {
- log.warn("Cannot load servlet class: " + servletClassName);
- }
- }
-
- String targetBeanName = null;
-
- // Nothing to do if we have an <init-param>
- if (isAlreadyModified(servletElement) == false)
- {
- // Check if it is a real servlet that we can ignore
- if (servletClass != null && JavaUtils.isAssignableFrom(Servlet.class, servletClass))
- {
- log.info("Ignore servlet: " + servletClassName);
- continue;
- }
- else if (servletClassName.endsWith("Servlet"))
- {
- log.info("Ignore <servlet-class> that ends with 'Servlet': " + servletClassName);
- continue;
- }
-
- // build a list of detached elements that come after <servlet-class>
- boolean startDetach = false;
- List<Element> detachedElements = new ArrayList<Element>();
- Iterator itDetached = DOMUtils.getChildElements(servletElement);
- while (itDetached.hasNext())
- {
- Element el = (Element)itDetached.next();
- if (startDetach == true)
- {
- detachedElements.add(el);
- servletElement.removeChild(el);
- }
- if (el.equals(classElement))
- {
- servletElement.removeChild(el);
- startDetach = true;
- }
- }
-
- // replace the class name
- classElement = (Element)DOMUtils.createElement("servlet-class");
- classElement.appendChild(DOMUtils.createTextNode(servletName));
- classElement = (Element)servletElement.getOwnerDocument().importNode(classElement, true);
- servletElement.appendChild(classElement);
-
- // add additional init params
- if (servletClassName.equals(servletName) == false)
- {
- Element paramElement = DOMUtils.createElement("init-param");
- paramElement.appendChild(DOMUtils.createElement("param-name")).appendChild(DOMUtils.createTextNode(INIT_PARAM_SERVICE_ENDPOINT_IMPL));
- paramElement.appendChild(DOMUtils.createElement("param-value")).appendChild(DOMUtils.createTextNode(servletClassName));
- paramElement = (Element)servletElement.getOwnerDocument().importNode(paramElement, true);
- servletElement.appendChild(paramElement);
- targetBeanName = servletClassName;
- }
-
- // reattach the elements
- itDetached = detachedElements.iterator();
- while (itDetached.hasNext())
- {
- Element el = (Element)itDetached.next();
- servletElement.appendChild(el);
- }
- }
- else
- {
- Iterator itParams = DOMUtils.getChildElements(servletElement, "init-param");
- while (itParams.hasNext())
- {
- Element elParam = (Element)itParams.next();
- Element elParamName = DOMUtils.getFirstChildElement(elParam, "param-name");
- Element elParamValue = DOMUtils.getFirstChildElement(elParam, "param-value");
- if (INIT_PARAM_SERVICE_ENDPOINT_IMPL.equals(DOMUtils.getTextContent(elParamName)))
- {
- targetBeanName = DOMUtils.getTextContent(elParamValue);
- }
- }
- }
-
- if (targetBeanName == null)
- throw new IllegalStateException("Cannot obtain service endpoint bean for: " + linkName);
- }
- }
-
- // Return true if the web.xml is already modified
- private boolean isAlreadyModified(Element servletElement)
- {
- Iterator itParams = DOMUtils.getChildElements(servletElement, "init-param");
- while (itParams.hasNext())
- {
- Element elParam = (Element)itParams.next();
- Element elParamName = DOMUtils.getFirstChildElement(elParam, "param-name");
- if (INIT_PARAM_SERVICE_ENDPOINT_IMPL.equals(DOMUtils.getTextContent(elParamName)))
- return true;
- }
- return false;
- }
-}
\ No newline at end of file
18 years, 10 months
- 1
- 0
JBossWS SVN: r1696 - in branches/tdiesler/trunk/integration-jboss50/src/resources/jbossws.deployer: . META-INF
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-21 09:33:35 -0500 (Thu, 21 Dec 2006)
New Revision: 1696
Added:
branches/tdiesler/trunk/integration-jboss50/src/resources/jbossws.deployer/META-INF/
branches/tdiesler/trunk/integration-jboss50/src/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml
Log:
partial commit
Added: branches/tdiesler/trunk/integration-jboss50/src/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml
===================================================================
--- branches/tdiesler/trunk/integration-jboss50/src/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2006-12-21 14:31:08 UTC (rev 1695)
+++ branches/tdiesler/trunk/integration-jboss50/src/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2006-12-21 14:33:35 UTC (rev 1696)
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="ServiceEndpointManager" class="org.jboss.ws.core.server.ServiceEndpointManager">
+
+ <!--
+ 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.
+
+ If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'alwaysModifySOAPAddress' is true.
+ If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below.
+
+ If 'webServiceHost' is an empty string, JBossWS uses requesters host when rewriting the <soap:address>.
+ -->
+ <property name="webServiceHost">${jboss.bind.address}</property>
+ <property name="webServiceSecurePort">8443</property>
+ <property name="webServicePort">8080</property>
+ <property name="alwaysModifySOAPAddress">true</property>
+
+ <property name="serviceEndpointInvokerJSE">org.jboss.ws.core.server.ServiceEndpointInvokerJSE</property>
+ <property name="serviceEndpointInvokerEJB3">org.jboss.ws.integration.jboss50.ServiceEndpointInvokerEJB3</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.core.server.ServiceEndpointDeployer">
+ <property name="serviceEndpointManager">
+ <inject bean="ServiceEndpointManager"/>
+ </property>
+ </bean>
+
+ <bean name="ServiceEndpointPublisher" class="org.jboss.ws.integration.jboss50.ServiceEndpointPublisher">
+ <property name="mainDeployer"><inject bean="MainDeployer"/></property>
+ <property name="serviceEndpointServlet">org.jboss.ws.integration.jboss50.JBossServiceEndpointServlet</property>
+ </bean>
+
+ <!-- Bind JAXRPC Service objects in application client environment context -->
+ <bean name="ServiceRefHandler" class="org.jboss.ws.integration.jboss50.ServiceRefHandler"/>
+
+ <!-- A subscription manager for WS-Eventing -->
+ <bean name="SubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"/>
+
+ <bean name="ServerConfig" class="org.jboss.ws.integration.jboss50.ServerConfigImpl"/>
+
+ <bean name="KernelLocator" class="org.jboss.ws.core.server.KernelLocator">
+ <!--property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property-->
+ </bean>
+
+ <bean name="JAXWSDeployerEJB3" class="org.jboss.ws.integration.jboss50.JAXWSDeployerEJB3">
+ <install bean="MainDeployer" method="addDeployer">
+ <parameter>
+ <this/>
+ </parameter>
+ </install>
+ <uninstall bean="MainDeployer" method="removeDeployer">
+ <parameter>
+ <this/>
+ </parameter>
+ </uninstall>
+ <depends>EJBRegistrationDeployer</depends>
+ <depends>JBossWebAppParsingDeployer</depends>
+ <depends>ServiceEndpointManager</depends>
+ </bean>
+
+ <bean name="JAXWSDeployerJSE" class="org.jboss.ws.integration.jboss50.JAXWSDeployerJSE">
+ <install bean="MainDeployer" method="addDeployer">
+ <parameter>
+ <this/>
+ </parameter>
+ </install>
+ <uninstall bean="MainDeployer" method="removeDeployer">
+ <parameter>
+ <this/>
+ </parameter>
+ </uninstall>
+ <depends>JBossWebAppParsingDeployer</depends>
+ <depends>ServiceEndpointManager</depends>
+ </bean>
+
+ <bean name="JAXRPCDeployerJSE" class="org.jboss.ws.integration.jboss50.JAXRPCDeployerJSE">
+ <install bean="MainDeployer" method="addDeployer">
+ <parameter>
+ <this/>
+ </parameter>
+ </install>
+ <uninstall bean="MainDeployer" method="removeDeployer">
+ <parameter>
+ <this/>
+ </parameter>
+ </uninstall>
+ <depends>JBossWebAppParsingDeployer</depends>
+ <depends>ServiceEndpointManager</depends>
+ </bean>
+
+ <bean name="ServiceEndpointLifecycleDeployer" class="org.jboss.ws.integration.jboss50.ServiceEndpointLifecycleDeployer">
+ <install bean="MainDeployer" method="addDeployer">
+ <parameter>
+ <this/>
+ </parameter>
+ </install>
+ <uninstall bean="MainDeployer" method="removeDeployer">
+ <parameter>
+ <this/>
+ </parameter>
+ </uninstall>
+ <depends>ServiceEndpointManager</depends>
+ </bean>
+
+</deployment>
Property changes on: branches/tdiesler/trunk/integration-jboss50/src/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years, 10 months
- 1
- 0
JBossWS SVN: r1695 - in branches/tdiesler/trunk/integration-jboss42/src: . resources resources/jbossws.beans
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-21 09:31:08 -0500 (Thu, 21 Dec 2006)
New Revision: 1695
Added:
branches/tdiesler/trunk/integration-jboss42/src/resources/
branches/tdiesler/trunk/integration-jboss42/src/resources/jbossws.beans/
branches/tdiesler/trunk/integration-jboss42/src/resources/jbossws.beans/jbossws-beans.xml
Log:
partial commit
Added: branches/tdiesler/trunk/integration-jboss42/src/resources/jbossws.beans/jbossws-beans.xml
===================================================================
--- branches/tdiesler/trunk/integration-jboss42/src/resources/jbossws.beans/jbossws-beans.xml 2006-12-21 14:31:04 UTC (rev 1694)
+++ branches/tdiesler/trunk/integration-jboss42/src/resources/jbossws.beans/jbossws-beans.xml 2006-12-21 14:31:08 UTC (rev 1695)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="ServiceEndpointManager" class="org.jboss.ws.core.server.ServiceEndpointManager">
+
+ <!--
+ 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.
+
+ If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'alwaysModifySOAPAddress' is true.
+ If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below.
+
+ If 'webServiceHost' is an empty string, JBossWS uses requesters host when rewriting the <soap:address>.
+ -->
+ <property name="webServiceHost">${jboss.bind.address}</property>
+ <property name="webServiceSecurePort">8443</property>
+ <property name="webServicePort">8080</property>
+ <property name="alwaysModifySOAPAddress">true</property>
+
+ <property name="serviceEndpointInvokerJSE">org.jboss.ws.core.server.ServiceEndpointInvokerJSE</property>
+ <property name="serviceEndpointInvokerEJB3">org.jboss.ws.integration.jboss42.ServiceEndpointInvokerEJB3</property>
+ <property name="serviceEndpointInvokerEJB21">org.jboss.ws.integration.jboss42.ServiceEndpointInvokerEJB21</property>
+ <property name="serviceEndpointInvokerMDB">org.jboss.ws.integration.jboss42.ServiceEndpointInvokerMDB</property>
+ </bean>
+
+ <bean name="ServiceEndpointDeployer" class="org.jboss.ws.core.server.ServiceEndpointDeployer">
+ <property name="serviceEndpointManager">
+ <inject bean="ServiceEndpointManager"/>
+ </property>
+ </bean>
+
+ <bean name="ServiceEndpointPublisher" class="org.jboss.ws.integration.jboss42.JBoss42ServiceEndpointPublisher">
+ <property name="mainDeployer"><inject bean="MainDeployer"/></property>
+ <property name="serviceEndpointServlet">org.jboss.ws.integration.jboss42.JBossServiceEndpointServlet</property>
+ </bean>
+
+ <!-- Bind JAXRPC Service objects in application client environment context -->
+ <bean name="ServiceRefHandler" class="org.jboss.ws.integration.jboss42.ServiceRefHandler"/>
+
+ <!-- A subscription manager for WS-Eventing -->
+ <bean name="SubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"/>
+
+ <bean name="ServerConfig" class="org.jboss.ws.integration.jboss42.ServerConfigImpl"/>
+
+ <bean name="KernelLocator" class="org.jboss.ws.core.server.KernelLocator">
+ <!--property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property-->
+ </bean>
+
+</deployment>
Property changes on: branches/tdiesler/trunk/integration-jboss42/src/resources/jbossws.beans/jbossws-beans.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years, 10 months
- 1
- 0
JBossWS SVN: r1694 - in branches/tdiesler/trunk/integration-jboss50/src: . resources
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-21 09:31:04 -0500 (Thu, 21 Dec 2006)
New Revision: 1694
Added:
branches/tdiesler/trunk/integration-jboss50/src/resources/
branches/tdiesler/trunk/integration-jboss50/src/resources/jbossws.deployer/
Log:
partial commit
18 years, 10 months
- 1
- 0
JBossWS SVN: r1693 - branches/tdiesler/trunk/build
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-21 09:31:00 -0500 (Thu, 21 Dec 2006)
New Revision: 1693
Modified:
branches/tdiesler/trunk/build/build.xml
Log:
partial commit
Modified: branches/tdiesler/trunk/build/build.xml
===================================================================
--- branches/tdiesler/trunk/build/build.xml 2006-12-21 14:30:54 UTC (rev 1692)
+++ branches/tdiesler/trunk/build/build.xml 2006-12-21 14:31:00 UTC (rev 1693)
@@ -30,18 +30,15 @@
<property name="build.classes14.dir" value="${build.dir}/classes14"/>
<property name="build.etc.dir" value="${build.dir}/etc"/>
<property name="build.lib.dir" value="${build.dir}/lib"/>
- <property name="build.resources.dir" value="${build.dir}/resources"/>
<property name="build.samples.dir" value="${build.dir}/samples"/>
<property name="build.bin.dist" value="${build.dir}/bin-dist"/>
<property name="build.src.dist" value="${build.dir}/src-dist"/>
<property name="build.api" value="${build.dir}/api"/>
<property name="docs.userguide.dir" value="${basedir}/docs/user-guide/project"/>
- <property name="src.dir" value="${basedir}/../jbossws/src/main"/>
- <property name="src.etc.dir" value="${src.dir}/etc"/>
- <property name="src.java.dir" value="${src.dir}/java"/>
- <property name="src.resources.dir" value="${src.dir}/resources"/>
- <property name="src.dist.dir" value="${src.resources.dir}/dist"/>
- <property name="src.samples.dir" value="${src.resources.dir}/samples"/>
+ <property name="jbossws.src.dir" value="${basedir}/../jbossws/src/main"/>
+ <property name="jbossws.etc.dir" value="${jbossws.src.dir}/etc"/>
+ <property name="jbossws.java.dir" value="${jbossws.src.dir}/java"/>
+ <property name="jbossws.resources.dir" value="${jbossws.src.dir}/resources"/>
<property name="test.dir" value="${basedir}/src/test"/>
<property name="test.etc.dir" value="${test.dir}/etc"/>
<property name="test.java.dir" value="${test.dir}/java"/>
@@ -132,7 +129,7 @@
| documentation compiles.
-->
- <target name="compile" depends="init,compile-classes,compile-etc,compile-resources" description="Compile all source files."/>
+ <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/>
<!-- Compile java sources -->
<target name="compile-classes" depends="compile-interfaces,compile-core,compile-integration"/>
@@ -140,7 +137,7 @@
<!-- Compile core java sources -->
<target name="compile-interfaces" depends="init">
<mkdir dir="${build.classes14.dir}"/>
- <javac srcdir="${src.java.dir}" destdir="${build.classes14.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
+ <javac srcdir="${jbossws.java.dir}" destdir="${build.classes14.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
failonerror="${javac.fail.onerror}" source="1.4" target="1.4">
<include name="javax/xml/rpc/**"/>
<include name="javax/xml/soap/**"/>
@@ -151,7 +148,7 @@
<!-- Compile core java sources -->
<target name="compile-core" depends="compile-interfaces">
<mkdir dir="${build.classes.dir}"/>
- <javac srcdir="${src.java.dir}" sourcepath="" destdir="${build.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
+ <javac srcdir="${jbossws.java.dir}" sourcepath="" destdir="${build.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
<include name="javax/xml/ws/**"/>
<include name="javax/jws/**"/>
@@ -199,7 +196,7 @@
<target name="compile-etc" depends="init">
<mkdir dir="${build.etc.dir}"/>
<copy todir="${build.etc.dir}" filtering="yes" overwrite="yes">
- <fileset dir="${src.etc.dir}"/>
+ <fileset dir="${jbossws.etc.dir}"/>
<filterset>
<filter token="java.vm.version" value="${java.vm.version}"/>
<filter token="java.vm.vendor" value="${java.vm.vendor}"/>
@@ -210,14 +207,6 @@
</copy>
</target>
- <!-- Compile resource files -->
- <target name="compile-resources" depends="init">
- <mkdir dir="${build.resources.dir}"/>
- <copy todir="${build.resources.dir}" filtering="yes" overwrite="yes">
- <fileset dir="${src.resources.dir}"/>
- </copy>
- </target>
-
<!-- ================================================================== -->
<!-- Archives -->
<!-- ================================================================== -->
@@ -247,7 +236,7 @@
<fileset dir="${build.classes14.dir}">
<include name="javax/xml/soap/**"/>
</fileset>
- <metainf dir="${build.resources.dir}/jboss-saaj.jar/META-INF"/>
+ <metainf dir="${jbossws.resources.dir}/jboss-saaj.jar/META-INF"/>
</jar>
<!-- Build jboss-jaxws.jar -->
@@ -267,7 +256,7 @@
<include name="org/jboss/ws/**"/>
<exclude name="org/jboss/ws/integration/**"/>
</fileset>
- <fileset dir="${build.resources.dir}">
+ <fileset dir="${jbossws.resources.dir}">
<include name="schema/**"/>
<include name="dtd/**"/>
</fileset>
@@ -309,11 +298,11 @@
<exclude name="org/jboss/ws/integration/jboss50/**"/>
<exclude name="org/jboss/ws/integration/tomcat/**"/>
</fileset>
- <fileset dir="${build.resources.dir}/jbossws.sar">
+ <fileset dir="${jbossws.resources.dir}/jbossws.sar">
<include name="META-INF/standard-jaxrpc-client-config.xml"/>
<include name="META-INF/standard-jaxws-client-config.xml"/>
</fileset>
- <fileset dir="${build.resources.dir}">
+ <fileset dir="${jbossws.resources.dir}">
<include name="schema/**"/>
<include name="dtd/**"/>
</fileset>
@@ -322,42 +311,42 @@
<include name="wstools.bat"/>
<include name="wstools-log4j.xml"/>
</fileset>
- <metainf dir="${build.resources.dir}/jboss-saaj.jar/META-INF"/>
+ <metainf dir="${jbossws.resources.dir}/jboss-saaj.jar/META-INF"/>
</jar>
<!-- Build jbossws-context.war -->
- <war warfile="${build.lib.dir}/jbossws-context.war" webxml="${build.resources.dir}/jbossws.war/JBoss/WEB-INF/web.xml">
- <fileset dir="${build.resources.dir}/jbossws.war">
+ <war warfile="${build.lib.dir}/jbossws-context.war" webxml="${jbossws.resources.dir}/jbossws.war/JBoss/WEB-INF/web.xml">
+ <fileset dir="${jbossws.resources.dir}/jbossws.war">
<include name="index.html"/>
<include name="styles.css"/>
</fileset>
- <webinf dir="${build.resources.dir}/jbossws.war/JBoss/WEB-INF">
+ <webinf dir="${jbossws.resources.dir}/jbossws.war/JBoss/WEB-INF">
<include name="jboss-web.xml"/>
</webinf>
</war>
<!-- Build jbossws.war -->
- <war warfile="${build.lib.dir}/jbossws.war" webxml="${build.resources.dir}/jbossws.war/Tomcat/WEB-INF/web.xml">
- <fileset dir="${build.resources.dir}/jbossws.war">
+ <war warfile="${build.lib.dir}/jbossws.war" webxml="${jbossws.resources.dir}/jbossws.war/Tomcat/WEB-INF/web.xml">
+ <fileset dir="${jbossws.resources.dir}/jbossws.war">
<include name="index.html"/>
<include name="styles.css"/>
</fileset>
- <fileset dir="${build.resources.dir}/jbossws.war/Tomcat">
+ <fileset dir="${jbossws.resources.dir}/jbossws.war/Tomcat">
<include name="META-INF/jboss-beans.xml"/>
</fileset>
- <fileset dir="${build.resources.dir}/jbossws.sar">
+ <fileset dir="${jbossws.resources.dir}/jbossws.sar">
<include name="META-INF/standard-jaxrpc-client-config.xml"/>
<include name="META-INF/standard-jaxrpc-endpoint-config.xml"/>
<include name="META-INF/standard-jaxws-client-config.xml"/>
<include name="META-INF/standard-jaxws-endpoint-config.xml"/>
</fileset>
- <classes dir="${build.resources.dir}/jbossws.war/Tomcat/WEB-INF">
+ <classes dir="${jbossws.resources.dir}/jbossws.war/Tomcat/WEB-INF">
<include name="log4j.xml"/>
</classes>
</war>
- <!-- Build jbossws.sar -->
- <jar jarfile="${build.lib.dir}/jbossws.sar" manifest="${build.etc.dir}/default.mf">
+ <!-- Build jbossws50.sar -->
+ <jar jarfile="${build.lib.dir}/jbossws50.sar" manifest="${build.etc.dir}/default.mf">
<fileset dir="${build.lib.dir}">
<include name="jbossws-context.war"/>
</fileset>
@@ -370,16 +359,16 @@
<include name="wstx-lgpl-2.9.3.jar"/>
<include name="xmlsec.jar"/>
</fileset>
- <fileset dir="${build.resources.dir}/jbossws.sar">
- <include name="META-INF/standard-jaxrpc-client-config.xml"/>
- <include name="META-INF/standard-jaxrpc-endpoint-config.xml"/>
- <include name="META-INF/standard-jaxws-client-config.xml"/>
- <include name="META-INF/standard-jaxws-endpoint-config.xml"/>
- </fileset>
+ <metainf dir="${jbossws.resources.dir}/jbossws.sar/META-INF">
+ <include name="standard-jaxrpc-client-config.xml"/>
+ <include name="standard-jaxrpc-endpoint-config.xml"/>
+ <include name="standard-jaxws-client-config.xml"/>
+ <include name="standard-jaxws-endpoint-config.xml"/>
+ </metainf>
</jar>
<!-- Build jbossws.deployer -->
- <jar jarfile="${build.lib.dir}/jbossws.deployer" manifest="${build.etc.dir}/default.mf">
+ <jar jarfile="${build.lib.dir}/jbossws50.deployer" manifest="${build.etc.dir}/default.mf">
<fileset dir="${build.lib.dir}">
<include name="jbossws-jboss-integration.jar"/>
<include name="jbossws-core.jar"/>
@@ -388,14 +377,36 @@
<fileset dir="${thirdparty.dir}">
<include name="wsdl4j.jar"/>
</fileset>
- <metainf dir="${build.resources.dir}/jbossws.deployer/META-INF">
+ <metainf dir="${integration.jboss50.dir}/src/resources/jbossws.deployer/META-INF">
<include name="jbossws-deployer-beans.xml"/>
</metainf>
</jar>
- <zip destfile="${build.lib.dir}/jbossws-src.zip">
- <fileset dir="${src.java.dir}"/>
- </zip>
+ <!-- Build jbossws42.sar -->
+ <jar jarfile="${build.lib.dir}/jbossws42.sar" manifest="${build.etc.dir}/default.mf">
+ <fileset dir="${build.lib.dir}">
+ <include name="jbossws-context.war"/>
+ </fileset>
+ <fileset dir="${thirdparty.dir}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="policy-1.0.jar"/>
+ <include name="sjsxp.jar"/>
+ <include name="stax-api-1.0.jar"/>
+ <include name="wstx-lgpl-2.9.3.jar"/>
+ <include name="xmlsec.jar"/>
+ </fileset>
+ <fileset dir="${integration.jboss42.dir}/src/resources">
+ <include name="jbossws.beans/META-INF/jbossws-beans.xml"/>
+ </fileset>
+ <metainf dir="${jbossws.resources.dir}/jbossws.sar/META-INF">
+ <include name="standard-jaxrpc-client-config.xml"/>
+ <include name="standard-jaxrpc-endpoint-config.xml"/>
+ <include name="standard-jaxws-client-config.xml"/>
+ <include name="standard-jaxws-endpoint-config.xml"/>
+ </metainf>
+ </jar>
+
</target>
<!-- ================================================================== -->
@@ -407,7 +418,7 @@
<mkdir dir="${build.api}"/>
<javadoc destdir="${build.api}" author="true" version="true" use="true" windowtitle="JBossWS API">
- <packageset dir="${src.java.dir}" defaultexcludes="yes">
+ <packageset dir="${jbossws.java.dir}" defaultexcludes="yes">
<include name="org/jboss/ws/**"/>
</packageset>
<packageset dir="${jboss.server.root}/../src/main" defaultexcludes="yes">
@@ -428,52 +439,53 @@
<!-- Deployment -->
<!-- ================================================================== -->
- <!-- Deploy jbossws to the server -->
- <target name="deploy-jbossws" depends="main" description="Deploy jbossws">
- <antcall target="deploy-to-server">
- <param name="jboss.deploy.home" value="${jboss.jdk15.home}"/>
- <param name="jbossws" value="jbossws"/>
- </antcall>
- <antcall target="deploy-to-thirdparty">
- <param name="jboss.deploy.home" value="${jboss.jdk15.home}"/>
- <param name="jbossws" value="jbossws"/>
- </antcall>
+ <!-- Deploy jbossws to the jboss50 -->
+ <target name="deploy-jboss50" depends="main" description="Deploy jbossws">
+ <copy todir="${jboss50.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
+ <copy todir="${jboss50.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
+ <copy todir="${jboss50.home}/client" overwrite="true">
+ <fileset dir="${build.lib.dir}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="${build.lib.dir}">
+ <include name="jboss-jaxrpc.jar"/>
+ <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"/>
+ <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${build.lib.dir}/jbossws50.deployer"/>
+ <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="${build.lib.dir}/jbossws50.sar"/>
</target>
- <!-- Deploy to jboss -->
- <target name="deploy-to-server">
- <copy todir="${jboss.deploy.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
- <copy todir="${jboss.deploy.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
- <copy todir="${jboss.deploy.home}/client" overwrite="true">
+ <!-- Deploy jbossws to the jboss42 -->
+ <target name="deploy-jboss42" depends="main" description="Deploy jbossws">
+ <copy todir="${jboss42.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
+ <copy todir="${jboss42.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
+ <copy todir="${jboss42.home}/client" overwrite="true">
<fileset dir="${build.lib.dir}">
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-saaj.jar"/>
- <include name="${jbossws}-client.jar"/>
+ <include name="jbossws-client.jar"/>
</fileset>
</copy>
- <copy todir="${jboss.deploy.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
<fileset dir="${build.lib.dir}">
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-saaj.jar"/>
</fileset>
</copy>
- <delete dir="${jboss.deploy.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
- <mkdir dir="${jboss.deploy.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
- <unjar dest="${jboss.deploy.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${build.lib.dir}/jbossws.deployer"/>
- <delete dir="${jboss.deploy.home}/server/${jboss.server.instance}/deploy/${jbossws}.sar"/>
- <mkdir dir="${jboss.deploy.home}/server/${jboss.server.instance}/deploy/${jbossws}.sar"/>
- <unjar dest="${jboss.deploy.home}/server/${jboss.server.instance}/deploy/${jbossws}.sar" src="${build.lib.dir}/${jbossws}.sar"/>
+ <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${build.lib.dir}/jbossws42.sar"/>
</target>
- <!-- Deploy to jboss/thirdparty -->
- <target name="deploy-to-thirdparty" if="jboss.source.dist.available">
- <!-- Only needed for the JBossAS webservice testsuite
- <copy todir="${jboss.deploy.home}/../../../thirdparty/jboss/jbossxb/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
- <copy todir="${jboss.deploy.home}/../../../thirdparty/jboss/${jbossws}/lib" file="${build.lib.dir}/${jbossws}-client.jar" overwrite="true"/>
- <copy todir="${jboss.deploy.home}/../../../thirdparty/jboss/${jbossws}/lib" file="${build.lib.dir}/${jbossws}.sar" overwrite="true"/>
- -->
- </target>
-
<!-- Deploy to Tomcat -->
<target name="deploy-tomcat" depends="main,jbossws-thirdparty-jar" description="Deploy JBossWS to Tomcat">
<copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/serializer.jar"/>
18 years, 10 months
- 1
- 0
JBossWS SVN: r1692 - in branches/tdiesler/trunk/jbossws/src: main/resources test
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-12-21 09:30:54 -0500 (Thu, 21 Dec 2006)
New Revision: 1692
Removed:
branches/tdiesler/trunk/jbossws/src/main/resources/jbossws.deployer/
Modified:
branches/tdiesler/trunk/jbossws/src/test/build.xml
Log:
partial commit
Modified: branches/tdiesler/trunk/jbossws/src/test/build.xml
===================================================================
--- branches/tdiesler/trunk/jbossws/src/test/build.xml 2006-12-21 13:48:05 UTC (rev 1691)
+++ branches/tdiesler/trunk/jbossws/src/test/build.xml 2006-12-21 14:30:54 UTC (rev 1692)
@@ -10,16 +10,16 @@
<project name="JBossWS-Tests" default="main" basedir="../..">
- <import file="${basedir}/src/ant/build-thirdparty.xml"/>
+ <import file="${basedir}/../build/import/build-thirdparty.xml"/>
<!-- ================================================================== -->
<!-- Setup -->
<!-- ================================================================== -->
- <property file="${basedir}/ant.properties"/>
- <property file="${basedir}/version.properties"/>
+ <property file="${basedir}/../build/ant.properties"/>
+ <property file="${basedir}/../build/version.properties"/>
- <property name="build.dir" value="${basedir}/output"/>
+ <property name="build.dir" value="${basedir}/../build/output"/>
<property name="build.lib.dir" value="${build.dir}/lib"/>
<property name="build.resources.dir" value="${build.dir}/resources"/>
<property name="build.tests.dir" value="${build.dir}/tests"/>
@@ -27,22 +27,13 @@
<property name="test.etc.dir" value="${test.dir}/etc"/>
<property name="test.java.dir" value="${test.dir}/java"/>
<property name="test.resources.dir" value="${test.dir}/resources"/>
- <property name="thirdparty.dir" value="${basedir}/thirdparty"/>
+ <property name="thirdparty.dir" value="${basedir}/../build/thirdparty"/>
+
<!-- JDK Detection -->
<available classname="java.lang.StackTraceElement" property="HAVE_JDK_1.4"/>
<available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
- <!-- JBoss Home -->
- <condition property="jboss.home" value="${jboss.jdk14.home}">
- <not>
- <isset property="HAVE_JDK_1.5"/>
- </not>
- </condition>
- <condition property="jboss.home" value="${jboss.jdk15.home}">
- <isset property="HAVE_JDK_1.5"/>
- </condition>
-
<!-- Use -Ddebug=true for remote debugging -->
<condition property="remote.debug.line" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006">
<isset property="debug"/>
@@ -53,6 +44,7 @@
</not>
</condition>
+ <property name="jboss.home" value="${jboss50.home}"/>
<property name="jboss.client" value="${jboss.home}/client"/>
<property name="jboss.lib" value="${jboss.home}/lib"/>
<property name="jboss.server" value="${jboss.home}/server/${jboss.server.instance}"/>
@@ -113,32 +105,6 @@
-->
<target name="init" depends="prepare,thirdparty">
- <condition property="jbossws.build" value="jbossws14">
- <not>
- <isset property="HAVE_JDK_1.5"/>
- </not>
- </condition>
- <condition property="jbossws.build" value="jbossws">
- <isset property="HAVE_JDK_1.5"/>
- </condition>
-
- <property name="jbossws.client.jar" value="${jbossws.build}-client.jar"/>
-
- <!-- Check that the latest build has been deployed -->
- <condition property="jbossws.deployed">
- <and>
- <filesmatch file1="${jboss.client}/${jbossws.client.jar}" file2="${build.lib.dir}/${jbossws.client.jar}"/>
- <equals arg1="${jbossws.target.server}" arg2="jboss"/>
- </and>
- </condition>
- <condition property="jbossws.deployed">
- <and>
- <filesmatch file1="${tomcat.home}/common/lib/jbossws-core.jar" file2="${build.lib.dir}/jbossws-core.jar"/>
- <equals arg1="${jbossws.target.server}" arg2="tomcat"/>
- </and>
- </condition>
- <fail message="jbossws not deployed, run the deploy target" unless="jbossws.deployed"/>
-
<!-- Define excluded tests -->
<condition property="tests.excludesfile" value="${test.resources.dir}/tests-no-excludes.txt">
<equals arg1="${jbossws.target.server}" arg2="jboss"/>
@@ -149,7 +115,7 @@
<!-- The jbossws client classpath -->
<path id="jbossws.client.classpath">
- <pathelement location="${build.lib.dir}/${jbossws.client.jar}"/>
+ <pathelement location="${build.lib.dir}/jbossws-client.jar"/>
<pathelement location="${jboss.client}/activation.jar"/>
<pathelement location="${jboss.client}/commons-logging.jar"/>
<pathelement location="${jboss.client}/javassist.jar"/>
@@ -178,8 +144,8 @@
<pathelement location="${jboss.server.lib}/jboss.jar"/>
<pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
<pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-ejb3x.jar"/>
- <pathelement location="${build.lib.dir}/${jbossws.build}-jboss-integration.jar"/>
- <pathelement location="${build.lib.dir}/${jbossws.build}-tomcat-integration.jar"/>
+ <pathelement location="${build.lib.dir}/jbossws-jboss50-integration.jar"/>
+ <pathelement location="${build.lib.dir}/jbossws-tomcat-integration.jar"/>
</path>
<!--
@@ -188,8 +154,8 @@
-->
<path id="test.client.classpath">
<path refid="jbossws.client.classpath"/>
- <pathelement location="${build.lib.dir}/${jbossws.build}-jboss-integration.jar"/>
- <pathelement location="${build.lib.dir}/${jbossws.build}-tomcat-integration.jar"/>
+ <pathelement location="${build.lib.dir}/jbossws-jboss50-integration.jar"/>
+ <pathelement location="${build.lib.dir}/jbossws-tomcat-integration.jar"/>
<pathelement location="${jboss.client}/jboss-aspect-jdk50-client.jar"/>
<pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/>
<pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
18 years, 10 months
- 1
- 0