JBossWS SVN: r4277 - stack/native/branches/native-2.0/src/main/java/org/jboss/wsf/stack/jbws.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-09 04:42:45 -0400 (Thu, 09 Aug 2007)
New Revision: 4277
Modified:
stack/native/branches/native-2.0/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java
Log:
Start endpoint on demand
Modified: stack/native/branches/native-2.0/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java
===================================================================
--- stack/native/branches/native-2.0/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2007-08-09 08:34:58 UTC (rev 4276)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2007-08-09 08:42:45 UTC (rev 4277)
@@ -95,22 +95,15 @@
{
initEndpoint(contextPath, getServletName());
initEndpointConfig();
- initializeAndStart();
+ startEndpoint();
}
- private void initializeAndStart()
+ private void startEndpoint()
{
+ // Start the endpoint
Deployment dep = endpoint.getService().getDeployment();
if (dep.getType() == DeploymentType.JAXRPC_JSE || dep.getType() == DeploymentType.JAXWS_JSE)
{
- // Initialize the meta data model
- UnifiedMetaData umd = dep.getAttachment(UnifiedMetaData.class);
- if (umd.isEagerInitialized() == false) // TODO: remove this piece
- {
- throw new IllegalStateException("UMD should be initialized already");
- }
-
- // Start the endpoint
if (endpoint.getState() == EndpointState.CREATED)
endpoint.getLifecycleHandler().start(endpoint);
}
18 years, 5 months
JBossWS SVN: r4276 - in container: jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-09 04:34:58 -0400 (Thu, 09 Aug 2007)
New Revision: 4276
Added:
container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/DeployerHookPostJSE.java
Removed:
container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/Phase2DeployerHookJSE.java
Modified:
container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPostJSE.java
container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPostJSE.java
container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java
container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/DeployerHookPostJSE.java
container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookPreJSE.java
Log:
Fix Post JSE handling
Copied: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/DeployerHookPostJSE.java (from rev 4243, container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/Phase2DeployerHookJSE.java)
===================================================================
--- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/DeployerHookPostJSE.java (rev 0)
+++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/DeployerHookPostJSE.java 2007-08-09 08:34:58 UTC (rev 4276)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.container.jboss42;
+
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.wsf.spi.deployment.Deployment;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+public abstract class DeployerHookPostJSE extends AbstractDeployerHookJSE
+{
+ /**
+ * The deployment should be created in phase 1.
+ */
+ @Override
+ public Deployment createDeployment(DeploymentInfo di)
+ {
+ Deployment deployment = (Deployment)di.context.get(Deployment.class);
+ if (null == deployment)
+ throw new IllegalArgumentException("spi.Deployment missing. Should be created in Phase 1");
+
+ return deployment;
+ }
+
+ /**
+ * A phase 2 deployer hook needs to reject first-place
+ * JSE deployments and wait for those that are re-written.
+ * We rely on the fact that spi.Deployment is created in phase 1.
+ */
+ @Override
+ public boolean isWebServiceDeployment(DeploymentInfo di)
+ {
+ if (super.isWebServiceDeployment(di) == false)
+ return false;
+
+ Deployment deployment = (Deployment)di.context.get(Deployment.class);
+ return deployment != null;
+ }
+
+}
Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPostJSE.java
===================================================================
--- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPostJSE.java 2007-08-09 08:32:39 UTC (rev 4275)
+++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPostJSE.java 2007-08-09 08:34:58 UTC (rev 4276)
@@ -31,7 +31,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 25-Apr-2007
*/
-public class JAXRPCDeployerHookPostJSE extends Phase2DeployerHookJSE
+public class JAXRPCDeployerHookPostJSE extends DeployerHookPostJSE
{
/** Get the deployment type this deployer can handle
*/
Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPostJSE.java
===================================================================
--- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPostJSE.java 2007-08-09 08:32:39 UTC (rev 4275)
+++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPostJSE.java 2007-08-09 08:34:58 UTC (rev 4276)
@@ -31,7 +31,7 @@
* @author Heiko.Braun(a)jboss.com
* @version $Revision$
*/
-public class JAXWSDeployerHookPostJSE extends Phase2DeployerHookJSE
+public class JAXWSDeployerHookPostJSE extends DeployerHookPostJSE
{
/** Get the deployment type this deployer can handle
*/
Deleted: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/Phase2DeployerHookJSE.java
===================================================================
--- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/Phase2DeployerHookJSE.java 2007-08-09 08:32:39 UTC (rev 4275)
+++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/Phase2DeployerHookJSE.java 2007-08-09 08:34:58 UTC (rev 4276)
@@ -1,64 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.container.jboss42;
-
-import org.jboss.deployment.DeploymentInfo;
-import org.jboss.wsf.spi.deployment.Deployment;
-
-/**
- * @author Heiko.Braun(a)jboss.com
- * @version $Revision$
- */
-public abstract class Phase2DeployerHookJSE extends AbstractDeployerHookJSE
-{
- /**
- * The deployment should be created in phase 1.
- */
- /**
- * Create an endpoint for every servlet-link in webservices.xml
- */
- @Override
- public Deployment createDeployment(DeploymentInfo di)
- {
- Deployment deployment = (Deployment)di.context.get(Deployment.class);
- if(null == deployment)
- throw new IllegalArgumentException("spi.Deployment missing. Should be created in Phase 1");
-
- return deployment;
- }
-
- /**
- * A phase 2 deployer hook needs to reject first-place
- * JSE deployments and wait for those that are re-written.
- * We rely on the fact that spi.Deployment is created in phase 1.
- */
- @Override
- public boolean isWebServiceDeployment(DeploymentInfo di)
- {
- if(super.isWebServiceDeployment(di) == false)
- return false;
-
- Deployment deployment = (Deployment)di.context.get(Deployment.class);
- return deployment!=null;
- }
-
-}
Modified: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java
===================================================================
--- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java 2007-08-09 08:32:39 UTC (rev 4275)
+++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java 2007-08-09 08:34:58 UTC (rev 4276)
@@ -21,17 +21,16 @@
*/
package org.jboss.wsf.container.jboss50;
+// $Id$
+
+import java.util.LinkedList;
+import java.util.List;
+
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.helpers.AbstractComponentDeployer;
-import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.logging.Logger;
-import java.util.LinkedList;
-import java.util.List;
-
-//$Id$
-
/**
* This deployer that calls the registered DeployerHooks
*
@@ -44,7 +43,7 @@
private static final Logger log = Logger.getLogger(AbstractWebServiceDeployer.class);
private List<DeployerHook> deployerHooks = new LinkedList<DeployerHook>();
-
+
public void addDeployerHook(DeployerHook deployer)
{
log.debug("Add deployer hook: " + deployer);
Modified: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/DeployerHookPostJSE.java
===================================================================
--- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/DeployerHookPostJSE.java 2007-08-09 08:32:39 UTC (rev 4275)
+++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/DeployerHookPostJSE.java 2007-08-09 08:34:58 UTC (rev 4276)
@@ -23,18 +23,12 @@
// $Id$
-import java.util.Iterator;
-
import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.metadata.NameValuePair;
-import org.jboss.metadata.WebMetaData;
-import org.jboss.metadata.web.Servlet;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.Endpoint;
/**
* @author Heiko.Braun(a)jboss.com
- * @version $Revision$
+ * @author Thomas.Diesler(a)jboss.com
*/
public abstract class DeployerHookPostJSE extends AbstractDeployerHookJSE
{
@@ -53,9 +47,7 @@
/**
* A phase 2 deployer hook needs to reject first-place
* JSE deployments and wait for those that are re-written.
- * We do it by inspecting the Servlet init parameter.
- * @param unit
- * @return
+ * We rely on the fact that spi.Deployment is created in phase 1.
*/
@Override
public boolean isWebServiceDeployment(DeploymentUnit unit)
@@ -64,46 +56,6 @@
return false;
Deployment deployment = unit.getAttachment(Deployment.class);
- boolean isModified = false;
- if (deployment != null)
- isModified = isModifiedServletClass(deployment);
- return isModified;
+ return deployment != null;
}
-
- private boolean isModifiedServletClass(Deployment dep)
- {
- boolean modified = false;
-
- WebMetaData webMetaData = dep.getAttachment(WebMetaData.class);
- if (webMetaData != null)
- {
- for (Servlet servlet : webMetaData.getServlets())
- {
- String orgServletClass = servlet.getServletClass();
-
- // JSP
- if (orgServletClass == null || orgServletClass.length() == 0)
- {
- log.debug("Innore servlet class: " + orgServletClass);
- continue;
- }
-
- modified = isAlreadyModified(servlet);
- }
- }
-
- return modified;
- }
-
- private boolean isAlreadyModified(Servlet servlet)
- {
- Iterator itParams = servlet.getInitParams().iterator();
- while (itParams.hasNext())
- {
- NameValuePair pair = (NameValuePair)itParams.next();
- if (Endpoint.SEPID_DOMAIN_ENDPOINT.equals(pair.getName()))
- return true;
- }
- return false;
- }
}
Modified: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookPreJSE.java
===================================================================
--- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookPreJSE.java 2007-08-09 08:32:39 UTC (rev 4275)
+++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookPreJSE.java 2007-08-09 08:34:58 UTC (rev 4276)
@@ -59,7 +59,7 @@
{
ArchiveDeployment dep = newDeployment(unit);
dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));
- dep.setRuntimeClassLoader(null); // TODO: Create RuntimeLoader aspect
+ dep.setRuntimeClassLoader(null);
dep.setType(getDeploymentType());
Service service = dep.getService();
18 years, 5 months
JBossWS SVN: r4275 - framework/branches/framework-2.0/src/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: richard_opalka
Date: 2007-08-09 04:32:39 -0400 (Thu, 09 Aug 2007)
New Revision: 4275
Modified:
framework/branches/framework-2.0/src/test/ant-import/build-testsuite.xml
Log:
fixing tests compilation issue
Modified: framework/branches/framework-2.0/src/test/ant-import/build-testsuite.xml
===================================================================
--- framework/branches/framework-2.0/src/test/ant-import/build-testsuite.xml 2007-08-09 07:58:53 UTC (rev 4274)
+++ framework/branches/framework-2.0/src/test/ant-import/build-testsuite.xml 2007-08-09 08:32:39 UTC (rev 4275)
@@ -252,6 +252,7 @@
<pathelement location="${jboss.client}/log4j.jar"/>
<pathelement location="${jboss.client}/mail.jar"/>
<pathelement location="${jboss.client}/stax-api.jar"/>
+ <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
<!-- FIXME jars should be available in the client dir -->
<pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/>
<pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/>
18 years, 5 months
JBossWS SVN: r4274 - framework/branches/framework-2.0/src/main/java/org/jboss/wsf/framework/deployment.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-09 03:58:53 -0400 (Thu, 09 Aug 2007)
New Revision: 4274
Modified:
framework/branches/framework-2.0/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandler.java
Log:
log error instead of throwing ISE
Modified: framework/branches/framework-2.0/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandler.java
===================================================================
--- framework/branches/framework-2.0/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandler.java 2007-08-09 07:48:33 UTC (rev 4273)
+++ framework/branches/framework-2.0/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandler.java 2007-08-09 07:58:53 UTC (rev 4274)
@@ -59,12 +59,16 @@
EndpointState state = ep.getState();
if (state == EndpointState.UNDEFINED || state == EndpointState.DESTROYED)
- throw new IllegalStateException("Cannot start endpoint in state: " + state);
+ {
+ log.error("Cannot start endpoint in state: " + state);
+ }
+ else
+ {
+ if (ep.getEndpointMetrics() != null)
+ ep.getEndpointMetrics().start();
- if (ep.getEndpointMetrics() != null)
- ep.getEndpointMetrics().start();
-
- ep.setState(EndpointState.STARTED);
+ ep.setState(EndpointState.STARTED);
+ }
}
public void stop(Endpoint ep)
@@ -73,12 +77,16 @@
EndpointState state = ep.getState();
if (state != EndpointState.STARTED)
- throw new IllegalStateException("Cannot stop endpoint in state: " + state);
+ {
+ log.error("Cannot stop endpoint in state: " + state);
+ }
+ else
+ {
+ if (ep.getEndpointMetrics() != null)
+ ep.getEndpointMetrics().stop();
- if (ep.getEndpointMetrics() != null)
- ep.getEndpointMetrics().stop();
-
- ep.setState(EndpointState.STOPPED);
+ ep.setState(EndpointState.STOPPED);
+ }
}
public void destroy(Endpoint ep)
18 years, 5 months
JBossWS SVN: r4273 - framework/branches/framework-2.0/src/main/java/org/jboss/wsf/framework/deployment.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-09 03:48:33 -0400 (Thu, 09 Aug 2007)
New Revision: 4273
Added:
framework/branches/framework-2.0/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandler.java
Removed:
framework/branches/framework-2.0/src/main/java/org/jboss/wsf/framework/deployment/LifecycleHandlerImpl.java
Modified:
framework/branches/framework-2.0/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandlerFactory.java
Log:
Rename to DefaultLifecycleHandler
Copied: framework/branches/framework-2.0/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandler.java (from rev 4263, framework/branches/framework-2.0/src/main/java/org/jboss/wsf/framework/deployment/LifecycleHandlerImpl.java)
===================================================================
--- framework/branches/framework-2.0/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandler.java (rev 0)
+++ framework/branches/framework-2.0/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandler.java 2007-08-09 07:48:33 UTC (rev 4273)
@@ -0,0 +1,90 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.framework.deployment;
+
+//$Id$
+
+import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.deployment.Endpoint.EndpointState;
+import org.jboss.wsf.spi.deployment.LifecycleHandler;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.InvocationHandler;
+
+/**
+ * A basic lifecycle handler
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 31-Oct-2006
+ */
+public class DefaultLifecycleHandler implements LifecycleHandler
+{
+ // 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)
+ throw new IllegalStateException("Cannot start endpoint in state: " + state);
+
+ if (ep.getEndpointMetrics() != null)
+ ep.getEndpointMetrics().start();
+
+ ep.setState(EndpointState.STARTED);
+ }
+
+ public void stop(Endpoint ep)
+ {
+ log.debug("Stop: " + ep.getName());
+
+ EndpointState state = ep.getState();
+ if (state != EndpointState.STARTED)
+ throw new IllegalStateException("Cannot stop endpoint in state: " + state);
+
+ if (ep.getEndpointMetrics() != null)
+ ep.getEndpointMetrics().stop();
+
+ ep.setState(EndpointState.STOPPED);
+ }
+
+ public void destroy(Endpoint ep)
+ {
+ log.debug("Destroy: " + ep.getName());
+
+ ep.setState(EndpointState.DESTROYED);
+ }
+}
Modified: framework/branches/framework-2.0/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandlerFactory.java
===================================================================
--- framework/branches/framework-2.0/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandlerFactory.java 2007-08-09 07:46:58 UTC (rev 4272)
+++ framework/branches/framework-2.0/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandlerFactory.java 2007-08-09 07:48:33 UTC (rev 4273)
@@ -32,6 +32,6 @@
{
public LifecycleHandler newLifecylceHandler()
{
- return new LifecycleHandlerImpl();
+ return new DefaultLifecycleHandler();
}
}
Deleted: framework/branches/framework-2.0/src/main/java/org/jboss/wsf/framework/deployment/LifecycleHandlerImpl.java
===================================================================
--- framework/branches/framework-2.0/src/main/java/org/jboss/wsf/framework/deployment/LifecycleHandlerImpl.java 2007-08-09 07:46:58 UTC (rev 4272)
+++ framework/branches/framework-2.0/src/main/java/org/jboss/wsf/framework/deployment/LifecycleHandlerImpl.java 2007-08-09 07:48:33 UTC (rev 4273)
@@ -1,90 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.framework.deployment;
-
-//$Id$
-
-import org.jboss.logging.Logger;
-import org.jboss.wsf.spi.deployment.Endpoint.EndpointState;
-import org.jboss.wsf.spi.deployment.LifecycleHandler;
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.invocation.InvocationHandler;
-
-/**
- * A basic lifecycle handler
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 31-Oct-2006
- */
-public class LifecycleHandlerImpl implements LifecycleHandler
-{
- // 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)
- throw new IllegalStateException("Cannot start endpoint in state: " + state);
-
- if (ep.getEndpointMetrics() != null)
- ep.getEndpointMetrics().start();
-
- ep.setState(EndpointState.STARTED);
- }
-
- public void stop(Endpoint ep)
- {
- log.debug("Stop: " + ep.getName());
-
- EndpointState state = ep.getState();
- if (state != EndpointState.STARTED)
- throw new IllegalStateException("Cannot stop endpoint in state: " + state);
-
- if (ep.getEndpointMetrics() != null)
- ep.getEndpointMetrics().stop();
-
- ep.setState(EndpointState.STOPPED);
- }
-
- public void destroy(Endpoint ep)
- {
- log.debug("Destroy: " + ep.getName());
-
- ep.setState(EndpointState.DESTROYED);
- }
-}
18 years, 5 months
JBossWS SVN: r4272 - in container: jboss42/trunk/src/main/resources and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-09 03:46:58 -0400 (Thu, 09 Aug 2007)
New Revision: 4272
Modified:
container/jboss40/trunk/src/main/resources/jbossws-jboss40-config.xml
container/jboss42/trunk/src/main/resources/jbossws-jboss42-config.xml
container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml
Log:
Move EndpointRegistryDeploymentAspect to Pre JSE
Modified: container/jboss40/trunk/src/main/resources/jbossws-jboss40-config.xml
===================================================================
--- container/jboss40/trunk/src/main/resources/jbossws-jboss40-config.xml 2007-08-09 07:24:01 UTC (rev 4271)
+++ container/jboss40/trunk/src/main/resources/jbossws-jboss40-config.xml 2007-08-09 07:46:58 UTC (rev 4272)
@@ -158,7 +158,7 @@
</bean>
<bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRegistryDeploymentAspect">
- <property name="requires">EndpointName,StackEndpointHandler</property>
+ <property name="requires">EndpointName</property>
<property name="provides">RegisteredEndpoint</property>
</bean>
@@ -220,6 +220,7 @@
<inject bean="WSEndpointHandlerDeploymentAspect"/>
<inject bean="WSEndpointMetricsDeploymentAspect"/>
<inject bean="WSEndpointNameDeploymentAspect"/>
+ <inject bean="WSEndpointRegistryDeploymentAspect"/>
<inject bean="WSModifyWebMetaDataDeploymentAspect"/>
<inject bean="WSURLPatternDeploymentAspect"/>
</set>
@@ -233,7 +234,6 @@
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSEndpointLifecycleDeploymentAspect"/>
- <inject bean="WSEndpointRegistryDeploymentAspect"/>
<inject bean="WSRuntimeLoaderDeploymentAspect"/>
</set>
</property>
Modified: container/jboss42/trunk/src/main/resources/jbossws-jboss42-config.xml
===================================================================
--- container/jboss42/trunk/src/main/resources/jbossws-jboss42-config.xml 2007-08-09 07:24:01 UTC (rev 4271)
+++ container/jboss42/trunk/src/main/resources/jbossws-jboss42-config.xml 2007-08-09 07:46:58 UTC (rev 4272)
@@ -168,7 +168,7 @@
</bean>
<bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRegistryDeploymentAspect">
- <property name="requires">EndpointName, StackEndpointHandler</property>
+ <property name="requires">EndpointName</property>
<property name="provides">RegisteredEndpoint</property>
</bean>
@@ -228,6 +228,7 @@
<inject bean="WSEndpointHandlerDeploymentAspect"/>
<inject bean="WSEndpointMetricsDeploymentAspect"/>
<inject bean="WSEndpointNameDeploymentAspect"/>
+ <inject bean="WSEndpointRegistryDeploymentAspect"/>
<inject bean="WSModifyWebMetaDataDeploymentAspect"/>
<inject bean="WSURLPatternDeploymentAspect"/>
</set>
@@ -241,7 +242,6 @@
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSEndpointLifecycleDeploymentAspect"/>
- <inject bean="WSEndpointRegistryDeploymentAspect"/>
<inject bean="WSRuntimeLoaderDeploymentAspect"/>
</set>
</property>
Modified: container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml
===================================================================
--- container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-08-09 07:24:01 UTC (rev 4271)
+++ container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-08-09 07:46:58 UTC (rev 4272)
@@ -236,7 +236,7 @@
</bean>
<bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRegistryDeploymentAspect">
- <property name="requires">EndpointName,StackEndpointHandler</property>
+ <property name="requires">EndpointName</property>
<property name="provides">RegisteredEndpoint</property>
</bean>
@@ -289,6 +289,7 @@
<inject bean="WSEndpointHandlerDeploymentAspect"/>
<inject bean="WSEndpointMetricsDeploymentAspect"/>
<inject bean="WSEndpointNameDeploymentAspect"/>
+ <inject bean="WSEndpointRegistryDeploymentAspect"/>
<inject bean="WSModifyWebMetaDataDeploymentAspect"/>
<inject bean="WSURLPatternDeploymentAspect"/>
</set>
@@ -302,7 +303,6 @@
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSEndpointLifecycleDeploymentAspect"/>
- <inject bean="WSEndpointRegistryDeploymentAspect"/>
<inject bean="WSRuntimeLoaderDeploymentAspect"/>
</set>
</property>
18 years, 5 months
JBossWS SVN: r4271 - stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/wseventing.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-09 03:24:01 -0400 (Thu, 09 Aug 2007)
New Revision: 4271
Modified:
stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventSinkServlet.java
Log:
layout code
Modified: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventSinkServlet.java
===================================================================
--- stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventSinkServlet.java 2007-08-09 07:14:48 UTC (rev 4270)
+++ stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventSinkServlet.java 2007-08-09 07:24:01 UTC (rev 4271)
@@ -39,27 +39,30 @@
* @author Heiko Braun, <heiko(a)openj.net>
* @since 05-Jan-2006
*/
-public class EventSinkServlet extends HttpServlet {
-
- protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- doRequest(request,response);
+public class EventSinkServlet extends HttpServlet
+{
+ protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ {
+ doRequest(request, response);
}
- protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- doRequest(request,response);
+ protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ {
+ doRequest(request, response);
}
- protected void doRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ protected void doRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ {
StringBuffer sb = new StringBuffer();
BufferedReader reader = request.getReader();
String s = reader.readLine();
- sb.append( s );
- while(s!=null)
+ sb.append(s);
+ while (s != null)
{
s = reader.readLine();
- if(s!=null)
+ if (s != null)
sb.append(s);
}
18 years, 5 months
JBossWS SVN: r4270 - in container: jboss40/trunk/src/main/resources and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-09 03:14:48 -0400 (Thu, 09 Aug 2007)
New Revision: 4270
Added:
container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectHttpServer.java
Modified:
container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/DeploymentAspectHttpServer.java
container/jboss40/trunk/src/main/resources/jbossws-jboss40-config.xml
container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java
container/jboss42/trunk/src/main/resources/jbossws-jboss42-config.xml
container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml
Log:
Fix RuntimeClassLoader with EndpointAPI
Modified: container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/DeploymentAspectHttpServer.java
===================================================================
--- container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/DeploymentAspectHttpServer.java 2007-08-08 19:06:34 UTC (rev 4269)
+++ container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/DeploymentAspectHttpServer.java 2007-08-09 07:14:48 UTC (rev 4270)
@@ -73,6 +73,7 @@
// Create/Setup the deployment
Deployment dep = depModelFactory.newDeployment("endpoint-deployment", implClass.getClassLoader());
+ dep.setRuntimeClassLoader(dep.getInitialClassLoader());
// Create/Setup the service
Service service = dep.getService();
Modified: container/jboss40/trunk/src/main/resources/jbossws-jboss40-config.xml
===================================================================
--- container/jboss40/trunk/src/main/resources/jbossws-jboss40-config.xml 2007-08-08 19:06:34 UTC (rev 4269)
+++ container/jboss40/trunk/src/main/resources/jbossws-jboss40-config.xml 2007-08-09 07:14:48 UTC (rev 4270)
@@ -8,9 +8,7 @@
<bean name="WSMBeanServerLocator" class="org.jboss.wsf.framework.management.MBeanServerLocator"/>
<!-- The HTTPServer used by the JAXWS Endpoint API -->
- <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss40.WebAppDeployingHttpServer">
- <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
- </bean>
+ <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss40.DeploymentAspectHttpServer"/>
<!--
*********************************************************************************************************************
@@ -138,7 +136,7 @@
</bean>
<bean name="WSEndpointAPIDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAPIDeploymentAspect">
- <property name="provides">ContainerMetaData, URLPattern, VFSRoot</property>
+ <property name="provides">ContainerMetaData, RuntimeLoader, URLPattern, VFSRoot</property>
</bean>
<bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
@@ -262,6 +260,7 @@
</set>
</property>
</bean>
+
<bean name="WSDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
<property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property>
<property name="sortAspectsOnCreate">false</property>
@@ -274,7 +273,6 @@
<inject bean="WSEndpointMetricsDeploymentAspect"/>
<inject bean="WSEndpointNameDeploymentAspect"/>
<inject bean="WSEndpointRegistryDeploymentAspect"/>
- <inject bean="WSRuntimeLoaderDeploymentAspect"/>
<inject bean="WSWebAppDeploymentAspect"/>
<inject bean="WSWebAppGeneratorDeploymentAspect"/>
</set>
Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java
===================================================================
--- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java 2007-08-08 19:06:34 UTC (rev 4269)
+++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java 2007-08-09 07:14:48 UTC (rev 4270)
@@ -73,6 +73,7 @@
// Create/Setup the deployment
Deployment dep = depModelFactory.newDeployment("endpoint-deployment", implClass.getClassLoader());
+ dep.setRuntimeClassLoader(dep.getInitialClassLoader());
// Create/Setup the service
Service service = dep.getService();
Modified: container/jboss42/trunk/src/main/resources/jbossws-jboss42-config.xml
===================================================================
--- container/jboss42/trunk/src/main/resources/jbossws-jboss42-config.xml 2007-08-08 19:06:34 UTC (rev 4269)
+++ container/jboss42/trunk/src/main/resources/jbossws-jboss42-config.xml 2007-08-09 07:14:48 UTC (rev 4270)
@@ -8,11 +8,7 @@
<bean name="WSMBeanServerLocator" class="org.jboss.wsf.framework.management.MBeanServerLocator"/>
<!-- The HTTPServer used by the JAXWS Endpoint API -->
- <!--bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss42.WebAppDeployingHttpServer">
- <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
- </bean-->
- <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss42.DeploymentAspectHttpServer">
- </bean>
+ <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss42.DeploymentAspectHttpServer"/>
<!-- Bind Service objects in client environment context -->
<bean name="WSServiceRefHandler" class="org.jboss.wsf.container.jboss42.serviceref.ServiceRefHandlerImpl"/>
@@ -272,6 +268,7 @@
</set>
</property>
</bean>
+
<bean name="WSDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
<property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property>
<property name="sortAspectsOnCreate">false</property>
@@ -284,7 +281,6 @@
<inject bean="WSEndpointMetricsDeploymentAspect"/>
<inject bean="WSEndpointNameDeploymentAspect"/>
<inject bean="WSEndpointRegistryDeploymentAspect"/>
- <inject bean="WSRuntimeLoaderDeploymentAspect"/>
<inject bean="WSWebAppDeploymentAspect"/>
<inject bean="WSWebAppGeneratorDeploymentAspect"/>
</set>
Added: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectHttpServer.java
===================================================================
--- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectHttpServer.java (rev 0)
+++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectHttpServer.java 2007-08-09 07:14:48 UTC (rev 4270)
@@ -0,0 +1,123 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.container.jboss50;
+
+//$Id: JBossHttpServer.java 1786 2007-01-04 14:30:04Z thomas.diesler(a)jboss.com $
+
+import javax.xml.ws.Endpoint;
+import javax.xml.ws.WebServiceException;
+
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.deployment.AbstractExtensible;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.DeploymentAspectManager;
+import org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory;
+import org.jboss.wsf.spi.deployment.DeploymentModelFactory;
+import org.jboss.wsf.spi.deployment.Service;
+import org.jboss.wsf.spi.http.HttpContext;
+import org.jboss.wsf.spi.http.HttpContextFactory;
+import org.jboss.wsf.spi.http.HttpServer;
+
+/**
+ * A HTTP Server that uses DeploymentAspects
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 07-Jul-2006
+ */
+public class DeploymentAspectHttpServer extends AbstractExtensible implements HttpServer
+{
+ /** Start an instance of this HTTP server */
+ public void start()
+ {
+ // verify required properties
+ }
+
+ /** Create an HTTP context */
+ public HttpContext createContext(String contextRoot)
+ {
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ HttpContext httpContext = spiProvider.getSPI(HttpContextFactory.class).newHttpContext(this, contextRoot);
+ return httpContext;
+ }
+
+ /** Publish an JAXWS endpoint to the HTTP server */
+ public void publish(HttpContext context, Endpoint endpoint)
+ {
+ Class implClass = getImplementorClass(endpoint);
+
+ try
+ {
+ // Get the deployment model factory
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ DeploymentModelFactory depModelFactory = spiProvider.getSPI(DeploymentModelFactory.class);
+
+ // Create/Setup the deployment
+ Deployment dep = depModelFactory.newDeployment("endpoint-deployment", implClass.getClassLoader());
+ dep.setRuntimeClassLoader(dep.getInitialClassLoader());
+
+ // Create/Setup the service
+ Service service = dep.getService();
+ service.setContextRoot(context.getContextRoot());
+
+ // Create/Setup the endpoint
+ org.jboss.wsf.spi.deployment.Endpoint ep = depModelFactory.newEndpoint(implClass.getName());
+ service.addEndpoint(ep);
+
+ // Deploy using deployment aspects
+ DeploymentAspectManagerFactory depManagerFactory = spiProvider.getSPI(DeploymentAspectManagerFactory.class);
+ DeploymentAspectManager depManager = depManagerFactory.getDeploymentAspectManager("WSDeploymentAspectManagerEndpointAPI");
+ depManager.deploy(dep);
+ }
+ catch (RuntimeException rte)
+ {
+ throw rte;
+ }
+ catch (Exception ex)
+ {
+ throw new WebServiceException(ex);
+ }
+ }
+
+ /** Destroys an JAXWS endpoint on the HTTP server */
+ public void destroy(HttpContext context, Endpoint endpoint)
+ {
+ try
+ {
+ }
+ catch (RuntimeException rte)
+ {
+ throw rte;
+ }
+ catch (Exception ex)
+ {
+ throw new WebServiceException(ex);
+ }
+ }
+
+ private Class getImplementorClass(Endpoint endpoint)
+ {
+ Object implementor = endpoint.getImplementor();
+ Class implClass = (implementor instanceof Class ? (Class)implementor : implementor.getClass());
+ return implClass;
+ }
+}
\ No newline at end of file
Modified: container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml
===================================================================
--- container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-08-08 19:06:34 UTC (rev 4269)
+++ container/jboss50/trunk/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-08-09 07:14:48 UTC (rev 4270)
@@ -13,9 +13,7 @@
</bean>
<!-- The HTTPServer used by the JAXWS Endpoint API -->
- <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss50.WebAppDeployingHttpServer">
- <property name="mainDeployer"><inject bean="MainDeployer"/></property>
- </bean>
+ <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss50.DeploymentAspectHttpServer"/>
<!--
*********************************************************************************************************************
@@ -216,7 +214,7 @@
</bean>
<bean name="WSEndpointAPIDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAPIDeploymentAspect">
- <property name="provides">ContainerMetaData, URLPattern, VFSRoot</property>
+ <property name="provides">ContainerMetaData, RuntimeLoader, URLPattern, VFSRoot</property>
</bean>
<bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
@@ -330,6 +328,7 @@
</set>
</property>
</bean>
+
<bean name="WSDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
<property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property>
<property name="sortAspectsOnCreate">false</property>
@@ -342,7 +341,6 @@
<inject bean="WSEndpointMetricsDeploymentAspect"/>
<inject bean="WSEndpointNameDeploymentAspect"/>
<inject bean="WSEndpointRegistryDeploymentAspect"/>
- <inject bean="WSRuntimeLoaderDeploymentAspect"/>
<inject bean="WSWebAppDeploymentAspect"/>
<inject bean="WSWebAppGeneratorDeploymentAspect"/>
</set>
18 years, 5 months
JBossWS SVN: r4269 - framework/branches/framework-2.0/src/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-08 15:06:34 -0400 (Wed, 08 Aug 2007)
New Revision: 4269
Modified:
framework/branches/framework-2.0/src/test/ant-import/build-testsuite.xml
Log:
echo excludesfile
Modified: framework/branches/framework-2.0/src/test/ant-import/build-testsuite.xml
===================================================================
--- framework/branches/framework-2.0/src/test/ant-import/build-testsuite.xml 2007-08-08 19:03:54 UTC (rev 4268)
+++ framework/branches/framework-2.0/src/test/ant-import/build-testsuite.xml 2007-08-08 19:06:34 UTC (rev 4269)
@@ -83,10 +83,10 @@
<echo/>
<echo message="-----------------------------------------------"/>
- <echo message="jboss.home = ${jboss.home}"/>
+ <echo message="jboss.home = ${jboss.home}"/>
<echo message="excludesfile = ${excludesfile}"/>
- <echo message="jboss.bind = ${jboss.bind.address}"/>
- <echo message="java.home = ${java.home}"/>
+ <echo message="java.home = ${java.home}"/>
+ <echo message="jboss.bind = ${jboss.bind.address}"/>
<echo message="-----------------------------------------------"/>
<tstamp>
@@ -269,7 +269,6 @@
<attribute name="srcdir"/>
<sequential>
<mkdir dir="${tests.output.dir}/classes"/>
- <echo message="excludesfile = @{excludesfile}"/>
<javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
failonerror="${javac.fail.onerror}" excludesfile="@{excludesfile}">
<src path="@{srcdir}"/>
18 years, 5 months
JBossWS SVN: r4268 - framework/branches/framework-2.0/src/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-08 15:03:54 -0400 (Wed, 08 Aug 2007)
New Revision: 4268
Modified:
framework/branches/framework-2.0/src/test/ant-import/build-testsuite.xml
Log:
echo excludesfile
Modified: framework/branches/framework-2.0/src/test/ant-import/build-testsuite.xml
===================================================================
--- framework/branches/framework-2.0/src/test/ant-import/build-testsuite.xml 2007-08-08 17:38:20 UTC (rev 4267)
+++ framework/branches/framework-2.0/src/test/ant-import/build-testsuite.xml 2007-08-08 19:03:54 UTC (rev 4268)
@@ -84,8 +84,9 @@
<echo/>
<echo message="-----------------------------------------------"/>
<echo message="jboss.home = ${jboss.home}"/>
+ <echo message="excludesfile = ${excludesfile}"/>
<echo message="jboss.bind = ${jboss.bind.address}"/>
- <echo message="java.home = ${java.home}"/>
+ <echo message="java.home = ${java.home}"/>
<echo message="-----------------------------------------------"/>
<tstamp>
18 years, 5 months