[jbossws-commits] JBossWS SVN: r1706 - branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server

Author: thomas.diesler(a)jboss.com Date: 2006-12-21 13:01:53 -0500 (Thu, 21 Dec 2006) New Revision: 1706 Modified: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/ServiceEndpointDeployer.java branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/ServiceEndpointManager.java branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java Log: partial commit Modified: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/ServiceEndpointDeployer.java =================================================================== --- branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/ServiceEndpointDeployer.java 2006-12-21 18:01:41 UTC (rev 1705) +++ branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/ServiceEndpointDeployer.java 2006-12-21 18:01:53 UTC (rev 1706) @@ -42,9 +42,6 @@ * container (i.e. JBoss, Tomcat). The containers deployer architecture should be used to populate * the UnifiedDeploymentInfo object. * - * @deprecated - * This functionality should be handled by the ServiceEndpointManager - * * @author Thomas.Diesler(a)jboss.org * @since 12-May-2006 */ Modified: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/ServiceEndpointManager.java =================================================================== --- branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/ServiceEndpointManager.java 2006-12-21 18:01:41 UTC (rev 1705) +++ branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/ServiceEndpointManager.java 2006-12-21 18:01:53 UTC (rev 1706) @@ -583,7 +583,10 @@ { ServiceEndpoint wsEndpoint = getServiceEndpointByID(sepID); if (wsEndpoint == null) - throw new WSException("Cannot find service endpoint: " + sepID); + { + log.error("Cannot find service endpoint: " + sepID); + return; + } wsEndpoint.stop(); @@ -597,7 +600,10 @@ { ServiceEndpoint wsEndpoint = getServiceEndpointByID(sepID); if (wsEndpoint == null) - throw new WSException("Cannot find service endpoint: " + sepID); + { + log.error("Cannot find service endpoint: " + sepID); + return; + } wsEndpoint.destroy(); Modified: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java =================================================================== --- branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java 2006-12-21 18:01:41 UTC (rev 1705) +++ branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java 2006-12-21 18:01:53 UTC (rev 1706) @@ -68,12 +68,7 @@ public ClassLoader classLoader; /** An arbitrary map of state associated with the deployment */ public Map<String, Object> context = new HashMap<String, Object>(); - - // [TODO] unify jboss42 properties - public URL localUrl; - public URLClassLoader annotationsCl; - public URLClassLoader localCl; - public URLClassLoader ucl; + /** An optional ObjectName of the deployed object */ public ObjectName deployedObject; /** The sortName concatenated with the canonical names of all parents. */