You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by gd...@apache.org on 2007/05/14 19:04:04 UTC
svn commit: r537916 - in /webservices/axis2/trunk/java/modules/kernel:
src/org/apache/axis2/deployment/ src/org/apache/axis2/description/
test-resources/deployment/AxisMessageTestRepo/modules/
test-resources/deployment/AxisMessageTestRepo/modules/modul...
Author: gdaniels
Date: Mon May 14 10:04:02 2007
New Revision: 537916
URL: http://svn.apache.org/viewvc?view=rev&rev=537916
Log:
Fix http://issues.apache.org/jira/browse/AXIS2-2656
* Fix bug in DescriptionBuilder/AxisOperation
* Add module deployment to AxisMessageTestRepo, and a test for same
Added:
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/AxisMessageTestRepo/modules/
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/AxisMessageTestRepo/modules/module1/
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/AxisMessageTestRepo/modules/module1/META-INF/
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/AxisMessageTestRepo/modules/module1/META-INF/module.xml
webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/OperationModuleTest.java
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/AxisMessageTestRepo/services/MessagetestService/META-INF/services.xml
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java?view=diff&rev=537916&r1=537915&r2=537916
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java Mon May 14 10:04:02 2007
@@ -484,7 +484,7 @@
throw new DeploymentException(Messages.getMessage(
DeploymentErrorMsgs.MODULE_NOT_FOUND, refName));
} else {
- operation.addModule(new QName(refName));
+ operation.addModule(refName);
}
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java?view=diff&rev=537916&r1=537915&r2=537916
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java Mon May 14 10:04:02 2007
@@ -129,7 +129,7 @@
OperationContext opContext)
throws AxisFault;
- public void addModule(QName moduleName) {
+ public void addModule(String moduleName) {
modulerefs.add(moduleName);
}
Added: webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/AxisMessageTestRepo/modules/module1/META-INF/module.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/AxisMessageTestRepo/modules/module1/META-INF/module.xml?view=auto&rev=537916
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/AxisMessageTestRepo/modules/module1/META-INF/module.xml (added)
+++ webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/AxisMessageTestRepo/modules/module1/META-INF/module.xml Mon May 14 10:04:02 2007
@@ -0,0 +1,33 @@
+<module name="module1">
+ <InFlow>
+ <handler name="h1" class="org.apache.axis2.registry.Handler3">
+ <order phase="OperationInPhase"/>
+ </handler>
+ <handler name="h2" class="org.apache.axis2.registry.Handler3">
+ <order phase="OperationInPhase"/>
+ </handler>
+ </InFlow>
+
+ <OutFlow>
+ <handler name="h3" class="org.apache.axis2.registry.Handler3">
+ <order phase="OperationOutPhase"/>
+ </handler>
+ </OutFlow>
+
+ <OutFaultFlow>
+ <handler name="h4" class="org.apache.axis2.registry.Handler3">
+ <order phase="OperationOutFaultPhase"/>
+ </handler>
+ </OutFaultFlow>
+
+ <InFaultFlow>
+ <handler name="h5" class="org.apache.axis2.registry.Handler3">
+ <order phase="OperationInFaultPhase"/>
+ </handler>
+ </InFaultFlow>
+
+ <operation name="creatSeq" mep="http://www.w3.org/2004/08/wsdl/in-out">
+ <messageReceiver class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+ <parameter name="para1" locked="xsd:true">10</parameter>
+ </operation>
+</module>
\ No newline at end of file
Modified: webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/AxisMessageTestRepo/services/MessagetestService/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/AxisMessageTestRepo/services/MessagetestService/META-INF/services.xml?view=diff&rev=537916&r1=537915&r2=537916
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/AxisMessageTestRepo/services/MessagetestService/META-INF/services.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/AxisMessageTestRepo/services/MessagetestService/META-INF/services.xml Mon May 14 10:04:02 2007
@@ -5,6 +5,7 @@
</description>
<parameter name="ServiceClass" locked="false">org.apache.axis2.sample.echo.EchoImpl</parameter>
<operation name="echoString">
+ <module ref="module1"/>
<message label="In">
<parameter name="messageIN" locked="false">messageIN</parameter>
</message>
Added: webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/OperationModuleTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/OperationModuleTest.java?view=auto&rev=537916
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/OperationModuleTest.java (added)
+++ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/deployment/OperationModuleTest.java Mon May 14 10:04:02 2007
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2007 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.deployment;
+
+import junit.framework.TestCase;
+import org.apache.axis2.engine.AxisConfiguration;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.ConfigurationContextFactory;
+import org.apache.axis2.AbstractTestCase;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.AxisOperation;
+
+import javax.xml.namespace.QName;
+import java.util.ArrayList;
+
+public class OperationModuleTest extends TestCase {
+ /**
+ * Confirm that an operation module a) doesn't cause any deployment problems, and
+ * b) correctly configures the AxisOperation.
+ *
+ * @throws Exception if there is a problem
+ */
+ public void testOperationModule() throws Exception {
+ ConfigurationContext configCtx =
+ ConfigurationContextFactory.createConfigurationContextFromFileSystem(
+ AbstractTestCase.basedir +
+ "/test-resources/deployment/AxisMessageTestRepo");
+ AxisConfiguration config = configCtx.getAxisConfiguration();
+ AxisService service = config.getService("MessagetestService");
+ assertNotNull("Couldn't find service", service);
+ AxisOperation operation = service.getOperation(new QName("echoString"));
+ assertNotNull("Couldn't find operation", operation);
+ ArrayList moduleRefs = operation.getModuleRefs();
+ assertEquals("Wrong # of modules", 1, moduleRefs.size());
+ String moduleName = (String)moduleRefs.get(0);
+ assertEquals("Wrong module name", "module1", moduleName);
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org