dims 2002/06/26 11:34:58 Modified: java/src/org/apache/axis/deployment/wsdd WSDDDeployableItem.java WSDDDeployment.java WSDDDocument.java WSDDException.java WSDDGlobalConfiguration.java WSDDUndeployment.java java/src/org/apache/axis/deployment/wsdd/providers WSDDHandlerProvider.java Removed: java/src/org/apache/axis/deployment DeployableItem.java DeploymentException.java Log: - remove unused code. - cleanup imports. Revision Changes Path 1.38 +0 -2 xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDeployableItem.java Index: WSDDDeployableItem.java =================================================================== RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDeployableItem.java,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- WSDDDeployableItem.java 26 Jun 2002 18:19:07 -0000 1.37 +++ WSDDDeployableItem.java 26 Jun 2002 18:34:57 -0000 1.38 @@ -57,7 +57,6 @@ import org.apache.axis.ConfigurationException; import org.apache.axis.EngineConfiguration; import org.apache.axis.Handler; -import org.apache.axis.deployment.DeployableItem; import org.apache.axis.encoding.SerializationContext; import org.apache.axis.providers.java.JavaProvider; import org.apache.axis.utils.ClassUtils; @@ -83,7 +82,6 @@ */ public abstract class WSDDDeployableItem extends WSDDElement - implements DeployableItem { public static final int SCOPE_PER_ACCESS = 0; public static final int SCOPE_PER_REQUEST = 1; 1.37 +1 -2 xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDeployment.java Index: WSDDDeployment.java =================================================================== RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDeployment.java,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- WSDDDeployment.java 26 Jun 2002 18:19:07 -0000 1.36 +++ WSDDDeployment.java 26 Jun 2002 18:34:57 -0000 1.37 @@ -59,7 +59,6 @@ import org.apache.axis.Constants; import org.apache.axis.EngineConfiguration; import org.apache.axis.Handler; -import org.apache.axis.deployment.DeploymentException; import org.apache.axis.encoding.DeserializerFactory; import org.apache.axis.encoding.SerializationContext; import org.apache.axis.encoding.SerializerFactory; @@ -265,7 +264,7 @@ } public void deployToRegistry(WSDDDeployment target) - throws DeploymentException + throws ConfigurationException { WSDDGlobalConfiguration global = getGlobalConfiguration(); 1.23 +3 -3 xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDocument.java Index: WSDDDocument.java =================================================================== RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDocument.java,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- WSDDDocument.java 26 Jun 2002 18:19:07 -0000 1.22 +++ WSDDDocument.java 26 Jun 2002 18:34:58 -0000 1.23 @@ -54,7 +54,7 @@ */ package org.apache.axis.deployment.wsdd; -import org.apache.axis.deployment.DeploymentException; +import org.apache.axis.ConfigurationException; import org.apache.axis.encoding.SerializationContext; import org.apache.axis.encoding.SerializationContextImpl; import org.apache.axis.utils.JavaUtils; @@ -129,7 +129,7 @@ return deployment; } - public Document getDOMDocument() throws DeploymentException { + public Document getDOMDocument() throws ConfigurationException { StringWriter writer = new StringWriter(); SerializationContext context = new SerializationContextImpl(writer, null); context.setPretty(true); @@ -163,7 +163,7 @@ deployment = null; } - public void deploy(WSDDDeployment registry) throws DeploymentException { + public void deploy(WSDDDeployment registry) throws ConfigurationException { if (deployment != null) { deployment.deployToRegistry(registry); } 1.9 +2 -2 xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDException.java Index: WSDDException.java =================================================================== RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDException.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- WSDDException.java 30 Jan 2002 18:48:15 -0000 1.8 +++ WSDDException.java 26 Jun 2002 18:34:58 -0000 1.9 @@ -54,14 +54,14 @@ */ package org.apache.axis.deployment.wsdd; -import org.apache.axis.deployment.DeploymentException; +import org.apache.axis.ConfigurationException; /** * */ public class WSDDException - extends DeploymentException + extends ConfigurationException { /** * 1.24 +2 -2 xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDGlobalConfiguration.java Index: WSDDGlobalConfiguration.java =================================================================== RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDGlobalConfiguration.java,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- WSDDGlobalConfiguration.java 26 Jun 2002 18:19:07 -0000 1.23 +++ WSDDGlobalConfiguration.java 26 Jun 2002 18:34:58 -0000 1.24 @@ -54,9 +54,9 @@ */ package org.apache.axis.deployment.wsdd; +import org.apache.axis.ConfigurationException; import org.apache.axis.EngineConfiguration; import org.apache.axis.Handler; -import org.apache.axis.deployment.DeploymentException; import org.apache.axis.encoding.SerializationContext; import org.apache.axis.utils.JavaUtils; import org.w3c.dom.Element; @@ -209,7 +209,7 @@ } public void deployToRegistry(WSDDDeployment registry) - throws DeploymentException { + throws ConfigurationException { if (requestFlow != null) requestFlow.deployToRegistry(registry); if (responseFlow != null) 1.8 +2 -2 xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDUndeployment.java Index: WSDDUndeployment.java =================================================================== RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDUndeployment.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- WSDDUndeployment.java 26 Jun 2002 18:19:07 -0000 1.7 +++ WSDDUndeployment.java 26 Jun 2002 18:34:58 -0000 1.8 @@ -54,7 +54,7 @@ */ package org.apache.axis.deployment.wsdd; -import org.apache.axis.deployment.DeploymentException; +import org.apache.axis.ConfigurationException; import org.apache.axis.encoding.SerializationContext; import org.apache.axis.utils.JavaUtils; import org.w3c.dom.Element; @@ -178,7 +178,7 @@ } public void undeployFromRegistry(WSDDDeployment registry) - throws DeploymentException + throws ConfigurationException { QName qname; for (int n = 0; n < handlers.size(); n++) { 1.7 +3 -3 xml-axis/java/src/org/apache/axis/deployment/wsdd/providers/WSDDHandlerProvider.java Index: WSDDHandlerProvider.java =================================================================== RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/providers/WSDDHandlerProvider.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- WSDDHandlerProvider.java 26 Jun 2002 18:19:08 -0000 1.6 +++ WSDDHandlerProvider.java 26 Jun 2002 18:34:58 -0000 1.7 @@ -54,9 +54,9 @@ */ package org.apache.axis.deployment.wsdd.providers; +import org.apache.axis.ConfigurationException; import org.apache.axis.EngineConfiguration; import org.apache.axis.Handler; -import org.apache.axis.deployment.DeploymentException; import org.apache.axis.deployment.wsdd.WSDDProvider; import org.apache.axis.deployment.wsdd.WSDDService; import org.apache.axis.utils.ClassUtils; @@ -77,14 +77,14 @@ { String providerClass = service.getParameter("handlerClass"); if (providerClass == null) { - throw new DeploymentException(JavaUtils. + throw new ConfigurationException(JavaUtils. getMessage("noHandlerClass00")); } Class _class = ClassUtils.forName(providerClass); if (!(Handler.class.isAssignableFrom(_class))) { - throw new DeploymentException(JavaUtils. + throw new ConfigurationException(JavaUtils. getMessage("badHandlerClass00", _class.getName())); }