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 de...@apache.org on 2006/03/06 11:24:48 UTC
svn commit: r383509 - in /webservices/axis2/trunk/java/modules:
common/src/org/apache/axis2/i18n/ core/src/org/apache/axis2/deployment/
core/src/org/apache/axis2/deployment/util/
core/src/org/apache/axis2/description/ core/src/org/apache/axis2/transpor...
Author: deepal
Date: Mon Mar 6 02:24:43 2006
New Revision: 383509
URL: http://svn.apache.org/viewcvs?rev=383509&view=rev
Log:
-few i18n
- removed unused interface and fatten then into concrete class (removed FlowImpl , ParameterImpl)
Added:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/Parameter.java
Removed:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterImpl.java
Modified:
webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/i18n/resource.properties
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/RepositoryListener.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ClientUtils.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterIncludeImpl.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/MockFlow.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/RegistryTest.java
webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParameterAddTest.java
webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MockFlow.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/InflowConfiguration.java
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/OutflowConfiguration.java
Modified: webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/i18n/resource.properties
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/i18n/resource.properties?rev=383509&r1=383508&r2=383509&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/i18n/resource.properties (original)
+++ webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/i18n/resource.properties Mon Mar 6 02:24:43 2006
@@ -160,6 +160,14 @@
axisoperationcreateerror=Exception when creating AxisOperation for the AxisService {0}
wrapperelementcreaterror=Exception occured while creating wrapper element
policyprocessingerror=Exception occured when processing policy elements
+bothrepoandconfignull=neither repository location nor axis2.xml are given so system will continue using default configuration (using default_axis2.xml)
+cannotfindrepo=System can not find the given repository location: {0}
+norepofoundinaxis2=no repository location found in axis2.xml
+noservicedirfound=no services directory found , new one created
+nomoduledirfound=no modules directory found , new one created
+confdirnotfound=conf directory not found , and no axis2.xml file is given ! System will continue using default_axis2.xml
+noaxis2xmlfound=axis2.xml file not found in conf directory , system will continue using default_axis2.xml
+messagelabelcannotfound=message lebel can not be null
#outMessageNull=Out message is null
malformedURLException00=MalformedURLException:
exception00=Exception:
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=383509&r1=383508&r2=383509&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java Mon Mar 6 02:24:43 2006
@@ -95,16 +95,15 @@
} else {
useDefault = true;
axis2repository = null;
- log.debug("neither repository location nor axis2.xml are given ," +
- " so system will continue using default configuration (using default_axis2.xml)");
+ log.debug(Messages.getMessage("bothrepoandconfignull"));
}
} else if (!(repositoryName == null || "".equals(repositoryName.trim()))) {
axis2repository = repositoryName.trim();
File axisRepo = new File(axis2repository);
if (!axisRepo.exists()) {
- throw new DeploymentException("System can not find the given repository location: "
- + axis2repository);
+ throw new DeploymentException(
+ Messages.getMessage("cannotfindrepo", axis2repository));
}
if (xmlFile == null || "".equals(xmlFile.trim())) {
axis2_xml_file_name = null;
@@ -546,9 +545,10 @@
}
return axisConfig;
} else {
- log.info("no repository location found in axis2.xml");
+ log.info(Messages.getMessage("norepofoundinaxis2"));
new RepositoryListener(this);
- org.apache.axis2.util.Utils.calculateDefaultModuleVersion(axisConfig.getModules(), axisConfig);
+ org.apache.axis2.util.Utils.calculateDefaultModuleVersion(
+ axisConfig.getModules(), axisConfig);
validateSystemPredefinedPhases();
return axisConfig;
}
@@ -746,26 +746,24 @@
File services = new File(repository, DIRECTORY_SERVICES);
if (!services.exists()) {
services.mkdirs();
- log.info("no services directory found , new one created");
+ log.info(Messages.getMessage("noservicedirfound"));
}
File modules = new File(repository, DIRECTORY_MODULES);
if (!modules.exists()) {
modules.mkdirs();
- log.info("no modules directory found , new one created");
+ log.info(Messages.getMessage("nomoduledirfound"));
}
if (axis2_xml_file_name == null) {
File confdir = new File(repository, DIRECTORY_CONF);
if (!confdir.exists()) {
- log.info("conf directory not found , and no axis2.xml file is given ! " +
- "System will continue using default_axis2.xml");
+ log.info(Messages.getMessage("confdirnotfound"));
useDefault = true;
} else {
File axis2xml = new File(confdir, "axis2.xml");
if (!axis2xml.exists()) {
useDefault = true;
- log.info("axis2.xml file not found in conf directory , " +
- "system will continue using default_axis2.xml");
+ log.info(Messages.getMessage("noaxis2xmlfound"));
} else {
useDefault = false;
axis2_xml_file_name = axis2xml.getAbsolutePath();
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java?rev=383509&r1=383508&r2=383509&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java Mon Mar 6 02:24:43 2006
@@ -177,7 +177,7 @@
*/
protected Flow processFlow(OMElement flowelement, ParameterInclude parent)
throws DeploymentException {
- Flow flow = new FlowImpl();
+ Flow flow = new Flow();
if (flowelement == null) {
return flow;
@@ -322,7 +322,7 @@
while (parameters.hasNext()) {
// this is to check whether some one has locked the parmter at the top level
OMElement parameterElement = (OMElement) parameters.next();
- Parameter parameter = new ParameterImpl();
+ Parameter parameter = new Parameter();
// setting parameterElement
parameter.setParameterElement(parameterElement);
// setting parameter Name
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/RepositoryListener.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/RepositoryListener.java?rev=383509&r1=383508&r2=383509&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/RepositoryListener.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/RepositoryListener.java Mon Mar 6 02:24:43 2006
@@ -17,8 +17,6 @@
package org.apache.axis2.deployment;
-import org.apache.axis2.deployment.DeploymentConstants;
-import org.apache.axis2.deployment.DeploymentEngine;
import org.apache.axis2.deployment.repository.util.ArchiveFileData;
import org.apache.axis2.deployment.repository.util.WSInfoList;
import org.apache.commons.logging.Log;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java?rev=383509&r1=383508&r2=383509&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java Mon Mar 6 02:24:43 2006
@@ -208,7 +208,7 @@
OMAttribute lable = messageElement.getAttribute(new QName(TAG_LABEL));
if (lable == null) {
- throw new DeploymentException("message lebel can not be null");
+ throw new DeploymentException(Messages.getMessage("messagelabelcannotfound"));
}
AxisMessage message = operation.getMessage(lable.getAttributeValue());
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java?rev=383509&r1=383508&r2=383509&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java Mon Mar 6 02:24:43 2006
@@ -216,7 +216,7 @@
*/
public static AxisService createService(String implClass,
AxisConfiguration axisConfig, Class messageReceiverClass) throws AxisFault {
- Parameter parameter = new ParameterImpl(Constants.SERVICE_CLASS, implClass);
+ Parameter parameter = new Parameter(Constants.SERVICE_CLASS, implClass);
OMElement paraElement = getParameter(Constants.SERVICE_CLASS, implClass, false);
parameter.setParameterElement(paraElement);
AxisService axisService = new AxisService();
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ClientUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ClientUtils.java?rev=383509&r1=383508&r2=383509&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ClientUtils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ClientUtils.java Mon Mar 6 02:24:43 2006
@@ -182,7 +182,7 @@
Object extensibilityElement = exteElements.next();
if (extensibilityElement instanceof SOAPOperation) {
SOAPOperation soapOp = (SOAPOperation) extensibilityElement;
- axisOperation.addParameter(new ParameterImpl(AxisOperation.SOAP_ACTION,
+ axisOperation.addParameter(new Parameter(AxisOperation.SOAP_ACTION,
soapOp.getSoapActionURI()));
}
}
Added: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/Parameter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/Parameter.java?rev=383509&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/Parameter.java (added)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/Parameter.java Mon Mar 6 02:24:43 2006
@@ -0,0 +1,155 @@
+/*
+* Copyright 2004,2005 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.axis2.description;
+
+import org.apache.ws.commons.om.OMElement;
+
+/**
+ * Class ParameterImpl
+ */
+public class Parameter {
+
+ /**
+ * Field TEXT_PARAMETER
+ */
+ public static int TEXT_PARAMETER = 0;
+
+ /**
+ * Field OM_PARAMETER
+ */
+ public static int OM_PARAMETER = 1;
+
+ /**
+ * Field type
+ */
+ private int type = TEXT_PARAMETER;
+
+ /**
+ * Field locked
+ */
+ private boolean locked;
+
+ /**
+ * Field name
+ */
+ private String name;
+
+ /**
+ * to store the parameter lement
+ * <parameter name="ServiceClass1" locked="false">
+ * org.apache.axis2.sample.echo.EchoImpl</parameter>
+ */
+ private OMElement parameterElement;
+
+ /**
+ * Field value
+ */
+ private Object value;
+
+ /**
+ * Constructor ParameterImpl.
+ */
+ public Parameter() {
+ }
+
+ /**
+ * Constructor ParameterImpl.
+ *
+ * @param name
+ * @param value
+ */
+ public Parameter(String name, String value) {
+ this.name = name;
+ this.value = value;
+ }
+
+ /**
+ * Method getName.
+ *
+ * @return Returns String.
+ */
+ public String getName() {
+ return name;
+ }
+
+ public OMElement getParameterElement() {
+ return this.parameterElement;
+ }
+
+ /**
+ * Method getParameterType.
+ *
+ * @return Returns int.
+ */
+ public int getParameterType() {
+ return type;
+ }
+
+ /**
+ * Method getValue.
+ *
+ * @return Returns Object.
+ */
+ public Object getValue() {
+ return value;
+ }
+
+ /**
+ * Method isLocked.
+ *
+ * @return Returns boolean.
+ */
+ public boolean isLocked() {
+ return locked;
+ }
+
+ /**
+ * Method setLocked.
+ *
+ * @param value
+ */
+ public void setLocked(boolean value) {
+ locked = value;
+ }
+
+ /**
+ * Method setName.
+ *
+ * @param name
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public void setParameterElement(OMElement element) {
+ this.parameterElement = element;
+ }
+
+ public void setParameterType(int type) {
+ this.type = type;
+ }
+
+ /**
+ * Method setValue.
+ *
+ * @param value
+ */
+ public void setValue(Object value) {
+ this.value = value;
+ }
+}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterIncludeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterIncludeImpl.java?rev=383509&r1=383508&r2=383509&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterIncludeImpl.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ParameterIncludeImpl.java Mon Mar 6 02:24:43 2006
@@ -71,7 +71,7 @@
// this is to check whether some one has locked the parmter at the top level
OMElement parameterElement = (OMElement) iterator.next();
- Parameter parameter = new ParameterImpl();
+ Parameter parameter = new Parameter();
// setting parameterElement
parameter.setParameterElement(parameterElement);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java?rev=383509&r1=383508&r2=383509&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java Mon Mar 6 02:24:43 2006
@@ -24,7 +24,6 @@
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
-import org.apache.axis2.description.ParameterImpl;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.transport.http.server.AdminAppException;
@@ -119,7 +118,7 @@
Parameter parameter = (Parameter) service_para.get(i);
String para = req.getParameter(serviceName + "_" + parameter.getName());
- service.addParameter(new ParameterImpl(parameter.getName(), para));
+ service.addParameter(new Parameter(parameter.getName(), para));
}
for (Iterator iterator = service.getOperations(); iterator.hasNext();) {
@@ -131,7 +130,7 @@
Parameter parameter = (Parameter) operation_para.get(i);
String para = req.getParameter(op_name + "_" + parameter.getName());
- axisOperation.addParameter(new ParameterImpl(parameter.getName(), para));
+ axisOperation.addParameter(new Parameter(parameter.getName(), para));
}
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java?rev=383509&r1=383508&r2=383509&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java Mon Mar 6 02:24:43 2006
@@ -37,7 +37,6 @@
import org.apache.axis2.description.InOutAxisOperation;
import org.apache.axis2.description.OutInAxisOperation;
import org.apache.axis2.description.Parameter;
-import org.apache.axis2.description.ParameterImpl;
import org.apache.axis2.description.PhaseRule;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.Handler;
@@ -130,7 +129,7 @@
AxisService service = new AxisService(serviceName.getLocalPart());
service.setClassLoader(Thread.currentThread().getContextClassLoader());
- service.addParameter(new ParameterImpl(AbstractMessageReceiver.SERVICE_CLASS, className));
+ service.addParameter(new Parameter(AbstractMessageReceiver.SERVICE_CLASS, className));
AxisOperation axisOp = new InOutAxisOperation(opName);
@@ -150,7 +149,7 @@
AxisService service = new AxisService(serviceName.getLocalPart());
service.setClassLoader(Thread.currentThread().getContextClassLoader());
- service.addParameter(new ParameterImpl(AbstractMessageReceiver.SERVICE_CLASS, className));
+ service.addParameter(new Parameter(AbstractMessageReceiver.SERVICE_CLASS, className));
AxisOperation axisOp = new OutInAxisOperation(opName);
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java?rev=383509&r1=383508&r2=383509&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java Mon Mar 6 02:24:43 2006
@@ -22,7 +22,7 @@
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.AxisServiceGroup;
import org.apache.axis2.description.InOutAxisOperation;
-import org.apache.axis2.description.ParameterImpl;
+import org.apache.axis2.description.Parameter;
import org.apache.axis2.engine.AxisConfiguration;
import javax.xml.namespace.QName;
@@ -73,7 +73,7 @@
configurationContext.setProperty(key1, value1);
assertEquals(value1, msgctx.getProperty(key1));
- axisConfiguration.addParameter(new ParameterImpl(key2, value2));
+ axisConfiguration.addParameter(new Parameter(key2, value2));
assertEquals(value2, msgctx.getParameter(key2).getValue());
opContext.setProperty(key1, value3);
@@ -100,7 +100,7 @@
configurationContext.setProperty(key1, value1);
assertEquals(value1, msgctx.getProperty(key1));
- axisConfiguration.addParameter(new ParameterImpl(key2, value2));
+ axisConfiguration.addParameter(new Parameter(key2, value2));
assertEquals(value2, msgctx.getParameter(key2).getValue());
}
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/MockFlow.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/MockFlow.java?rev=383509&r1=383508&r2=383509&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/MockFlow.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/MockFlow.java Mon Mar 6 02:24:43 2006
@@ -20,7 +20,7 @@
import org.apache.axis2.util.Utils;
-public class MockFlow extends FlowImpl implements Flow {
+public class MockFlow extends Flow {
public MockFlow(String message, int length) {
super();
for (int i = 0; i < length; i++) {
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/RegistryTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/RegistryTest.java?rev=383509&r1=383508&r2=383509&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/RegistryTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/description/RegistryTest.java Mon Mar 6 02:24:43 2006
@@ -82,15 +82,15 @@
public void testParameteInClude(ParameterInclude parmInclude) throws AxisFault {
String key = "value1";
- Parameter p = new ParameterImpl(key, "value2");
+ Parameter p = new Parameter(key, "value2");
parmInclude.addParameter(p);
assertEquals(p, parmInclude.getParameter(key));
}
public void testFlowIncludeTest(FlowInclude flowInclude) {
- Flow flow1 = new FlowImpl();
- Flow flow2 = new FlowImpl();
- Flow flow3 = new FlowImpl();
+ Flow flow1 = new Flow();
+ Flow flow2 = new Flow();
+ Flow flow3 = new Flow();
flowInclude.setInFlow(flow1);
flowInclude.setFaultInFlow(flow2);
Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParameterAddTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParameterAddTest.java?rev=383509&r1=383508&r2=383509&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParameterAddTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ParameterAddTest.java Mon Mar 6 02:24:43 2006
@@ -23,7 +23,6 @@
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.InOutAxisOperation;
import org.apache.axis2.description.Parameter;
-import org.apache.axis2.description.ParameterImpl;
import javax.xml.namespace.QName;
/**
@@ -35,7 +34,7 @@
private AxisConfiguration reg = new AxisConfiguration();
public void testAddParameterServiceLockedAtAxisConfig(){
try {
- Parameter para = new ParameterImpl();
+ Parameter para = new Parameter();
para.setValue(null);
para.setName("PARA_NAME");
para.setLocked(true);
@@ -52,7 +51,7 @@
public void testAddParameterModuleLockedAtAxisConfig(){
try {
- Parameter para = new ParameterImpl();
+ Parameter para = new Parameter();
para.setValue(null);
para.setName("PARA_NAME");
para.setLocked(true);
@@ -68,7 +67,7 @@
public void testAddParameterOperationlockedByAxisConfig(){
try {
- Parameter para = new ParameterImpl();
+ Parameter para = new Parameter();
para.setValue(null);
para.setName("PARA_NAME");
para.setLocked(true);
@@ -90,7 +89,7 @@
public void testAddParameterOperationLockebyService(){
try {
- Parameter para = new ParameterImpl();
+ Parameter para = new Parameter();
para.setValue(null);
para.setName("PARA_NAME");
para.setLocked(true);
Modified: webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java?rev=383509&r1=383508&r2=383509&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java Mon Mar 6 02:24:43 2006
@@ -25,7 +25,6 @@
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
-import org.apache.axis2.description.ParameterImpl;
import org.apache.axis2.engine.Echo;
import org.apache.axis2.engine.util.TestConstants;
import org.apache.axis2.integration.UtilServer;
@@ -52,7 +51,7 @@
protected void setUp() throws Exception {
UtilServer.start();
- Parameter parameter = new ParameterImpl(
+ Parameter parameter = new Parameter(
Constants.Configuration.ENABLE_REST, "true");
UtilServer.getConfigurationContext()
.getAxisConfiguration().addParameter(parameter);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java?rev=383509&r1=383508&r2=383509&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java Mon Mar 6 02:24:43 2006
@@ -97,7 +97,7 @@
AxisService service = new AxisService(serviceName.getLocalPart());
service.addParameter(
- new ParameterImpl(AbstractMessageReceiver.SERVICE_CLASS,
+ new Parameter(AbstractMessageReceiver.SERVICE_CLASS,
MessageContextEnabledEcho.class.getName()));
AxisOperation axisOperation = new InOnlyAxisOperation(
operationName);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MockFlow.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MockFlow.java?rev=383509&r1=383508&r2=383509&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MockFlow.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MockFlow.java Mon Mar 6 02:24:43 2006
@@ -17,11 +17,10 @@
package org.apache.axis2.engine;
import org.apache.axis2.description.Flow;
-import org.apache.axis2.description.FlowImpl;
import javax.xml.namespace.QName;
-public class MockFlow extends FlowImpl implements Flow {
+public class MockFlow extends Flow {
public MockFlow(String message, int length) {
super();
for (int i = 0; i < length; i++) {
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java?rev=383509&r1=383508&r2=383509&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java Mon Mar 6 02:24:43 2006
@@ -21,7 +21,7 @@
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.OutInAxisOperation;
-import org.apache.axis2.description.ParameterImpl;
+import org.apache.axis2.description.Parameter;
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.receivers.AbstractMessageReceiver;
import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
@@ -64,7 +64,7 @@
UtilServer.start(Constants.TESTING_PATH + "MTOM-enabledRepository");
service = new AxisService(serviceName.getLocalPart());
service.setClassLoader(Thread.currentThread().getContextClassLoader());
- service.addParameter(new ParameterImpl(AbstractMessageReceiver.SERVICE_CLASS,
+ service.addParameter(new Parameter(AbstractMessageReceiver.SERVICE_CLASS,
EchoService.class.getName()));
AxisOperation axisOp = new OutInAxisOperation(operationName);
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java?rev=383509&r1=383508&r2=383509&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java Mon Mar 6 02:24:43 2006
@@ -31,7 +31,7 @@
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.InOutAxisOperation;
-import org.apache.axis2.description.ParameterImpl;
+import org.apache.axis2.description.Parameter;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.receivers.AbstractMessageReceiver;
@@ -95,7 +95,7 @@
operationName = new QName("http://org.apache.axis2/xsd", opName, "req");
AxisService service = new AxisService(serviceName.getLocalPart());
service.setClassLoader(Thread.currentThread().getContextClassLoader());
- service.addParameter(new ParameterImpl(AbstractMessageReceiver.SERVICE_CLASS,
+ service.addParameter(new Parameter(AbstractMessageReceiver.SERVICE_CLASS,
className));
AxisOperation axisOp = new InOutAxisOperation(operationName);
axisOp.setMessageReceiver(new RPCMessageReceiver());
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java?rev=383509&r1=383508&r2=383509&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java Mon Mar 6 02:24:43 2006
@@ -29,7 +29,7 @@
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.InOutAxisOperation;
-import org.apache.axis2.description.ParameterImpl;
+import org.apache.axis2.description.Parameter;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.receivers.AbstractMessageReceiver;
@@ -136,7 +136,7 @@
operationName = new QName("http://org.apache.axis2/xsd", opName, "req");
AxisService service = new AxisService(serviceName.getLocalPart());
service.setClassLoader(Thread.currentThread().getContextClassLoader());
- service.addParameter(new ParameterImpl(AbstractMessageReceiver.SERVICE_CLASS,
+ service.addParameter(new Parameter(AbstractMessageReceiver.SERVICE_CLASS,
className));
AxisOperation axisOp = new InOutAxisOperation(operationName);
axisOp.setMessageReceiver(new RPCMessageReceiver());
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java?rev=383509&r1=383508&r2=383509&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/swa/EchoRawSwATest.java Mon Mar 6 02:24:43 2006
@@ -22,7 +22,7 @@
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.OutInAxisOperation;
-import org.apache.axis2.description.ParameterImpl;
+import org.apache.axis2.description.Parameter;
import org.apache.axis2.integration.UtilServer;
import org.apache.axis2.receivers.AbstractMessageReceiver;
import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
@@ -68,7 +68,7 @@
UtilServer.start(Constants.TESTING_PATH + "MTOM-enabledRepository");
service = new AxisService(serviceName.getLocalPart());
service.setClassLoader(Thread.currentThread().getContextClassLoader());
- service.addParameter(new ParameterImpl(
+ service.addParameter(new Parameter(
AbstractMessageReceiver.SERVICE_CLASS, EchoSwA.class
.getName()));
AxisOperation axisOp = new OutInAxisOperation(operationName);
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/InflowConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/InflowConfiguration.java?rev=383509&r1=383508&r2=383509&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/InflowConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/InflowConfiguration.java Mon Mar 6 02:24:43 2006
@@ -17,7 +17,6 @@
package org.apache.axis2.security.handler.config;
import org.apache.axis2.description.Parameter;
-import org.apache.axis2.description.ParameterImpl;
import org.apache.axis2.security.handler.WSSHandlerConstants;
import org.apache.ws.commons.om.OMAbstractFactory;
import org.apache.ws.commons.om.OMElement;
@@ -68,7 +67,7 @@
paramElement.addChild(actionElem);
- ParameterImpl param = new ParameterImpl();
+ Parameter param = new Parameter();
param.setParameterElement(paramElement);
param.setValue(paramElement);
param.setName(WSSHandlerConstants.INFLOW_SECURITY);
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/OutflowConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/OutflowConfiguration.java?rev=383509&r1=383508&r2=383509&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/OutflowConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/OutflowConfiguration.java Mon Mar 6 02:24:43 2006
@@ -17,7 +17,6 @@
package org.apache.axis2.security.handler.config;
import org.apache.axis2.description.Parameter;
-import org.apache.axis2.description.ParameterImpl;
import org.apache.axis2.security.handler.WSSHandlerConstants;
import org.apache.ws.commons.om.OMAbstractFactory;
import org.apache.ws.commons.om.OMElement;
@@ -100,7 +99,7 @@
paramElement.addChild(actionElem);
}
- ParameterImpl param = new ParameterImpl();
+ Parameter param = new Parameter();
param.setParameterElement(paramElement);
param.setValue(paramElement);
param.setName(WSSHandlerConstants.OUTFLOW_SECURITY);