JBossWS SVN: r10419 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/eventing/mgmt.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-07-29 13:27:16 -0400 (Wed, 29 Jul 2009)
New Revision: 10419
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java
Log:
[JBWS-2711] Make SubscriptionManager.WatchDog a Daemon Thread
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2009-07-29 16:57:52 UTC (rev 10418)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2009-07-29 17:27:16 UTC (rev 10419)
@@ -662,6 +662,7 @@
public void startup()
{
worker = new Thread(this, "SubscriptionWatchDog");
+ worker.setDaemon(true);
worker.start();
}
14 years, 9 months
JBossWS SVN: r10418 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-07-29 12:57:52 -0400 (Wed, 29 Jul 2009)
New Revision: 10418
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
Increasing JVM heap size
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2009-07-29 12:30:31 UTC (rev 10417)
+++ stack/native/trunk/modules/testsuite/pom.xml 2009-07-29 16:57:52 UTC (rev 10418)
@@ -17,7 +17,7 @@
<properties>
<surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</surefire.security.args>
<surefire.jdwp.args>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdwp.args>
- <surefire.gc.args>-Xmx512m -XX:MaxPermSize=256m -Dcom.sun.management.jmxremote</surefire.gc.args>
+ <surefire.gc.args>-Xmx768m -XX:MaxPermSize=256m -Dcom.sun.management.jmxremote</surefire.gc.args>
<test.archive.directory>${project.build.directory}/test-libs</test.archive.directory>
<test.classes.directory>${project.build.directory}/test-classes</test.classes.directory>
<test.resources.directory>${project.build.directory}/test-resources</test.resources.directory>
14 years, 9 months
JBossWS SVN: r10417 - in framework/trunk: testsuite/test/ant-import and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-29 08:30:31 -0400 (Wed, 29 Jul 2009)
New Revision: 10417
Removed:
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/BackwardCompatibleURLPatternDeploymentAspect.java
Modified:
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ContextPropertiesDeploymentAspect.java
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandler.java
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointLifecycleDeploymentAspect.java
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointMetricsDeploymentAspect.java
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointNameDeploymentAspect.java
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointRecordProcessorDeploymentAspect.java
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/VirtualHostDeploymentAspect.java
framework/trunk/testsuite/test/ant-import/build-testsuite.xml
framework/trunk/testsuite/test/resources/jaxws/jbws1762/WEB-INF/web.xml
Log:
[JBWS-2332] svn merge -r 10171:10396 https://svn.jboss.org/repos/jbossws/framework/branches/ropalka
Deleted: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/BackwardCompatibleURLPatternDeploymentAspect.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/BackwardCompatibleURLPatternDeploymentAspect.java 2009-07-29 12:19:07 UTC (rev 10416)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/BackwardCompatibleURLPatternDeploymentAspect.java 2009-07-29 12:30:31 UTC (rev 10417)
@@ -1,64 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.framework.deployment;
-
-import org.jboss.wsf.framework.deployment.URLPatternDeploymentAspect;
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.Endpoint;
-
-import java.util.StringTokenizer;
-
-
-/**
- * A deployer that assigns the URLPattern to endpoints.
- *
- * This deployer uses the first token from the <port-component-uri>
- * as the context root.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 19-May-2007
- */
-public class BackwardCompatibleURLPatternDeploymentAspect extends URLPatternDeploymentAspect
-{
-
- @Override
- protected String getExplicitPattern(Deployment dep, Endpoint ep)
- {
- String contextRoot = dep.getService().getContextRoot();
- if (contextRoot == null)
- throw new IllegalStateException("Cannot obtain context root");
-
- String urlPattern = super.getExplicitPattern(dep, ep);
- if (urlPattern != null)
- {
- if (urlPattern.startsWith("/") == false)
- urlPattern = "/" + urlPattern;
-
- StringTokenizer st = new StringTokenizer(urlPattern, "/");
- if (st.countTokens() > 1 && urlPattern.startsWith(contextRoot + "/"))
- {
- urlPattern = urlPattern.substring(contextRoot.length());
- }
- }
- return urlPattern;
- }
-}
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ContextPropertiesDeploymentAspect.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ContextPropertiesDeploymentAspect.java 2009-07-29 12:19:07 UTC (rev 10416)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ContextPropertiesDeploymentAspect.java 2009-07-29 12:30:31 UTC (rev 10417)
@@ -49,7 +49,7 @@
}
@Override
- public void create(Deployment dep)
+ public void start(Deployment dep)
{
if (contextProperties != null)
{
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java 2009-07-29 12:19:07 UTC (rev 10416)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java 2009-07-29 12:30:31 UTC (rev 10417)
@@ -40,7 +40,7 @@
public class ContextRootDeploymentAspect extends DeploymentAspect
{
@Override
- public void create(Deployment dep)
+ public void start(Deployment dep)
{
String contextRoot = dep.getService().getContextRoot();
if (contextRoot == null)
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandler.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandler.java 2009-07-29 12:19:07 UTC (rev 10416)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandler.java 2009-07-29 12:30:31 UTC (rev 10417)
@@ -38,25 +38,12 @@
// provide logging
protected final Logger log = Logger.getLogger(getClass());
- public void create(Endpoint ep)
- {
- log.debug("Create: " + ep.getName());
-
- InvocationHandler invHandler = ep.getInvocationHandler();
- if (invHandler == null)
- throw new IllegalStateException("Invocation handler not available");
-
- invHandler.init(ep);
-
- ep.setState(EndpointState.CREATED);
- }
-
public void start(Endpoint ep)
{
log.debug("Start: " + ep.getName());
EndpointState state = ep.getState();
- if (state == EndpointState.UNDEFINED || state == EndpointState.DESTROYED)
+ if (state != EndpointState.UNDEFINED)
{
log.error("Cannot start endpoint in state: " + state);
}
@@ -65,6 +52,11 @@
if (ep.getEndpointMetrics() != null)
ep.getEndpointMetrics().start();
+ InvocationHandler invHandler = ep.getInvocationHandler();
+ if (invHandler == null)
+ throw new IllegalStateException("Invocation handler not available");
+ invHandler.init(ep);
+
ep.setState(EndpointState.STARTED);
}
}
@@ -87,10 +79,4 @@
}
}
- public void destroy(Endpoint ep)
- {
- log.debug("Destroy: " + ep.getName());
-
- ep.setState(EndpointState.DESTROYED);
- }
}
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java 2009-07-29 12:19:07 UTC (rev 10416)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java 2009-07-29 12:30:31 UTC (rev 10417)
@@ -111,14 +111,9 @@
throw new IllegalStateException("Required conditions '" + aspect.getRequires() + "' not satisfied by '" + providedConditions + "' for: " + aspect);
*/
- logInvocation(aspect, "Create");
- aspect.create(dep);
-
providedConditions.addAll(aspect.getProvidesAsSet());
}
- dep.setState(DeploymentState.CREATED);
-
// start the deployment
for (int i = 0; i < getDeploymentAspects().size(); i++)
{
@@ -133,7 +128,7 @@
while (i-- >= 0)
{
// destroy the deployment
- failsafeDestroy(aspect, dep);
+ failsafeStop(aspect, dep);
}
throw rte;
}
@@ -144,7 +139,6 @@
public void undeploy(Deployment dep)
{
- // stop the deployment
for (int i = getDeploymentAspects().size(); 0 < i; i--)
{
DeploymentAspect aspect = getDeploymentAspects().get(i - 1);
@@ -152,15 +146,6 @@
}
dep.setState(DeploymentState.STOPPED);
-
- // destroy the deployment
- for (int i = getDeploymentAspects().size(); 0 < i; i--)
- {
- DeploymentAspect aspect = getDeploymentAspects().get(i - 1);
- failsafeDestroy(aspect, dep);
- }
-
- dep.setState(DeploymentState.DESTROYED);
}
private void failsafeStop(DeploymentAspect aspect, Deployment dep)
@@ -176,23 +161,11 @@
}
}
- private void failsafeDestroy(DeploymentAspect aspect, Deployment dep)
- {
- try
- {
- logInvocation(aspect, "Destroy");
- aspect.destroy(dep);
- }
- catch (RuntimeException rte)
- {
- WSFDeploymentException.rethrow(rte);
- }
- }
-
private void logInvocation(DeploymentAspect aspect, String method)
{
String name = aspect.getClass().getName();
name = name.substring(name.lastIndexOf(".") + 1);
- log.debug(name + ":" + method);
+ log.debug("[" + this.name + "]" + name + ":" + method);
}
+
}
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java 2009-07-29 12:19:07 UTC (rev 10416)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java 2009-07-29 12:30:31 UTC (rev 10417)
@@ -35,10 +35,11 @@
* @author Thomas.Diesler(a)jboss.org
* @since 31-Jul-2007
*/
+// TODO: [JBWS-2674] review this deployment aspect once AS IL is rewritten
public class EndpointAPIDeploymentAspect extends DeploymentAspect
{
@Override
- public void create(Deployment dep)
+ public void start(Deployment dep)
{
dep.setType(DeploymentType.JAXWS_JSE);
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java 2009-07-29 12:19:07 UTC (rev 10416)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java 2009-07-29 12:30:31 UTC (rev 10417)
@@ -38,7 +38,7 @@
public class EndpointAddressDeploymentAspect extends DeploymentAspect
{
@Override
- public void create(Deployment dep)
+ public void start(Deployment dep)
{
String contextRoot = dep.getService().getContextRoot();
if (contextRoot == null)
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2009-07-29 12:19:07 UTC (rev 10416)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2009-07-29 12:30:31 UTC (rev 10417)
@@ -54,7 +54,7 @@
}
@Override
- public void create(Deployment dep)
+ public void start(Deployment dep)
{
for (Endpoint ep : dep.getService().getEndpoints())
{
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointLifecycleDeploymentAspect.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointLifecycleDeploymentAspect.java 2009-07-29 12:19:07 UTC (rev 10416)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointLifecycleDeploymentAspect.java 2009-07-29 12:30:31 UTC (rev 10417)
@@ -31,14 +31,6 @@
*/
public class EndpointLifecycleDeploymentAspect extends DeploymentAspect
{
- @Override
- public void create(Deployment dep)
- {
- for (Endpoint ep : dep.getService().getEndpoints())
- {
- getLifecycleHandler(ep, true).create(ep);
- }
- }
@Override
public void start(Deployment dep)
@@ -64,21 +56,6 @@
}
}
- @Override
- public void destroy(Deployment dep)
- {
- Service service = dep.getService();
- if (service != null)
- {
- for (Endpoint ep : service.getEndpoints())
- {
- LifecycleHandler lifecycleHandler = getLifecycleHandler(ep, false);
- if (lifecycleHandler != null)
- lifecycleHandler.destroy(ep);
- }
- }
- }
-
private LifecycleHandler getLifecycleHandler(Endpoint ep, boolean assertHandler)
{
LifecycleHandler lifecycleHandler = ep.getLifecycleHandler();
@@ -87,4 +64,5 @@
return lifecycleHandler;
}
+
}
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointMetricsDeploymentAspect.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointMetricsDeploymentAspect.java 2009-07-29 12:19:07 UTC (rev 10416)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointMetricsDeploymentAspect.java 2009-07-29 12:30:31 UTC (rev 10417)
@@ -38,7 +38,7 @@
public class EndpointMetricsDeploymentAspect extends DeploymentAspect
{
@Override
- public void create(Deployment dep)
+ public void start(Deployment dep)
{
SPIProvider provider = SPIProviderResolver.getInstance().getProvider();
EndpointMetricsFactory factory = provider.getSPI(EndpointMetricsFactory.class);
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointNameDeploymentAspect.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointNameDeploymentAspect.java 2009-07-29 12:19:07 UTC (rev 10416)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointNameDeploymentAspect.java 2009-07-29 12:30:31 UTC (rev 10417)
@@ -38,7 +38,7 @@
public class EndpointNameDeploymentAspect extends DeploymentAspect
{
@Override
- public void create(Deployment dep)
+ public void start(Deployment dep)
{
String contextRoot = dep.getService().getContextRoot();
if (contextRoot == null || contextRoot.startsWith("/") == false)
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointRecordProcessorDeploymentAspect.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointRecordProcessorDeploymentAspect.java 2009-07-29 12:19:07 UTC (rev 10416)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointRecordProcessorDeploymentAspect.java 2009-07-29 12:30:31 UTC (rev 10417)
@@ -77,7 +77,7 @@
}
@Override
- public void destroy(Deployment dep)
+ public void stop(Deployment dep)
{
for (Endpoint ep : dep.getService().getEndpoints())
{
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java 2009-07-29 12:19:07 UTC (rev 10416)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java 2009-07-29 12:30:31 UTC (rev 10417)
@@ -38,7 +38,7 @@
{
private EndpointRegistry registry;
- public void create(Deployment dep)
+ public void start(Deployment dep)
{
SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
if (registry == null)
@@ -49,7 +49,7 @@
}
}
- public void destroy(Deployment dep)
+ public void stop(Deployment dep)
{
SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
if (registry == null)
@@ -59,4 +59,5 @@
registry.unregister(ep);
}
}
+
}
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java 2009-07-29 12:19:07 UTC (rev 10416)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java 2009-07-29 12:30:31 UTC (rev 10417)
@@ -21,6 +21,8 @@
*/
package org.jboss.wsf.framework.deployment;
+import java.util.StringTokenizer;
+
import org.jboss.wsf.spi.annotation.WebContext;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
@@ -38,7 +40,7 @@
public class URLPatternDeploymentAspect extends DeploymentAspect
{
@Override
- public void create(Deployment dep)
+ public void start(Deployment dep)
{
for (Endpoint ep : dep.getService().getEndpoints())
{
@@ -78,6 +80,19 @@
{
EJBMetaData bmd = appMetaData.getBeanByEjbName(ep.getShortName());
urlPattern = bmd.getPortComponentURI();
+ if (urlPattern != null)
+ {
+ String contextRoot = dep.getService().getContextRoot();
+
+ if (urlPattern.startsWith("/") == false)
+ urlPattern = "/" + urlPattern;
+
+ StringTokenizer st = new StringTokenizer(urlPattern, "/");
+ if (st.countTokens() > 1 && urlPattern.startsWith(contextRoot + "/"))
+ {
+ urlPattern = urlPattern.substring(contextRoot.length());
+ }
+ }
}
// #3 For EJB use @WebContext.urlPattern
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/VirtualHostDeploymentAspect.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/VirtualHostDeploymentAspect.java 2009-07-29 12:19:07 UTC (rev 10416)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/VirtualHostDeploymentAspect.java 2009-07-29 12:30:31 UTC (rev 10417)
@@ -28,6 +28,7 @@
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
/**
* A deployer that assigns the virtual hosts to the service
@@ -39,14 +40,16 @@
{
@Override
- public void create(Deployment dep)
+ public void start(Deployment dep)
{
- String[] virtualHosts = dep.getService().getVirtualHosts();
- if (virtualHosts == null)
+ if ( DeploymentType.JAXWS_EJB3.equals(dep.getType()))
{
- dep.getService().setVirtualHosts(getExplicitVirtualHosts(dep));
+ String[] virtualHosts = dep.getService().getVirtualHosts();
+ if (virtualHosts == null)
+ {
+ dep.getService().setVirtualHosts(getExplicitVirtualHosts(dep));
+ }
}
-
}
protected String[] getExplicitVirtualHosts(Deployment dep)
Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2009-07-29 12:19:07 UTC (rev 10416)
+++ framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2009-07-29 12:30:31 UTC (rev 10417)
@@ -489,7 +489,6 @@
<exclude name="jaxrpc/samples-override/**"/>
</fileset>
<filterset>
- <filter token="endpoint.servlet" value="${endpoint.servlet}"/>
<filter token="java.home" value="${java.home}"/>
<filter token="jboss.bind.address" value="${node0}"/>
<filter token="tests.output.dir" value="${tests.output.dir}"/>
Modified: framework/trunk/testsuite/test/resources/jaxws/jbws1762/WEB-INF/web.xml
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws1762/WEB-INF/web.xml 2009-07-29 12:19:07 UTC (rev 10416)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws1762/WEB-INF/web.xml 2009-07-29 12:30:31 UTC (rev 10417)
@@ -4,11 +4,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
<servlet>
<servlet-name>POJOBean</servlet-name>
- <servlet-class>@endpoint.servlet@</servlet-class>
- <init-param>
- <param-name>jboss.ws.endpoint</param-name>
- <param-value>org.jboss.test.ws.jaxws.jbws1762.services.POJOBean</param-value>
- </init-param>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws1762.services.POJOBean</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>POJOBean</servlet-name>
14 years, 9 months
JBossWS SVN: r10416 - in common/trunk/src/main/java/org/jboss/wsf: common/integration and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-29 08:19:07 -0400 (Wed, 29 Jul 2009)
New Revision: 10416
Added:
common/trunk/src/main/java/org/jboss/wsf/common/integration/
common/trunk/src/main/java/org/jboss/wsf/common/integration/WSConstants.java
common/trunk/src/main/java/org/jboss/wsf/common/integration/WSHelper.java
Removed:
common/trunk/src/main/java/org/jboss/wsf/common/integration/WSConstants.java
common/trunk/src/main/java/org/jboss/wsf/common/integration/WSHelper.java
Modified:
common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
Log:
[JBWS-2332] svn merge -r 10170:10398 https://svn.jboss.org/repos/jbossws/common/branches/ropalka
Copied: common/trunk/src/main/java/org/jboss/wsf/common/integration (from rev 10398, common/branches/ropalka/src/main/java/org/jboss/wsf/common/integration)
Deleted: common/trunk/src/main/java/org/jboss/wsf/common/integration/WSConstants.java
===================================================================
--- common/branches/ropalka/src/main/java/org/jboss/wsf/common/integration/WSConstants.java 2009-07-28 10:39:39 UTC (rev 10398)
+++ common/trunk/src/main/java/org/jboss/wsf/common/integration/WSConstants.java 2009-07-29 12:19:07 UTC (rev 10416)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.common.integration;
-
-/**
- * Cross WS stack and JBoss AS integration constants.
- *
- * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
- */
-public final class WSConstants
-{
-
- /**
- * Stack specific context parameters configuration property.
- */
- public static final String STACK_CONTEXT_PARAMS = "stack.context.parameters";
- /**
- * Stack specific transport class configuration property.
- */
- public static final String STACK_TRANSPORT_CLASS = "stack.transport.class";
-
- /**
- * Forbidden constructor.
- */
- private WSConstants()
- {
- super();
- }
-
-}
Copied: common/trunk/src/main/java/org/jboss/wsf/common/integration/WSConstants.java (from rev 10398, common/branches/ropalka/src/main/java/org/jboss/wsf/common/integration/WSConstants.java)
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/integration/WSConstants.java (rev 0)
+++ common/trunk/src/main/java/org/jboss/wsf/common/integration/WSConstants.java 2009-07-29 12:19:07 UTC (rev 10416)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.common.integration;
+
+/**
+ * Cross WS stack and JBoss AS integration constants.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public final class WSConstants
+{
+
+ /**
+ * Stack specific context parameters configuration property.
+ */
+ public static final String STACK_CONTEXT_PARAMS = "stack.context.parameters";
+ /**
+ * Stack specific transport class configuration property.
+ */
+ public static final String STACK_TRANSPORT_CLASS = "stack.transport.class";
+
+ /**
+ * Forbidden constructor.
+ */
+ private WSConstants()
+ {
+ super();
+ }
+
+}
Deleted: common/trunk/src/main/java/org/jboss/wsf/common/integration/WSHelper.java
===================================================================
--- common/branches/ropalka/src/main/java/org/jboss/wsf/common/integration/WSHelper.java 2009-07-28 10:39:39 UTC (rev 10398)
+++ common/trunk/src/main/java/org/jboss/wsf/common/integration/WSHelper.java 2009-07-29 12:19:07 UTC (rev 10416)
@@ -1,193 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.common.integration;
-
-import org.jboss.logging.Logger;
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
-
-/**
- * Cross WS stack and JBoss AS integration helper.
- *
- * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
- */
-public final class WSHelper
-{
-
- /** Logger. */
- private static final Logger LOG = Logger.getLogger( WSHelper.class );
-
- /**
- * Forbidden constructor.
- */
- private WSHelper()
- {
- super();
- }
-
- /**
- * Returns required attachment value from webservice deployment.
- *
- * @param <A> expected value
- * @param dep webservice deployment
- * @param key attachment key
- * @return required attachment
- * @throws IllegalStateException if attachment value is null
- */
- public static <A> A getRequiredAttachment( final Deployment dep, final Class< A > key )
- {
- final A value = dep.getAttachment( key );
- if ( value == null )
- {
- WSHelper.LOG.error( "Cannot find attachment in webservice deployment: " + key );
- throw new IllegalStateException();
- }
-
- return value;
- }
-
- /**
- * Returns optional attachment value from webservice deployment or null if not bound.
- *
- * @param <A> expected value
- * @param dep webservice deployment
- * @param key attachment key
- * @return optional attachment value or null
- */
- public static <A> A getOptionalAttachment( final Deployment dep, final Class< A > key )
- {
- return dep.getAttachment( key );
- }
-
- /**
- * Returns true if webservice deployment have attachment value associated with the <b>key</b>.
- *
- * @param dep webservice deployment
- * @param key attachment key
- * @return true if contains attachment, false otherwise
- */
- public static boolean hasAttachment( final Deployment dep, final Class< ? > key )
- {
- return WSHelper.getOptionalAttachment( dep, key ) != null;
- }
-
- /**
- * Returns true if deployment represents JAXRPC EJB deployment.
- *
- * @param dep webservice deployment
- * @return true if JAXRPC EJB deployment, false otherwise
- */
- public static boolean isJaxrpcEjbDeployment( final Deployment dep )
- {
- return DeploymentType.JAXRPC_EJB21.equals( dep.getType() );
- }
-
- /**
- * Returns true if deployment represents JAXRPC JSE deployment.
- *
- * @param dep webservice deployment
- * @return true if JAXRPC JSE deployment, false otherwise
- */
- public static boolean isJaxrpcJseDeployment( final Deployment dep )
- {
- return DeploymentType.JAXRPC_JSE.equals( dep.getType() );
- }
-
- /**
- * Returns true if deployment represents JAXWS EJB deployment.
- *
- * @param dep webservice deployment
- * @return true if JAXWS EJB deployment, false otherwise
- */
- public static boolean isJaxwsEjbDeployment( final Deployment dep )
- {
- return DeploymentType.JAXWS_EJB3.equals( dep.getType() );
- }
-
- /**
- * Returns true if deployment represents JAXWS JSE deployment.
- *
- * @param dep webservice deployment
- * @return true if JAXWS JSE deployment, false otherwise
- */
- public static boolean isJaxwsJseDeployment( final Deployment dep )
- {
- return DeploymentType.JAXWS_JSE.equals( dep.getType() );
- }
-
- /**
- * Returns true if deployment represents either JAXWS JSE or JAXRPC JSE deployment.
- *
- * @param dep webservice deployment
- * @return true if either JAXWS JSE or JAXRPC JSE deployment, false otherwise.
- */
- public static boolean isJseDeployment( final Deployment dep )
- {
- final boolean isJaxwsJse = WSHelper.isJaxwsJseDeployment( dep );
- final boolean isJaxrpcJse = WSHelper.isJaxrpcJseDeployment( dep );
-
- return isJaxwsJse || isJaxrpcJse;
- }
-
- /**
- * Returns true if deployment represents either JAXWS EJB or JAXRPC EJB deployment.
- *
- * @param dep webservice deployment
- * @return true if either JAXWS EJB or JAXRPC EJB deployment, false otherwise
- */
- public static boolean isEjbDeployment( final Deployment dep )
- {
- final boolean isJaxwsEjb = WSHelper.isJaxwsEjbDeployment( dep );
- final boolean isJaxrpcEjb = WSHelper.isJaxrpcEjbDeployment( dep );
-
- return isJaxwsEjb || isJaxrpcEjb;
- }
-
- /**
- * Returns true if deployment represents either JAXWS EJB or JAXWS JSE deployment.
- *
- * @param dep webservice deployment
- * @return true if either JAXWS EJB or JAXWS JSE deployment, false otherwise
- */
- public static boolean isJaxwsDeployment( final Deployment dep )
- {
- final boolean isJaxwsEjb = WSHelper.isJaxwsEjbDeployment( dep );
- final boolean isJaxwsJse = WSHelper.isJaxwsJseDeployment( dep );
-
- return isJaxwsEjb || isJaxwsJse;
- }
-
- /**
- * Returns true if deployment represents either JAXRPC EJB or JAXRPC JSE deployment.
- *
- * @param dep webservice deployment
- * @return true if either JAXRPC EJB or JAXRPC JSE deployment, false otherwise
- */
- public static boolean isJaxrpcDeployment( final Deployment dep )
- {
- final boolean isJaxrpcEjb = WSHelper.isJaxrpcEjbDeployment( dep );
- final boolean isJaxrpcJse = WSHelper.isJaxrpcJseDeployment( dep );
-
- return isJaxrpcEjb || isJaxrpcJse;
- }
-
-}
Copied: common/trunk/src/main/java/org/jboss/wsf/common/integration/WSHelper.java (from rev 10398, common/branches/ropalka/src/main/java/org/jboss/wsf/common/integration/WSHelper.java)
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/integration/WSHelper.java (rev 0)
+++ common/trunk/src/main/java/org/jboss/wsf/common/integration/WSHelper.java 2009-07-29 12:19:07 UTC (rev 10416)
@@ -0,0 +1,193 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.common.integration;
+
+import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
+
+/**
+ * Cross WS stack and JBoss AS integration helper.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public final class WSHelper
+{
+
+ /** Logger. */
+ private static final Logger LOG = Logger.getLogger( WSHelper.class );
+
+ /**
+ * Forbidden constructor.
+ */
+ private WSHelper()
+ {
+ super();
+ }
+
+ /**
+ * Returns required attachment value from webservice deployment.
+ *
+ * @param <A> expected value
+ * @param dep webservice deployment
+ * @param key attachment key
+ * @return required attachment
+ * @throws IllegalStateException if attachment value is null
+ */
+ public static <A> A getRequiredAttachment( final Deployment dep, final Class< A > key )
+ {
+ final A value = dep.getAttachment( key );
+ if ( value == null )
+ {
+ WSHelper.LOG.error( "Cannot find attachment in webservice deployment: " + key );
+ throw new IllegalStateException();
+ }
+
+ return value;
+ }
+
+ /**
+ * Returns optional attachment value from webservice deployment or null if not bound.
+ *
+ * @param <A> expected value
+ * @param dep webservice deployment
+ * @param key attachment key
+ * @return optional attachment value or null
+ */
+ public static <A> A getOptionalAttachment( final Deployment dep, final Class< A > key )
+ {
+ return dep.getAttachment( key );
+ }
+
+ /**
+ * Returns true if webservice deployment have attachment value associated with the <b>key</b>.
+ *
+ * @param dep webservice deployment
+ * @param key attachment key
+ * @return true if contains attachment, false otherwise
+ */
+ public static boolean hasAttachment( final Deployment dep, final Class< ? > key )
+ {
+ return WSHelper.getOptionalAttachment( dep, key ) != null;
+ }
+
+ /**
+ * Returns true if deployment represents JAXRPC EJB deployment.
+ *
+ * @param dep webservice deployment
+ * @return true if JAXRPC EJB deployment, false otherwise
+ */
+ public static boolean isJaxrpcEjbDeployment( final Deployment dep )
+ {
+ return DeploymentType.JAXRPC_EJB21.equals( dep.getType() );
+ }
+
+ /**
+ * Returns true if deployment represents JAXRPC JSE deployment.
+ *
+ * @param dep webservice deployment
+ * @return true if JAXRPC JSE deployment, false otherwise
+ */
+ public static boolean isJaxrpcJseDeployment( final Deployment dep )
+ {
+ return DeploymentType.JAXRPC_JSE.equals( dep.getType() );
+ }
+
+ /**
+ * Returns true if deployment represents JAXWS EJB deployment.
+ *
+ * @param dep webservice deployment
+ * @return true if JAXWS EJB deployment, false otherwise
+ */
+ public static boolean isJaxwsEjbDeployment( final Deployment dep )
+ {
+ return DeploymentType.JAXWS_EJB3.equals( dep.getType() );
+ }
+
+ /**
+ * Returns true if deployment represents JAXWS JSE deployment.
+ *
+ * @param dep webservice deployment
+ * @return true if JAXWS JSE deployment, false otherwise
+ */
+ public static boolean isJaxwsJseDeployment( final Deployment dep )
+ {
+ return DeploymentType.JAXWS_JSE.equals( dep.getType() );
+ }
+
+ /**
+ * Returns true if deployment represents either JAXWS JSE or JAXRPC JSE deployment.
+ *
+ * @param dep webservice deployment
+ * @return true if either JAXWS JSE or JAXRPC JSE deployment, false otherwise.
+ */
+ public static boolean isJseDeployment( final Deployment dep )
+ {
+ final boolean isJaxwsJse = WSHelper.isJaxwsJseDeployment( dep );
+ final boolean isJaxrpcJse = WSHelper.isJaxrpcJseDeployment( dep );
+
+ return isJaxwsJse || isJaxrpcJse;
+ }
+
+ /**
+ * Returns true if deployment represents either JAXWS EJB or JAXRPC EJB deployment.
+ *
+ * @param dep webservice deployment
+ * @return true if either JAXWS EJB or JAXRPC EJB deployment, false otherwise
+ */
+ public static boolean isEjbDeployment( final Deployment dep )
+ {
+ final boolean isJaxwsEjb = WSHelper.isJaxwsEjbDeployment( dep );
+ final boolean isJaxrpcEjb = WSHelper.isJaxrpcEjbDeployment( dep );
+
+ return isJaxwsEjb || isJaxrpcEjb;
+ }
+
+ /**
+ * Returns true if deployment represents either JAXWS EJB or JAXWS JSE deployment.
+ *
+ * @param dep webservice deployment
+ * @return true if either JAXWS EJB or JAXWS JSE deployment, false otherwise
+ */
+ public static boolean isJaxwsDeployment( final Deployment dep )
+ {
+ final boolean isJaxwsEjb = WSHelper.isJaxwsEjbDeployment( dep );
+ final boolean isJaxwsJse = WSHelper.isJaxwsJseDeployment( dep );
+
+ return isJaxwsEjb || isJaxwsJse;
+ }
+
+ /**
+ * Returns true if deployment represents either JAXRPC EJB or JAXRPC JSE deployment.
+ *
+ * @param dep webservice deployment
+ * @return true if either JAXRPC EJB or JAXRPC JSE deployment, false otherwise
+ */
+ public static boolean isJaxrpcDeployment( final Deployment dep )
+ {
+ final boolean isJaxrpcEjb = WSHelper.isJaxrpcEjbDeployment( dep );
+ final boolean isJaxrpcJse = WSHelper.isJaxrpcJseDeployment( dep );
+
+ return isJaxrpcEjb || isJaxrpcJse;
+ }
+
+}
Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2009-07-29 11:57:51 UTC (rev 10415)
+++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2009-07-29 12:19:07 UTC (rev 10416)
@@ -50,6 +50,7 @@
private static final String SYSPROP_JBOSS_BIND_ADDRESS = "jboss.bind.address";
private static final String SYSPROP_TEST_ARCHIVE_DIRECTORY = "test.archive.directory";
private static final String SYSPROP_TEST_RESOURCES_DIRECTORY = "test.resources.directory";
+ private static final boolean DEPLOY_PROCESS_ENABLED = !Boolean.getBoolean("test.disable.deployment");
private static MBeanServerConnection server;
private static String integrationTarget;
@@ -63,16 +64,22 @@
*/
public void deploy(String archive) throws Exception
{
- URL url = getArchiveFile(archive).toURL();
- getDeployer().deploy(url);
+ if ( DEPLOY_PROCESS_ENABLED )
+ {
+ URL archiveURL = getArchiveFile(archive).toURL();
+ getDeployer().deploy(archiveURL);
+ }
}
/** Undeploy the given archive
*/
public void undeploy(String archive) throws Exception
{
- URL url = getArchiveFile(archive).toURL();
- getDeployer().undeploy(url);
+ if ( DEPLOY_PROCESS_ENABLED )
+ {
+ URL archiveURL = getArchiveFile(archive).toURL();
+ getDeployer().undeploy(archiveURL);
+ }
}
/** True, if -Djbossws.integration.target=jboss5x */
14 years, 9 months
JBossWS SVN: r10415 - spi/trunk/src/main/java/org/jboss/wsf/spi/deployment.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-29 07:57:51 -0400 (Wed, 29 Jul 2009)
New Revision: 10415
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandler.java
Log:
[JBWS-2332] svn merge -r 10169:10303 https://svn.jboss.org/repos/jbossws/spi/branches/ropalka
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2009-07-29 11:51:55 UTC (rev 10414)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2009-07-29 11:57:51 UTC (rev 10415)
@@ -27,19 +27,17 @@
* It has no notion of J2EE deployment packages.
*
* @author Thomas.Diesler(a)jboss.com
- * @since 20-Apr-2007
*/
public interface Deployment extends Extensible
{
public enum DeploymentType
{
- JAXRPC_CLIENT, JAXRPC_JSE, JAXRPC_EJB21, JAXWS_JSE, JAXWS_EJB3,
- @Deprecated JAXRPC_EJB3
+ JAXRPC_JSE, JAXRPC_EJB21, JAXWS_JSE, JAXWS_EJB3,
};
public enum DeploymentState
{
- UNDEFINED, CREATED, STARTED, STOPPED, DESTROYED
+ UNDEFINED, STARTED, STOPPED
};
/** Get the identifier for this deployment */
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java 2009-07-29 11:51:55 UTC (rev 10414)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java 2009-07-29 11:57:51 UTC (rev 10415)
@@ -45,7 +45,19 @@
private String provides;
private String requires;
+ private int relativeOrder;
+ private boolean isLast;
+ public void setLast(boolean isLast)
+ {
+ this.isLast = isLast;
+ }
+
+ public boolean isLast()
+ {
+ return this.isLast;
+ }
+
public String getProvides()
{
return provides;
@@ -65,13 +77,15 @@
{
this.requires = requires;
}
-
- public void create(Deployment dep)
+
+ public void setRelativeOrder(int relativeOrder)
{
+ this.relativeOrder = relativeOrder;
}
-
- public void destroy(Deployment dep)
+
+ public int getRelativeOrder()
{
+ return this.relativeOrder;
}
public void start(Deployment dep)
@@ -87,7 +101,7 @@
Set<String> condset = new HashSet<String>();
if (provides != null)
{
- StringTokenizer st = new StringTokenizer(provides, ", ");
+ StringTokenizer st = new StringTokenizer(provides, ", \r\n\t");
while (st.hasMoreTokens())
condset.add(st.nextToken());
}
@@ -99,7 +113,7 @@
Set<String> condset = new HashSet<String>();
if (requires != null)
{
- StringTokenizer st = new StringTokenizer(requires, ", ");
+ StringTokenizer st = new StringTokenizer(requires, ", \r\n\t");
while (st.hasMoreTokens())
condset.add(st.nextToken());
}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2009-07-29 11:51:55 UTC (rev 10414)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2009-07-29 11:57:51 UTC (rev 10415)
@@ -47,7 +47,7 @@
public enum EndpointState
{
- UNDEFINED, CREATED, STARTED, STOPPED, DESTROYED
+ UNDEFINED, STARTED, STOPPED
};
/** Get the service this endpoint belongs to */
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandler.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandler.java 2009-07-29 11:51:55 UTC (rev 10414)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandler.java 2009-07-29 11:57:51 UTC (rev 10415)
@@ -29,15 +29,9 @@
*/
public interface LifecycleHandler
{
- /** Handle the create step of an endpoint */
- void create(Endpoint endpoint);
-
/** Handle the start step of an endpoint */
void start(Endpoint endpoint);
/** Handle the stop step of an endpoint */
void stop(Endpoint endpoint);
-
- /** Handle the destroy step of an endpoint */
- void destroy(Endpoint endpoint);
}
14 years, 9 months
JBossWS SVN: r10414 - in container/jboss50/branches/ropalka-jboss510: eclipse and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-29 07:51:55 -0400 (Wed, 29 Jul 2009)
New Revision: 10414
Added:
container/jboss50/branches/ropalka-jboss510/eclipse/
container/jboss50/branches/ropalka-jboss510/eclipse/JBossWSCheckStyle.xml
Log:
adding JBossWS checkstyle
Added: container/jboss50/branches/ropalka-jboss510/eclipse/JBossWSCheckStyle.xml
===================================================================
--- container/jboss50/branches/ropalka-jboss510/eclipse/JBossWSCheckStyle.xml (rev 0)
+++ container/jboss50/branches/ropalka-jboss510/eclipse/JBossWSCheckStyle.xml 2009-07-29 11:51:55 UTC (rev 10414)
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ This configuration file was written by the eclipse-cs plugin configuration editor
+-->
+<!--
+ Checkstyle-Configuration: JBossWS
+ Description: none
+-->
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+<module name="Checker">
+ <property name="severity" value="warning"/>
+ <module name="TreeWalker">
+ <module name="ModifierOrder"/>
+ <module name="RedundantModifier"/>
+ <module name="AnonInnerLength"/>
+ <module name="ExecutableStatementCount">
+ <property name="max" value="60"/>
+ <property name="tokens" value="INSTANCE_INIT,STATIC_INIT,METHOD_DEF,CTOR_DEF"/>
+ </module>
+ <module name="FileLength">
+ <property name="max" value="1000"/>
+ </module>
+ <module name="LineLength">
+ <property name="max" value="120"/>
+ <property name="tabWidth" value="3"/>
+ </module>
+ <module name="MethodLength"/>
+ <module name="ParameterNumber"/>
+ <module name="AvoidStarImport"/>
+ <module name="IllegalImport"/>
+ <module name="ImportOrder"/>
+ <module name="RedundantImport"/>
+ <module name="UnusedImports"/>
+ <module name="AbstractClassName"/>
+ <module name="ConstantName"/>
+ <module name="LocalFinalVariableName"/>
+ <module name="LocalVariableName"/>
+ <module name="MemberName"/>
+ <module name="MethodName"/>
+ <module name="PackageName"/>
+ <module name="ParameterName"/>
+ <module name="StaticVariableName"/>
+ <module name="TypeName"/>
+ <module name="CovariantEquals"/>
+ <module name="DefaultComesLast"/>
+ <module name="DeclarationOrder"/>
+ <module name="DoubleCheckedLocking"/>
+ <module name="EqualsHashCode"/>
+ <module name="ExplicitInitialization"/>
+ <module name="FallThrough"/>
+ <module name="FinalLocalVariable"/>
+ <module name="IllegalInstantiation"/>
+ <module name="IllegalType">
+ <property name="tokens" value="METHOD_DEF,PARAMETER_DEF"/>
+ </module>
+ <module name="InnerAssignment"/>
+ <module name="MagicNumber">
+ <property name="ignoreNumbers" value="-1, 0, 1"/>
+ </module>
+ <module name="MissingCtor"/>
+ <module name="MissingSwitchDefault"/>
+ <module name="ModifiedControlVariable"/>
+ <module name="MultipleStringLiterals"/>
+ <module name="MultipleVariableDeclarations"/>
+ <module name="NestedIfDepth"/>
+ <module name="NestedTryDepth"/>
+ <module name="PackageDeclaration"/>
+ <module name="ParameterAssignment"/>
+ <module name="RedundantThrows">
+ <property name="logLoadErrors" value="true"/>
+ <property name="suppressLoadErrors" value="true"/>
+ </module>
+ <module name="RequireThis"/>
+ <module name="ReturnCount">
+ <property name="max" value="5"/>
+ </module>
+ <module name="SimplifyBooleanExpression"/>
+ <module name="SimplifyBooleanReturn"/>
+ <module name="StringLiteralEquality"/>
+ <module name="SuperClone"/>
+ <module name="SuperFinalize"/>
+ <module name="ArrayTrailingComma"/>
+ <module name="UnnecessaryParentheses"/>
+ <module name="DesignForExtension"/>
+ <module name="FinalClass"/>
+ <module name="HideUtilityClassConstructor"/>
+ <module name="InterfaceIsType"/>
+ <module name="ThrowsCount"/>
+ <module name="VisibilityModifier"/>
+ <module name="MutableException"/>
+ <module name="EmptyBlock"/>
+ <module name="LeftCurly">
+ <property name="option" value="nl"/>
+ <property name="maxLineLength" value="120"/>
+ </module>
+ <module name="RightCurly">
+ <property name="option" value="alone"/>
+ </module>
+ <module name="EmptyForInitializerPad">
+ <property name="option" value="space"/>
+ </module>
+ <module name="EmptyForIteratorPad">
+ <property name="option" value="space"/>
+ </module>
+ <module name="NoWhitespaceAfter"/>
+ <module name="NoWhitespaceBefore"/>
+ <module name="OperatorWrap">
+ <property name="option" value="eol"/>
+ <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LE,LITERAL_INSTANCEOF,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,SL,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN"/>
+ </module>
+ <module name="MethodParamPad">
+ <property name="allowLineBreaks" value="true"/>
+ </module>
+ <module name="ParenPad">
+ <property name="option" value="space"/>
+ </module>
+ <module name="TabCharacter"/>
+ <module name="TypecastParenPad">
+ <property name="option" value="space"/>
+ <property name="tokens" value="RPAREN,TYPECAST"/>
+ </module>
+ <module name="WhitespaceAround">
+ <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LE,LITERAL_ASSERT,LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_RETURN,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND,WILDCARD_TYPE"/>
+ </module>
+ <module name="NeedBraces"/>
+ <module name="WhitespaceAfter"/>
+ <module name="BooleanExpressionComplexity"/>
+ <module name="ClassDataAbstractionCoupling"/>
+ <module name="ClassFanOutComplexity"/>
+ <module name="CyclomaticComplexity"/>
+ <module name="JavaNCSS"/>
+ <module name="NPathComplexity"/>
+ <module name="UncommentedMain"/>
+ <module name="TodoComment"/>
+ <module name="TrailingComment"/>
+ <module name="Indentation">
+ <property name="basicOffset" value="3"/>
+ <property name="caseIndent" value="3"/>
+ </module>
+ <module name="FinalParameters"/>
+ <module name="ArrayTypeStyle"/>
+ <module name="JavadocMethod">
+ <property name="allowUndeclaredRTE" value="true"/>
+ <property name="logLoadErrors" value="true"/>
+ </module>
+ <module name="JavadocStyle"/>
+ <module name="JavadocType"/>
+ <module name="JavadocVariable"/>
+ <module name="WriteTag"/>
+ <module name="SuperFinalize"/>
+ <module name="GenericIllegalRegexp">
+ <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="System.out regexp"/>
+ <metadata name="com.atlassw.tools.eclipse.checkstyle.customMessage" value="Use logging instead"/>
+ <property name="format" value="System\.out"/>
+ </module>
+ <module name="GenericIllegalRegexp">
+ <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="System.err regexp"/>
+ <metadata name="com.atlassw.tools.eclipse.checkstyle.customMessage" value="Use logging instead"/>
+ <property name="format" value="System\.err"/>
+ </module>
+ <module name="GenericIllegalRegexp">
+ <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="printStackTrace regexp"/>
+ <metadata name="com.atlassw.tools.eclipse.checkstyle.customMessage" value="Use logging instead"/>
+ <property name="format" value="\.printStackTrace"/>
+ </module>
+ </module>
+ <module name="NewlineAtEndOfFile"/>
+</module>
14 years, 9 months
JBossWS SVN: r10413 - stack/cxf/branches/ropalka/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-29 07:38:13 -0400 (Wed, 29 Jul 2009)
New Revision: 10413
Modified:
stack/cxf/branches/ropalka/modules/testsuite/pom.xml
Log:
setting test deployment property
Modified: stack/cxf/branches/ropalka/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/ropalka/modules/testsuite/pom.xml 2009-07-29 11:36:50 UTC (rev 10412)
+++ stack/cxf/branches/ropalka/modules/testsuite/pom.xml 2009-07-29 11:38:13 UTC (rev 10413)
@@ -177,6 +177,10 @@
<value>${jbossws.integration.target}</value>
</property>
<property>
+ <name>test.disable.deployment</name>
+ <value>false</value>
+ </property>
+ <property>
<name>log4j.output.dir</name>
<value>${project.build.directory}</value>
</property>
14 years, 9 months
JBossWS SVN: r10412 - stack/metro/branches/ropalka/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-29 07:36:50 -0400 (Wed, 29 Jul 2009)
New Revision: 10412
Modified:
stack/metro/branches/ropalka/modules/testsuite/pom.xml
Log:
setting test deployment property
Modified: stack/metro/branches/ropalka/modules/testsuite/pom.xml
===================================================================
--- stack/metro/branches/ropalka/modules/testsuite/pom.xml 2009-07-29 11:34:09 UTC (rev 10411)
+++ stack/metro/branches/ropalka/modules/testsuite/pom.xml 2009-07-29 11:36:50 UTC (rev 10412)
@@ -188,6 +188,10 @@
<value>${jbossws.integration.target}</value>
</property>
<property>
+ <name>test.disable.deployment</name>
+ <value>false</value>
+ </property>
+ <property>
<name>log4j.output.dir</name>
<value>${project.build.directory}</value>
</property>
14 years, 9 months
JBossWS SVN: r10411 - stack/native/branches/ropalka/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-29 07:34:09 -0400 (Wed, 29 Jul 2009)
New Revision: 10411
Modified:
stack/native/branches/ropalka/modules/testsuite/pom.xml
Log:
setting test deployment property
Modified: stack/native/branches/ropalka/modules/testsuite/pom.xml
===================================================================
--- stack/native/branches/ropalka/modules/testsuite/pom.xml 2009-07-29 10:37:15 UTC (rev 10410)
+++ stack/native/branches/ropalka/modules/testsuite/pom.xml 2009-07-29 11:34:09 UTC (rev 10411)
@@ -180,6 +180,10 @@
<value>${jbossws.integration.target}</value>
</property>
<property>
+ <name>test.disable.deployment</name>
+ <value>false</value>
+ </property>
+ <property>
<name>log4j.output.dir</name>
<value>${project.build.directory}</value>
</property>
14 years, 9 months
JBossWS SVN: r10410 - stack/native/branches/jbossws-native-3.1.2/src/main/scripts.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-07-29 06:37:15 -0400 (Wed, 29 Jul 2009)
New Revision: 10410
Modified:
stack/native/branches/jbossws-native-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
Log:
svn merge -r 10405:10407 https://svn.jboss.org/repos/jbossws/stack/native/tags/jbossws-native-3.1.... .
Modified: stack/native/branches/jbossws-native-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2009-07-29 10:36:03 UTC (rev 10409)
+++ stack/native/branches/jbossws-native-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2009-07-29 10:37:15 UTC (rev 10410)
@@ -46,7 +46,6 @@
<include>org.jboss.ws.native:jbossws-native-jaxws-ext:jar</include>
<include>org.jboss.ws.native:jbossws-native-saaj:jar</include>
<include>org.codehaus.jettison:jettison:jar</include>
- <include>wscommons-policy:policy:jar</include>
<include>stax:stax-api:jar</include>
<include>org.jvnet.staxex:stax-ex:jar</include>
<include>com.sun.xml.stream.buffer:streambuffer:jar</include>
14 years, 9 months