You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ch...@apache.org on 2004/12/23 07:49:38 UTC
svn commit: r123170 - in webservices/axis/trunk/java/dev/scratch/prototype2/src: java/org/apache/axis/context java/org/apache/axis/deployment java/org/apache/axis/deployment/repository/utill java/org/apache/axis/description java/org/apache/axis/engine java/org/apache/axis/impl/description java/org/apache/axis/impl/engine java/org/apache/axis/impl/handlers java/org/apache/axis/impl/providers java/org/apache/axis/phaseresolver test/org/apache/axis/clientapi test/org/apache/axis/deployment test/org/apache/axis/description test/org/apache/axis/engine
Author: chathura
Date: Wed Dec 22 22:49:36 2004
New Revision: 123170
URL: http://svn.apache.org/viewcvs?view=rev&rev=123170
Log:
Service Desc Interface Removed with Harsh's Implementation and SimpleAxisService Removed.
Added:
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/description/AxisService.java
Removed:
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/description/AxisService.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/description/AxisServiceImpl.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/description/SimpleAxisServiceImpl.java
Modified:
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/context/MessageContext.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/repository/utill/UnZipJAR.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/description/DescriptionConstants.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/AxisEngine.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Dispatcher.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/EngineRegistry.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/engine/EngineRegistryImpl.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/handlers/OpNameFinder.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/RawXMLProvider.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/SimpleJavaProvider.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/phaseresolver/PhaseHolder.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/phaseresolver/PhaseResolver.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/clientapi/TestSendReceive.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/clientapi/TestSendReceiveAsync.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/description/RegistryTest.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/CallUnregisterdServiceTest.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoRawXMLTest.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoTest.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineTest.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineUtils.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/HandlerFaliureTest.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/SimpleAxisServerTest.java
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/context/MessageContext.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/context/MessageContext.java?view=diff&rev=123170&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/context/MessageContext.java&r1=123169&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/context/MessageContext.java&r2=123170
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/context/MessageContext.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/context/MessageContext.java Wed Dec 22 22:49:36 2004
@@ -17,10 +17,10 @@
package org.apache.axis.context;
import org.apache.axis.description.AxisOperation;
-import org.apache.axis.description.AxisService;
import org.apache.axis.description.AxisTransport;
import org.apache.axis.engine.*;
import org.apache.axis.impl.context.SimpleSessionContext;
+import org.apache.axis.impl.description.AxisService;
import org.apache.axis.om.SOAPEnvelope;
import org.apache.axis.addressing.EndpointReferenceType;
import org.apache.axis.addressing.miheaders.RelatesTo;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java?view=diff&rev=123170&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java&r1=123169&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java&r2=123170
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java Wed Dec 22 22:49:36 2004
@@ -1,5 +1,17 @@
package org.apache.axis.deployment;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Vector;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+
import org.apache.axis.deployment.metadata.ServerMetaData;
import org.apache.axis.deployment.repository.utill.HDFileItem;
import org.apache.axis.deployment.repository.utill.UnZipJAR;
@@ -7,28 +19,21 @@
import org.apache.axis.deployment.scheduler.DeploymentIterator;
import org.apache.axis.deployment.scheduler.Scheduler;
import org.apache.axis.deployment.scheduler.SchedulerTask;
-import org.apache.axis.description.*;
+import org.apache.axis.description.AxisGlobal;
+import org.apache.axis.description.AxisModule;
+import org.apache.axis.description.Flow;
+import org.apache.axis.description.HandlerMetaData;
+import org.apache.axis.description.Parameter;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.EngineRegistry;
import org.apache.axis.engine.Handler;
-import org.apache.axis.impl.description.SimpleAxisServiceImpl;
+import org.apache.axis.impl.description.AxisService;
import org.apache.axis.impl.engine.EngineRegistryImpl;
import org.apache.axis.phaseresolver.PhaseException;
import org.apache.axis.phaseresolver.PhaseResolver;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.Vector;
-
/**
* Copyright 2001-2004 The Apache Software Foundation.
@@ -345,7 +350,7 @@
case SERVICE:
{
try {
- AxisService service = new SimpleAxisServiceImpl(null);
+ AxisService service = new AxisService();
unZipJAR.unzipService(currentFileItem.getAbsolutePath(), this, service);
addnewService(service);
log.info("Deployement WS Name " + currentFileItem.getName());
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java?view=diff&rev=123170&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java&r1=123169&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java&r2=123170
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java Wed Dec 22 22:49:36 2004
@@ -3,6 +3,7 @@
import org.apache.axis.deployment.metadata.ServerMetaData;
import org.apache.axis.description.*;
import org.apache.axis.engine.AxisFault;
+import org.apache.axis.impl.description.AxisService;
import org.apache.axis.impl.description.FlowImpl;
import org.apache.axis.impl.description.ParameterImpl;
import org.apache.axis.impl.description.SimpleAxisOperationImpl;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/repository/utill/UnZipJAR.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/repository/utill/UnZipJAR.java?view=diff&rev=123170&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/repository/utill/UnZipJAR.java&r1=123169&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/repository/utill/UnZipJAR.java&r2=123170
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/repository/utill/UnZipJAR.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/repository/utill/UnZipJAR.java Wed Dec 22 22:49:36 2004
@@ -21,7 +21,7 @@
import org.apache.axis.deployment.DeploymentParser;
import org.apache.axis.deployment.DeploymentException;
import org.apache.axis.description.AxisModule;
-import org.apache.axis.description.AxisService;
+import org.apache.axis.impl.description.AxisService;
import java.io.FileInputStream;
import java.util.zip.ZipEntry;
Deleted: /webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/description/AxisService.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/description/AxisService.java?view=auto&rev=123169
==============================================================================
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/description/DescriptionConstants.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/description/DescriptionConstants.java?view=diff&rev=123170&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/description/DescriptionConstants.java&r1=123169&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/description/DescriptionConstants.java&r2=123170
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/description/DescriptionConstants.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/description/DescriptionConstants.java Wed Dec 22 22:49:36 2004
@@ -34,4 +34,6 @@
public static final String OUTFLOW_KEY = "OUTFLOW_KEY";
public static final String FAULTFLOW_KEY = "FAULTFLOW_KEY";
public static final String PHASES_KEY = "PHASES_KEY";
+ public static final String SERVICE_CLASS = "SERVICE_CLASS";
+ public static final String SERVICE_CLASS_NAME = "SERVICE_CLASS_NAME";
}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/AxisEngine.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/AxisEngine.java?view=diff&rev=123170&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/AxisEngine.java&r1=123169&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/AxisEngine.java&r2=123170
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/AxisEngine.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/AxisEngine.java Wed Dec 22 22:49:36 2004
@@ -18,8 +18,8 @@
import org.apache.axis.context.MessageContext;
import org.apache.axis.description.AxisGlobal;
-import org.apache.axis.description.AxisService;
import org.apache.axis.description.AxisTransport;
+import org.apache.axis.impl.description.AxisService;
import org.apache.axis.om.OMFactory;
import org.apache.axis.om.SOAPEnvelope;
import org.apache.commons.logging.Log;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Dispatcher.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Dispatcher.java?view=diff&rev=123170&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Dispatcher.java&r1=123169&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Dispatcher.java&r2=123170
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Dispatcher.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/Dispatcher.java Wed Dec 22 22:49:36 2004
@@ -17,7 +17,7 @@
package org.apache.axis.engine;
import org.apache.axis.context.MessageContext;
-import org.apache.axis.description.AxisService;
+import org.apache.axis.impl.description.AxisService;
import org.apache.axis.impl.handlers.AbstractHandler;
import org.apache.axis.impl.handlers.OpNameFinder;
/**
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/EngineRegistry.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/EngineRegistry.java?view=diff&rev=123170&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/EngineRegistry.java&r1=123169&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/EngineRegistry.java&r2=123170
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/EngineRegistry.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/EngineRegistry.java Wed Dec 22 22:49:36 2004
@@ -23,8 +23,8 @@
import org.apache.axis.description.AxisGlobal;
import org.apache.axis.description.AxisModule;
-import org.apache.axis.description.AxisService;
import org.apache.axis.description.AxisTransport;
+import org.apache.axis.impl.description.AxisService;
/**
* The palce where all the Globel states of Axis is kept.
Added: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/description/AxisService.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/description/AxisService.java?view=auto&rev=123170
==============================================================================
--- (empty file)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/description/AxisService.java Wed Dec 22 22:49:36 2004
@@ -0,0 +1,299 @@
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.axis.impl.description;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import javax.swing.text.Style;
+import javax.xml.namespace.QName;
+
+import org.apache.axis.description.AxisOperation;
+import org.apache.axis.description.DescriptionConstants;
+import org.apache.axis.description.Flow;
+import org.apache.axis.description.FlowInclude;
+import org.apache.axis.description.Parameter;
+import org.apache.axis.description.ParameterInclude;
+import org.apache.axis.description.PhasesInclude;
+import org.apache.axis.engine.AxisFault;
+import org.apache.axis.engine.ExecutionChain;
+import org.apache.axis.engine.Provider;
+import org.apache.wsdl.WSDLService;
+import org.apache.wsdl.impl.WSDLServiceImpl;
+
+
+public class AxisService extends WSDLServiceImpl implements WSDLService,ParameterInclude,FlowInclude,PhasesInclude , DescriptionConstants{
+
+ public AxisService(){
+ this.setComponentProperty(MODULEREF_KEY,new ArrayList());
+ this.setComponentProperty(PARAMETER_KEY, new ParameterIncludeImpl());
+ this.setComponentProperty(PHASES_KEY, new PhasesIncludeImpl());
+ }
+
+ public AxisService(QName qName){
+ this();
+ this.setName(qName);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis.description.AxisService#addModule(javax.xml.namespace.QName)
+ */
+ public void addModule(QName moduleref) {
+ if( null == moduleref)return;
+ Collection collectionModule = (Collection) this.getComponentProperty(MODULEREF_KEY);
+ collectionModule.add(moduleref);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis.description.AxisService#getModules()
+ */
+ public Collection getModules() {
+ return (Collection)this.getComponentProperty(MODULEREF_KEY);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis.description.AxisService#setExecutableInChain(org.apache.axis.engine.ExecutionChain)
+ */
+ public void setExecutableInChain(ExecutionChain executableInChain) {
+ if(null !=executableInChain){
+ this.setComponentProperty(EXECUTION_CHAIN_KEY, executableInChain);
+ }
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis.description.AxisService#getExecutableInChain()
+ */
+ public ExecutionChain getExecutableInChain() {
+ return (ExecutionChain)this.getComponentProperty(EXECUTION_CHAIN_KEY);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis.description.AxisService#setExecutableOutChain(org.apache.axis.engine.ExecutionChain)
+ */
+ public void setExecutableOutChain(ExecutionChain executableOutChain) {
+ if(null !=executableOutChain){
+ this.setComponentProperty(EXECUTION_OUT_CHAIN_KEY, executableOutChain);
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis.description.AxisService#getExecutableOutChain()
+ */
+ public ExecutionChain getExecutableOutChain() {
+ return (ExecutionChain)this.getComponentProperty(EXECUTION_OUT_CHAIN_KEY);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis.description.AxisService#setExecutableFaultChain(org.apache.axis.engine.ExecutionChain)
+ */
+ public void setExecutableFaultChain(ExecutionChain executableFaultChain) {
+ if(null !=executableFaultChain){
+ this.setComponentProperty(EXECUTION_FAULT_CHAIN_KEY, executableFaultChain);
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis.description.AxisService#getExecutableFaultChain()
+ */
+ public ExecutionChain getExecutableFaultChain() {
+ return (ExecutionChain)this.getComponentProperty(EXECUTION_FAULT_CHAIN_KEY);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis.description.AxisService#getOperation(javax.xml.namespace.QName)
+ */
+ public AxisOperation getOperation(QName operationName) {
+ return (AxisOperation)this.getComponentProperty(OPERATION_KEY);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis.description.AxisService#addOperation(org.apache.axis.description.AxisOperation)
+ */
+ public void addOperation(AxisOperation operationName) {
+ if(null != operationName){
+ this.setComponentProperty(OPERATION_KEY, operationName);
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis.description.AxisService#setClassLoader(java.lang.ClassLoader)
+ */
+ public void setClassLoader(ClassLoader classLoader) {
+ if(null != classLoader){
+ this.setComponentProperty(CLASSLOADER_KEY, classLoader);
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis.description.AxisService#getClassLoader()
+ */
+ public ClassLoader getClassLoader() {
+ return (ClassLoader)this.getComponentProperty(CLASSLOADER_KEY);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis.description.AxisService#setContextPath(java.lang.String)
+ */
+ public void setContextPath(String contextPath) {
+ if(null != contextPath){
+ this.setComponentProperty(CONTEXTPATH_KEY, contextPath);
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis.description.AxisService#getContextPath()
+ */
+ public String getContextPath() {
+ return (String)this.getComponentProperty(CONTEXTPATH_KEY);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis.description.AxisService#setProvider(org.apache.axis.engine.Provider)
+ */
+ public void setProvider(Provider provider) {
+ if(null != provider){
+ this.setComponentProperty(PROVIDER_KEY, provider);
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis.description.AxisService#getProvider()
+ */
+ public Provider getProvider() {
+ return (Provider)this.getComponentProperty(PROVIDER_KEY);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis.description.AxisService#setStyle(javax.swing.text.Style)
+ */
+ public void setStyle(Style style) {
+ if(null != style){
+ this.setComponentProperty(STYLE_KEY, style);
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis.description.AxisService#getStyle()
+ */
+ public Style getStyle() {
+ return (Style)this.getComponentProperty(STYLE_KEY);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis.description.PhasesInclude#getPhases(java.util.ArrayList, int)
+ */
+ public void setPhases(ArrayList phases, int flow) throws AxisFault{
+ if(phases == null) return;
+ PhasesIncludeImpl phaseInclude =
+ (PhasesIncludeImpl)this.getComponentProperty(PHASES_KEY);
+ phaseInclude.setPhases(phases, flow);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis.description.PhasesInclude#getPhases(int)
+ */
+ public ArrayList getPhases(int flow) throws AxisFault{
+ PhasesIncludeImpl phaseInclude =
+ (PhasesIncludeImpl)this.getComponentProperty(PHASES_KEY);
+ return(ArrayList)phaseInclude.getPhases(flow);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis.description.ParameterInclude#addParameter(org.apache.axis.description.Parameter)
+ */
+ public void addParameter(Parameter param) {
+ if(null == param) return;
+ ParameterIncludeImpl paramInclude =
+ (ParameterIncludeImpl)this.getComponentProperty(PARAMETER_KEY);
+ paramInclude.addParameter(param);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis.description.ParameterInclude#getParameter(java.lang.String)
+ */
+ public Parameter getParameter(String name) {
+ ParameterIncludeImpl paramInclude = (ParameterIncludeImpl)this.getComponentProperty(PARAMETER_KEY);
+ return (Parameter)paramInclude.getParameter(name);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis.description.FlowInclude#getInFlow()
+ */
+ public Flow getInFlow() {
+ return (Flow)this.getComponentProperty(INFLOW_KEY);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis.description.FlowInclude#setInFlow(org.apache.axis.description.Flow)
+ */
+ public void setInFlow(Flow inFlow) {
+ if(null != inFlow){
+ this.setComponentProperty(INFLOW_KEY, inFlow);
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis.description.FlowInclude#getOutFlow()
+ */
+ public Flow getOutFlow() {
+ return (Flow)this.getComponentProperty(OUTFLOW_KEY);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis.description.FlowInclude#setOutFlow(org.apache.axis.description.Flow)
+ */
+ public void setOutFlow(Flow outFlow){
+ if(null != outFlow){
+ this.setComponentProperty(OUTFLOW_KEY, outFlow);
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis.description.FlowInclude#getFaultFlow()
+ */
+ public Flow getFaultFlow() {
+ return (Flow)this.getComponentProperty(FAULTFLOW_KEY);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis.description.FlowInclude#setFaultFlow(org.apache.axis.description.Flow)
+ */
+ public void setFaultFlow(Flow faultFlow) {
+ if(null != faultFlow){
+ this.setComponentProperty(FAULTFLOW_KEY, faultFlow);
+ }
+ }
+
+ public void setServiceClass(Class serviceclass) {
+ if(serviceclass != null)
+ this.setComponentProperty(DescriptionConstants.SERVICE_CLASS, serviceclass);
+ }
+
+ public Class getServiceClass() {
+ return (Class)this.getComponentProperty(DescriptionConstants.SERVICE_CLASS);
+ }
+
+ public void setServiceClassName(String className) {
+ if(null != className)
+ this.setComponentProperty(DescriptionConstants.SERVICE_CLASS_NAME, className);
+ }
+
+ public String getServiceClassName() {
+ return (String) this.getComponentProperty(DescriptionConstants.SERVICE_CLASS_NAME);
+ }
+
+}
Deleted: /webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/description/AxisServiceImpl.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/description/AxisServiceImpl.java?view=auto&rev=123169
==============================================================================
Deleted: /webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/description/SimpleAxisServiceImpl.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/description/SimpleAxisServiceImpl.java?view=auto&rev=123169
==============================================================================
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/engine/EngineRegistryImpl.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/engine/EngineRegistryImpl.java?view=diff&rev=123170&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/engine/EngineRegistryImpl.java&r1=123169&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/engine/EngineRegistryImpl.java&r2=123170
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/engine/EngineRegistryImpl.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/engine/EngineRegistryImpl.java Wed Dec 22 22:49:36 2004
@@ -22,10 +22,10 @@
import org.apache.axis.description.AxisGlobal;
import org.apache.axis.description.AxisModule;
-import org.apache.axis.description.AxisService;
import org.apache.axis.description.AxisTransport;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.EngineRegistry;
+import org.apache.axis.impl.description.AxisService;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/handlers/OpNameFinder.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/handlers/OpNameFinder.java?view=diff&rev=123170&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/handlers/OpNameFinder.java&r1=123169&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/handlers/OpNameFinder.java&r2=123170
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/handlers/OpNameFinder.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/handlers/OpNameFinder.java Wed Dec 22 22:49:36 2004
@@ -17,9 +17,9 @@
import org.apache.axis.context.MessageContext;
import org.apache.axis.description.AxisOperation;
-import org.apache.axis.description.AxisService;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.Constants;
+import org.apache.axis.impl.description.AxisService;
import org.apache.axis.om.*;
import javax.xml.namespace.QName;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/RawXMLProvider.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/RawXMLProvider.java?view=diff&rev=123170&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/RawXMLProvider.java&r1=123169&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/RawXMLProvider.java&r2=123170
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/RawXMLProvider.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/RawXMLProvider.java Wed Dec 22 22:49:36 2004
@@ -23,11 +23,11 @@
import org.apache.axis.context.MessageContext;
import org.apache.axis.context.SessionContext;
-import org.apache.axis.description.AxisService;
import org.apache.axis.description.Parameter;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.Constants;
import org.apache.axis.engine.Provider;
+import org.apache.axis.impl.description.AxisService;
import org.apache.axis.om.OMElement;
import org.apache.axis.om.OMFactory;
import org.apache.axis.om.OMUtils;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/SimpleJavaProvider.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/SimpleJavaProvider.java?view=diff&rev=123170&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/SimpleJavaProvider.java&r1=123169&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/SimpleJavaProvider.java&r2=123170
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/SimpleJavaProvider.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/providers/SimpleJavaProvider.java Wed Dec 22 22:49:36 2004
@@ -19,12 +19,12 @@
import org.apache.axis.context.MessageContext;
import org.apache.axis.context.SessionContext;
import org.apache.axis.description.AxisOperation;
-import org.apache.axis.description.AxisService;
import org.apache.axis.description.Parameter;
import org.apache.axis.encoding.SimpleTypeEncodingUtils;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.Constants;
import org.apache.axis.engine.Provider;
+import org.apache.axis.impl.description.AxisService;
import org.apache.axis.om.OMElement;
import org.apache.axis.om.OMNode;
import org.apache.axis.om.SOAPBody;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/phaseresolver/PhaseHolder.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/phaseresolver/PhaseHolder.java?view=diff&rev=123170&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/phaseresolver/PhaseHolder.java&r1=123169&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/phaseresolver/PhaseHolder.java&r2=123170
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/phaseresolver/PhaseHolder.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/phaseresolver/PhaseHolder.java Wed Dec 22 22:49:36 2004
@@ -6,11 +6,11 @@
import org.apache.axis.deployment.DeploymentConstants;
import org.apache.axis.deployment.metadata.ServerMetaData;
import org.apache.axis.description.AxisGlobal;
-import org.apache.axis.description.AxisService;
import org.apache.axis.description.HandlerMetaData;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.EngineRegistry;
import org.apache.axis.engine.Phase;
+import org.apache.axis.impl.description.AxisService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/phaseresolver/PhaseResolver.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/phaseresolver/PhaseResolver.java?view=diff&rev=123170&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/phaseresolver/PhaseResolver.java&r1=123169&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/phaseresolver/PhaseResolver.java&r2=123170
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/phaseresolver/PhaseResolver.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/phaseresolver/PhaseResolver.java Wed Dec 22 22:49:36 2004
@@ -11,6 +11,7 @@
import org.apache.axis.description.*;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.EngineRegistry;
+import org.apache.axis.impl.description.AxisService;
/**
* Copyright 2001-2004 The Apache Software Foundation.
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/clientapi/TestSendReceive.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/clientapi/TestSendReceive.java?view=diff&rev=123170&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/clientapi/TestSendReceive.java&r1=123169&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/clientapi/TestSendReceive.java&r2=123170
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/clientapi/TestSendReceive.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/clientapi/TestSendReceive.java Wed Dec 22 22:49:36 2004
@@ -23,14 +23,13 @@
import org.apache.axis.addressing.EndpointReferenceType;
import org.apache.axis.context.MessageContext;
import org.apache.axis.description.AxisOperation;
-import org.apache.axis.description.AxisService;
import org.apache.axis.description.Parameter;
import org.apache.axis.engine.Echo;
import org.apache.axis.engine.EngineRegistry;
import org.apache.axis.engine.EngineUtils;
+import org.apache.axis.impl.description.AxisService;
import org.apache.axis.impl.description.ParameterImpl;
import org.apache.axis.impl.description.SimpleAxisOperationImpl;
-import org.apache.axis.impl.description.SimpleAxisServiceImpl;
import org.apache.axis.impl.llom.factory.OMXMLBuilderFactory;
import org.apache.axis.impl.llom.serialize.SimpleOMSerializer;
import org.apache.axis.impl.providers.RawXMLProvider;
@@ -69,7 +68,7 @@
protected void setUp() throws Exception {
engineRegistry = EngineUtils.createMockRegistry(serviceName, operationName, transportName);
- AxisService service = new SimpleAxisServiceImpl(serviceName);
+ AxisService service = new AxisService(serviceName);
service.setClassLoader(Thread.currentThread().getContextClassLoader());
Parameter classParam = new ParameterImpl("className", Echo.class.getName());
service.addParameter(classParam);
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/clientapi/TestSendReceiveAsync.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/clientapi/TestSendReceiveAsync.java?view=diff&rev=123170&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/clientapi/TestSendReceiveAsync.java&r1=123169&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/clientapi/TestSendReceiveAsync.java&r2=123170
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/clientapi/TestSendReceiveAsync.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/clientapi/TestSendReceiveAsync.java Wed Dec 22 22:49:36 2004
@@ -20,15 +20,13 @@
import org.apache.axis.addressing.EndpointReferenceType;
import org.apache.axis.context.MessageContext;
import org.apache.axis.description.AxisOperation;
-import org.apache.axis.description.AxisService;
import org.apache.axis.description.Parameter;
-import org.apache.axis.engine.Constants;
import org.apache.axis.engine.Echo;
import org.apache.axis.engine.EngineRegistry;
import org.apache.axis.engine.EngineUtils;
+import org.apache.axis.impl.description.AxisService;
import org.apache.axis.impl.description.ParameterImpl;
import org.apache.axis.impl.description.SimpleAxisOperationImpl;
-import org.apache.axis.impl.description.SimpleAxisServiceImpl;
import org.apache.axis.impl.llom.factory.OMXMLBuilderFactory;
import org.apache.axis.impl.llom.serialize.SimpleOMSerializer;
import org.apache.axis.impl.providers.RawXMLProvider;
@@ -79,7 +77,7 @@
engineRegistry = EngineUtils.createMockRegistry(serviceName,
operationName, transportName);
- AxisService service = new SimpleAxisServiceImpl(serviceName);
+ AxisService service = new AxisService(serviceName);
service.setClassLoader(Thread.currentThread().getContextClassLoader());
Parameter classParam = new ParameterImpl("className", Echo.class
.getName());
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java?view=diff&rev=123170&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java&r1=123169&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java&r2=123170
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java Wed Dec 22 22:49:36 2004
@@ -19,10 +19,10 @@
import org.apache.axis.AbstractTestCase;
import org.apache.axis.description.AxisOperation;
-import org.apache.axis.description.AxisService;
import org.apache.axis.description.Flow;
import org.apache.axis.engine.EngineRegistry;
import org.apache.axis.engine.Provider;
+import org.apache.axis.impl.description.AxisService;
import org.apache.axis.impl.providers.RawXMLProvider;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/description/RegistryTest.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/description/RegistryTest.java?view=diff&rev=123170&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/description/RegistryTest.java&r1=123169&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/description/RegistryTest.java&r2=123170
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/description/RegistryTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/description/RegistryTest.java Wed Dec 22 22:49:36 2004
@@ -15,22 +15,22 @@
*/
package org.apache.axis.description;
+import javax.xml.namespace.QName;
+
import org.apache.axis.AbstractTestCase;
import org.apache.axis.context.MessageContext;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.EngineRegistry;
import org.apache.axis.engine.Handler;
+import org.apache.axis.impl.description.AxisService;
import org.apache.axis.impl.description.FlowImpl;
import org.apache.axis.impl.description.ParameterImpl;
import org.apache.axis.impl.description.SimpleAxisOperationImpl;
-import org.apache.axis.impl.description.SimpleAxisServiceImpl;
import org.apache.axis.impl.engine.EngineRegistryImpl;
import org.apache.axis.impl.handlers.AbstractHandler;
import org.apache.axis.impl.providers.RawXMLProvider;
import org.apache.axis.impl.providers.SimpleJavaProvider;
-import javax.xml.namespace.QName;
-
public class RegistryTest extends AbstractTestCase{
private EngineRegistry reg;
public RegistryTest(String testName) {
@@ -49,7 +49,7 @@
reg.addMdoule(modlue);
QName serviceName = new QName("service");
- AxisService service = new SimpleAxisServiceImpl(serviceName);
+ AxisService service = new AxisService(serviceName);
reg.addService(service);
assertSame(modlue,reg.getModule(moduleName));
@@ -65,7 +65,7 @@
}
public void testService(){
- AxisService service = new SimpleAxisServiceImpl(new QName("Service1"));
+ AxisService service = new AxisService(new QName("Service1"));
testParameteInClude(service);
testFlowIncludeTest(service);
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/CallUnregisterdServiceTest.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/CallUnregisterdServiceTest.java?view=diff&rev=123170&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/CallUnregisterdServiceTest.java&r1=123169&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/CallUnregisterdServiceTest.java&r2=123170
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/CallUnregisterdServiceTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/CallUnregisterdServiceTest.java Wed Dec 22 22:49:36 2004
@@ -16,15 +16,18 @@
package org.apache.axis.engine;
//todo
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+
import org.apache.axis.AbstractTestCase;
import org.apache.axis.client.Call;
import org.apache.axis.context.MessageContext;
import org.apache.axis.description.AxisOperation;
-import org.apache.axis.description.AxisService;
import org.apache.axis.description.Parameter;
+import org.apache.axis.impl.description.AxisService;
import org.apache.axis.impl.description.ParameterImpl;
import org.apache.axis.impl.description.SimpleAxisOperationImpl;
-import org.apache.axis.impl.description.SimpleAxisServiceImpl;
import org.apache.axis.impl.providers.RawXMLProvider;
import org.apache.axis.impl.transport.http.SimpleHTTPReceiver;
import org.apache.axis.om.OMElement;
@@ -33,9 +36,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.xml.namespace.QName;
-import java.net.URL;
-
public class CallUnregisterdServiceTest extends AbstractTestCase{
private Log log = LogFactory.getLog(getClass());
private QName serviceName = new QName("","EchoXMLService");
@@ -57,7 +57,7 @@
protected void setUp() throws Exception {
engineRegistry = EngineUtils.createMockRegistry(serviceName,operationName,transportName);
- AxisService service = new SimpleAxisServiceImpl(serviceName);
+ AxisService service = new AxisService(serviceName);
service.setClassLoader(Thread.currentThread().getContextClassLoader());
Parameter classParam = new ParameterImpl("className",Echo.class.getName());
service.addParameter(classParam);
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoRawXMLTest.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoRawXMLTest.java?view=diff&rev=123170&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoRawXMLTest.java&r1=123169&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoRawXMLTest.java&r2=123170
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoRawXMLTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoRawXMLTest.java Wed Dec 22 22:49:36 2004
@@ -16,16 +16,19 @@
package org.apache.axis.engine;
//todo
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+
import org.apache.axis.AbstractTestCase;
import org.apache.axis.client.Call;
import org.apache.axis.client.CallBack;
import org.apache.axis.context.MessageContext;
import org.apache.axis.description.AxisOperation;
-import org.apache.axis.description.AxisService;
import org.apache.axis.description.Parameter;
+import org.apache.axis.impl.description.AxisService;
import org.apache.axis.impl.description.ParameterImpl;
import org.apache.axis.impl.description.SimpleAxisOperationImpl;
-import org.apache.axis.impl.description.SimpleAxisServiceImpl;
import org.apache.axis.impl.providers.RawXMLProvider;
import org.apache.axis.impl.transport.http.SimpleHTTPReceiver;
import org.apache.axis.om.OMElement;
@@ -34,9 +37,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.xml.namespace.QName;
-import java.net.URL;
-
public class EchoRawXMLTest extends AbstractTestCase{
private Log log = LogFactory.getLog(getClass());
private QName serviceName = new QName("","EchoXMLService");
@@ -59,7 +59,7 @@
protected void setUp() throws Exception {
engineRegistry = EngineUtils.createMockRegistry(serviceName,operationName,transportName);
- AxisService service = new SimpleAxisServiceImpl(serviceName);
+ AxisService service = new AxisService(serviceName);
service.setClassLoader(Thread.currentThread().getContextClassLoader());
Parameter classParam = new ParameterImpl("className",Echo.class.getName());
service.addParameter(classParam);
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoTest.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoTest.java?view=diff&rev=123170&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoTest.java&r1=123169&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoTest.java&r2=123170
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoTest.java Wed Dec 22 22:49:36 2004
@@ -16,22 +16,21 @@
package org.apache.axis.engine;
//todo
+import javax.xml.namespace.QName;
+
import org.apache.axis.AbstractTestCase;
import org.apache.axis.context.MessageContext;
import org.apache.axis.description.AxisGlobal;
import org.apache.axis.description.AxisOperation;
-import org.apache.axis.description.AxisService;
import org.apache.axis.description.Parameter;
+import org.apache.axis.impl.description.AxisService;
import org.apache.axis.impl.description.ParameterImpl;
import org.apache.axis.impl.description.SimpleAxisOperationImpl;
-import org.apache.axis.impl.description.SimpleAxisServiceImpl;
import org.apache.axis.impl.providers.SimpleJavaProvider;
import org.apache.axis.impl.transport.http.SimpleHTTPReceiver;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.xml.namespace.QName;
-
public class EchoTest extends AbstractTestCase{
private Log log = LogFactory.getLog(getClass());
private QName serviceName = new QName("","EchoXMLService");
@@ -56,7 +55,7 @@
AxisGlobal global = new AxisGlobal();
engineRegistry = new org.apache.axis.impl.engine.EngineRegistryImpl(global);
- AxisService service = new SimpleAxisServiceImpl(serviceName);
+ AxisService service = new AxisService(serviceName);
service.setClassLoader(Thread.currentThread().getContextClassLoader());
Parameter classParam = new ParameterImpl("className",Echo.class.getName());
service.addParameter(classParam);
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineTest.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineTest.java?view=diff&rev=123170&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineTest.java&r1=123169&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineTest.java&r2=123170
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineTest.java Wed Dec 22 22:49:36 2004
@@ -18,7 +18,7 @@
import junit.framework.TestCase;
import org.apache.axis.context.MessageContext;
-import org.apache.axis.description.AxisService;
+import org.apache.axis.impl.description.AxisService;
import javax.xml.namespace.QName;
import java.io.OutputStream;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineUtils.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineUtils.java?view=diff&rev=123170&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineUtils.java&r1=123169&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineUtils.java&r2=123170
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineUtils.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineUtils.java Wed Dec 22 22:49:36 2004
@@ -15,18 +15,26 @@
*/
package org.apache.axis.engine;
-import org.apache.axis.description.*;
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.util.ArrayList;
+
+import javax.xml.namespace.QName;
+
+import org.apache.axis.description.AxisGlobal;
+import org.apache.axis.description.AxisModule;
+import org.apache.axis.description.AxisOperation;
+import org.apache.axis.description.EchoService;
+import org.apache.axis.description.Flow;
+import org.apache.axis.description.HandlerMetaData;
+import org.apache.axis.description.MockFlow;
+import org.apache.axis.description.Parameter;
+import org.apache.axis.impl.description.AxisService;
import org.apache.axis.impl.description.ParameterImpl;
import org.apache.axis.impl.description.SimpleAxisOperationImpl;
-import org.apache.axis.impl.description.SimpleAxisServiceImpl;
import org.apache.axis.impl.providers.SimpleJavaProvider;
import org.apache.axis.impl.transport.http.SimpleHTTPReceiver;
-import javax.xml.namespace.QName;
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.util.ArrayList;
-
public class EngineUtils {
public static final int TESTING_PORT = 7777;
public static final String FAILURE_MESSAGE = "Intentional Faliure";
@@ -72,7 +80,7 @@
- AxisService service = new SimpleAxisServiceImpl(serviceName);
+ AxisService service = new AxisService(serviceName);
service.setInFlow(new MockFlow("service inflow",4));
service.setOutFlow(new MockFlow("service outflow",5));
service.setFaultFlow(new MockFlow("service faultflow",1));
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/HandlerFaliureTest.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/HandlerFaliureTest.java?view=diff&rev=123170&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/HandlerFaliureTest.java&r1=123169&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/HandlerFaliureTest.java&r2=123170
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/HandlerFaliureTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/HandlerFaliureTest.java Wed Dec 22 22:49:36 2004
@@ -16,14 +16,21 @@
package org.apache.axis.engine;
//todo
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+
import org.apache.axis.AbstractTestCase;
import org.apache.axis.client.Call;
import org.apache.axis.context.MessageContext;
-import org.apache.axis.description.*;
+import org.apache.axis.description.AxisOperation;
+import org.apache.axis.description.Flow;
+import org.apache.axis.description.Parameter;
+import org.apache.axis.description.SpeakingHandler;
+import org.apache.axis.impl.description.AxisService;
import org.apache.axis.impl.description.FlowImpl;
import org.apache.axis.impl.description.ParameterImpl;
import org.apache.axis.impl.description.SimpleAxisOperationImpl;
-import org.apache.axis.impl.description.SimpleAxisServiceImpl;
import org.apache.axis.impl.handlers.AbstractHandler;
import org.apache.axis.impl.providers.RawXMLProvider;
import org.apache.axis.impl.transport.http.SimpleHTTPReceiver;
@@ -33,9 +40,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.xml.namespace.QName;
-import java.net.URL;
-
public class HandlerFaliureTest extends AbstractTestCase{
private Log log = LogFactory.getLog(getClass());
private QName serviceName = new QName("","EchoXMLService");
@@ -63,7 +67,7 @@
public void testFailureAtServerRequestFlow() throws Exception{
- AxisService service = new SimpleAxisServiceImpl(serviceName);
+ AxisService service = new AxisService(serviceName);
Flow flow = new FlowImpl();
EngineUtils.addHandler(flow,new SpeakingHandler());
@@ -90,7 +94,7 @@
}
public void testFailureAtServerResponseFlow() throws Exception{
- AxisService service = new SimpleAxisServiceImpl(serviceName);
+ AxisService service = new AxisService(serviceName);
Flow flow = new FlowImpl();
EngineUtils.addHandler(flow,new SpeakingHandler());
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/SimpleAxisServerTest.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/SimpleAxisServerTest.java?view=diff&rev=123170&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/SimpleAxisServerTest.java&r1=123169&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/SimpleAxisServerTest.java&r2=123170
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/SimpleAxisServerTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/SimpleAxisServerTest.java Wed Dec 22 22:49:36 2004
@@ -16,20 +16,20 @@
package org.apache.axis.engine;
//todo
+import java.net.ServerSocket;
+
+import javax.xml.namespace.QName;
+
import org.apache.axis.AbstractTestCase;
import org.apache.axis.context.MessageContext;
import org.apache.axis.description.AxisOperation;
-import org.apache.axis.description.AxisService;
import org.apache.axis.description.Parameter;
+import org.apache.axis.impl.description.AxisService;
import org.apache.axis.impl.description.ParameterImpl;
import org.apache.axis.impl.description.SimpleAxisOperationImpl;
-import org.apache.axis.impl.description.SimpleAxisServiceImpl;
import org.apache.axis.impl.providers.RawXMLProvider;
import org.apache.axis.impl.transport.http.SimpleHTTPReceiver;
-import javax.xml.namespace.QName;
-import java.net.ServerSocket;
-
public class SimpleAxisServerTest extends AbstractTestCase{
private QName serviceName = new QName("","EchoXMLService");
private QName operationName = new QName("http://localhost/my","echoOMElement");
@@ -53,7 +53,7 @@
protected void setUp() throws Exception {
engineRegistry = EngineUtils.createMockRegistry(serviceName,operationName,transportName);
- AxisService service = new SimpleAxisServiceImpl(serviceName);
+ AxisService service = new AxisService(serviceName);
service.setClassLoader(Thread.currentThread().getContextClassLoader());
Parameter classParam = new ParameterImpl("className",Echo.class.getName());
service.addParameter(classParam);