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 ch...@apache.org on 2006/01/28 07:37:52 UTC
svn commit: r373092 - in /webservices/axis2/trunk/java/modules:
codegen/src/org/apache/axis2/wsdl/template/java/
integration/test-resources/security/
integration/test/org/apache/axis2/security/
Author: chinthaka
Date: Fri Jan 27 22:37:22 2006
New Revision: 373092
URL: http://svn.apache.org/viewcvs?rev=373092&view=rev
Log:
Fixing the build break (At last !!!)
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.service.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.service.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.service.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.service.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.service.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.service.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.service.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.service.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.service.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/sST1.service.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.service.xml
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/InteropTestBase.java
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl?rev=373092&r1=373091&r2=373092&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl Fri Jan 27 22:37:22 2006
@@ -44,7 +44,7 @@
//creating the operations
org.apache.axis2.description.AxisOperation __operation;
- _operations = new org.apache.axis2.description.AxisOperation[<xsl:value-of select="count(method)"/>];
+ _operations = new org.apache.axis2.description.OutInAxisOperation[<xsl:value-of select="count(method)"/>];
<xsl:for-each select="method">
<xsl:choose>
<xsl:when test="@mep='http://www.w3.org/2004/08/wsdl/in-only'">
@@ -156,7 +156,7 @@
<xsl:for-each select="input/param[@location='header']">
// add the children only if the parameter is not null
if (<xsl:value-of select="@name"/>!=null){
- env.getHeader().addChild(toOM(<xsl:value-of select="@name"/>));
+ env.getHeader().addChild(toOM(<xsl:value-of select="@name"/>));
}
</xsl:for-each>
</xsl:when>
@@ -319,6 +319,14 @@
});
</xsl:otherwise>
</xsl:choose>
+
+ //org.apache.axis2.util.CallbackReceiver _callbackReceiver = null;
+ //if ( _operations[<xsl:value-of select="position()-1"/>].getMessageReceiver()==null && _operationClient.getOptions().isUseSeparateListener()) {
+ //_callbackReceiver = new org.apache.axis2.util.CallbackReceiver();
+ // _operations[<xsl:value-of select="position()-1"/>].setMessageReceiver(
+ // _callbackReceiver);
+ //}
+
//execute the operation client
_operationClient.execute(true);
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.service.xml?rev=373092&r1=373091&r2=373092&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.service.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.service.xml Fri Jan 27 22:37:22 2006
@@ -2,7 +2,7 @@
<parameter locked="false" name="ServiceClass">org.apache.axis2.oasis.ping.PingPortSkeleton</parameter>
<!--Mounting the method Ping-->
<operation name="Ping">
- <messageReceiver class="org.apache.axis2.oasis.ping.PingPortMessageReceiver"/>
+ <messageReceiver class="org.apache.axis2.oasis.ping.PingPortMessageReceiverInOut"/>
</operation>
<parameter name="InflowSecurity">
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.service.xml?rev=373092&r1=373091&r2=373092&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.service.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.service.xml Fri Jan 27 22:37:22 2006
@@ -2,7 +2,7 @@
<parameter locked="false" name="ServiceClass">org.apache.axis2.oasis.ping.PingPortSkeleton</parameter>
<!--Mounting the method Ping-->
<operation name="Ping">
- <messageReceiver class="org.apache.axis2.oasis.ping.PingPortMessageReceiver"/>
+ <messageReceiver class="org.apache.axis2.oasis.ping.PingPortMessageReceiverInOut"/>
</operation>
<parameter name="InflowSecurity">
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.service.xml?rev=373092&r1=373091&r2=373092&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.service.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.service.xml Fri Jan 27 22:37:22 2006
@@ -2,7 +2,7 @@
<parameter locked="false" name="ServiceClass">org.apache.axis2.oasis.ping.PingPortSkeleton</parameter>
<!--Mounting the method Ping-->
<operation name="Ping">
- <messageReceiver class="org.apache.axis2.oasis.ping.PingPortMessageReceiver"/>
+ <messageReceiver class="org.apache.axis2.oasis.ping.PingPortMessageReceiverInOut"/>
</operation>
<parameter name="InflowSecurity">
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.service.xml?rev=373092&r1=373091&r2=373092&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.service.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.service.xml Fri Jan 27 22:37:22 2006
@@ -2,7 +2,7 @@
<parameter locked="false" name="ServiceClass">org.apache.axis2.oasis.ping.PingPortSkeleton</parameter>
<!--Mounting the method Ping-->
<operation name="Ping">
- <messageReceiver class="org.apache.axis2.oasis.ping.PingPortMessageReceiver"/>
+ <messageReceiver class="org.apache.axis2.oasis.ping.PingPortMessageReceiverInOut"/>
</operation>
<parameter name="InflowSecurity">
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.service.xml?rev=373092&r1=373091&r2=373092&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.service.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.service.xml Fri Jan 27 22:37:22 2006
@@ -2,7 +2,7 @@
<parameter locked="false" name="ServiceClass">org.apache.axis2.oasis.ping.PingPortSkeleton</parameter>
<!--Mounting the method Ping-->
<operation name="Ping">
- <messageReceiver class="org.apache.axis2.oasis.ping.PingPortMessageReceiver"/>
+ <messageReceiver class="org.apache.axis2.oasis.ping.PingPortMessageReceiverInOut"/>
</operation>
<parameter name="InflowSecurity">
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.service.xml?rev=373092&r1=373091&r2=373092&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.service.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.service.xml Fri Jan 27 22:37:22 2006
@@ -2,7 +2,7 @@
<parameter locked="false" name="ServiceClass">org.apache.axis2.oasis.ping.PingPortSkeleton</parameter>
<!--Mounting the method Ping-->
<operation name="Ping">
- <messageReceiver class="org.apache.axis2.oasis.ping.PingPortMessageReceiver"/>
+ <messageReceiver class="org.apache.axis2.oasis.ping.PingPortMessageReceiverInOut"/>
</operation>
<parameter name="InflowSecurity">
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.service.xml?rev=373092&r1=373091&r2=373092&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.service.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.service.xml Fri Jan 27 22:37:22 2006
@@ -2,7 +2,7 @@
<parameter locked="false" name="ServiceClass">org.apache.axis2.oasis.ping.PingPortSkeleton</parameter>
<!--Mounting the method Ping-->
<operation name="Ping">
- <messageReceiver class="org.apache.axis2.oasis.ping.PingPortMessageReceiver"/>
+ <messageReceiver class="org.apache.axis2.oasis.ping.PingPortMessageReceiverInOut"/>
</operation>
<parameter name="InflowSecurity">
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.service.xml?rev=373092&r1=373091&r2=373092&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.service.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.service.xml Fri Jan 27 22:37:22 2006
@@ -2,7 +2,7 @@
<parameter locked="false" name="ServiceClass">org.apache.axis2.oasis.ping.PingPortSkeleton</parameter>
<!--Mounting the method Ping-->
<operation name="Ping">
- <messageReceiver class="org.apache.axis2.oasis.ping.PingPortMessageReceiver"/>
+ <messageReceiver class="org.apache.axis2.oasis.ping.PingPortMessageReceiverInOut"/>
</operation>
<parameter name="InflowSecurity">
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.service.xml?rev=373092&r1=373091&r2=373092&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.service.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.service.xml Fri Jan 27 22:37:22 2006
@@ -2,7 +2,7 @@
<parameter locked="false" name="ServiceClass">org.apache.axis2.oasis.ping.PingPortSkeleton</parameter>
<!--Mounting the method Ping-->
<operation name="Ping">
- <messageReceiver class="org.apache.axis2.oasis.ping.PingPortMessageReceiver"/>
+ <messageReceiver class="org.apache.axis2.oasis.ping.PingPortMessageReceiverInOut"/>
</operation>
<parameter name="InflowSecurity">
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/sST1.service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/sST1.service.xml?rev=373092&r1=373091&r2=373092&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/sST1.service.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/sST1.service.xml Fri Jan 27 22:37:22 2006
@@ -2,7 +2,7 @@
<parameter locked="false" name="ServiceClass">org.apache.axis2.oasis.ping.PingPortSkeleton</parameter>
<!--Mounting the method Ping-->
<operation name="Ping">
- <messageReceiver class="org.apache.axis2.oasis.ping.PingPortMessageReceiver"/>
+ <messageReceiver class="org.apache.axis2.oasis.ping.PingPortMessageReceiverInOut"/>
</operation>
<parameter name="InflowSecurity">
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.service.xml?rev=373092&r1=373091&r2=373092&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.service.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.service.xml Fri Jan 27 22:37:22 2006
@@ -2,7 +2,7 @@
<parameter locked="false" name="ServiceClass">org.apache.axis2.oasis.ping.PingPortSkeleton</parameter>
<!--Mounting the method Ping-->
<operation name="Ping">
- <messageReceiver class="org.apache.axis2.oasis.ping.PingPortMessageReceiver"/>
+ <messageReceiver class="org.apache.axis2.oasis.ping.PingPortMessageReceiverInOut"/>
</operation>
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/InteropTestBase.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/InteropTestBase.java?rev=373092&r1=373091&r2=373092&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/InteropTestBase.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/InteropTestBase.java Fri Jan 27 22:37:22 2006
@@ -29,96 +29,96 @@
public abstract class InteropTestBase extends TestCase {
- protected static final String SCENARIO1_SERVICE_REPOSITORY =
- "scenario1_service_repo";
+ protected static final String SCENARIO1_SERVICE_REPOSITORY =
+ "scenario1_service_repo";
- protected static final String SCENARIO1_CLIENT_REPOSITORY =
- "scenario1_client_repo";
+ protected static final String SCENARIO1_CLIENT_REPOSITORY =
+ "scenario1_client_repo";
- protected static final String SCENARIO2_SERVICE_REPOSITORY =
- "scenario2_service_repo";
+ protected static final String SCENARIO2_SERVICE_REPOSITORY =
+ "scenario2_service_repo";
- protected static final String SCENARIO2_CLIENT_REPOSITORY =
- "scenario2_client_repo";
+ protected static final String SCENARIO2_CLIENT_REPOSITORY =
+ "scenario2_client_repo";
- protected static final String SCENARIO2a_SERVICE_REPOSITORY =
- "scenario2a_service_repo";
+ protected static final String SCENARIO2a_SERVICE_REPOSITORY =
+ "scenario2a_service_repo";
- protected static final String SCENARIO2a_CLIENT_REPOSITORY =
- "scenario2a_client_repo";
+ protected static final String SCENARIO2a_CLIENT_REPOSITORY =
+ "scenario2a_client_repo";
- protected static final String SCENARIO3_SERVICE_REPOSITORY =
- "scenario3_service_repo";
+ protected static final String SCENARIO3_SERVICE_REPOSITORY =
+ "scenario3_service_repo";
- protected static final String SCENARIO3_CLIENT_REPOSITORY =
- "scenario3_client_repo";
+ protected static final String SCENARIO3_CLIENT_REPOSITORY =
+ "scenario3_client_repo";
- protected static final String SCENARIO4_SERVICE_REPOSITORY =
- "scenario4_service_repo";
+ protected static final String SCENARIO4_SERVICE_REPOSITORY =
+ "scenario4_service_repo";
- protected static final String SCENARIO4_CLIENT_REPOSITORY =
- "scenario4_client_repo";
+ protected static final String SCENARIO4_CLIENT_REPOSITORY =
+ "scenario4_client_repo";
- protected static final String SCENARIO5_SERVICE_REPOSITORY =
- "scenario5_service_repo";
+ protected static final String SCENARIO5_SERVICE_REPOSITORY =
+ "scenario5_service_repo";
- protected static final String SCENARIO5_CLIENT_REPOSITORY =
- "scenario5_client_repo";
+ protected static final String SCENARIO5_CLIENT_REPOSITORY =
+ "scenario5_client_repo";
- protected static final String SCENARIO6_SERVICE_REPOSITORY =
- "scenario6_service_repo";
+ protected static final String SCENARIO6_SERVICE_REPOSITORY =
+ "scenario6_service_repo";
- protected static final String SCENARIO6_CLIENT_REPOSITORY =
- "scenario6_client_repo";
+ protected static final String SCENARIO6_CLIENT_REPOSITORY =
+ "scenario6_client_repo";
- protected static final String SCENARIO7_SERVICE_REPOSITORY =
- "scenario7_service_repo";
+ protected static final String SCENARIO7_SERVICE_REPOSITORY =
+ "scenario7_service_repo";
- protected static final String SCENARIO7_CLIENT_REPOSITORY =
- "scenario7_client_repo";
+ protected static final String SCENARIO7_CLIENT_REPOSITORY =
+ "scenario7_client_repo";
- protected static final String SCENARIO_ST1_SERVICE_REPOSITORY =
- "scenarioST1_service_repo";
+ protected static final String SCENARIO_ST1_SERVICE_REPOSITORY =
+ "scenarioST1_service_repo";
- protected static final String SCENARIO_ST1_CLIENT_REPOSITORY =
- "scenarioST1_client_repo";
+ protected static final String SCENARIO_ST1_CLIENT_REPOSITORY =
+ "scenarioST1_client_repo";
- protected static final String SCENARIO_ST3_SERVICE_REPOSITORY =
- "scenarioST3_service_repo";
+ protected static final String SCENARIO_ST3_SERVICE_REPOSITORY =
+ "scenarioST3_service_repo";
- protected static final String SCENARIO_ST3_CLIENT_REPOSITORY =
- "scenarioST3_client_repo";
+ protected static final String SCENARIO_ST3_CLIENT_REPOSITORY =
+ "scenarioST3_client_repo";
- protected static final String SCENARIO_ST4_SERVICE_REPOSITORY =
- "scenarioST4_service_repo";
+ protected static final String SCENARIO_ST4_SERVICE_REPOSITORY =
+ "scenarioST4_service_repo";
- protected static final String SCENARIO_ST4_CLIENT_REPOSITORY =
- "scenarioST4_client_repo";
+ protected static final String SCENARIO_ST4_CLIENT_REPOSITORY =
+ "scenarioST4_client_repo";
- protected static final String MTOM_SEC_SERVICE_REPOSITORY =
- "mtom_sec_service_repo";
+ protected static final String MTOM_SEC_SERVICE_REPOSITORY =
+ "mtom_sec_service_repo";
- protected static final String MTOM_SEC_CLIENT_REPOSITORY =
- "mtom_sec_client_repo";
+ protected static final String MTOM_SEC_CLIENT_REPOSITORY =
+ "mtom_sec_client_repo";
- protected static final String COMPLETE_SERVICE_REPOSITORY =
- "complete_service_repo";
+ protected static final String COMPLETE_SERVICE_REPOSITORY =
+ "complete_service_repo";
- protected static final String COMPLETE_CLIENT_REPOSITORY =
- "complete_client_repo";
+ protected static final String COMPLETE_CLIENT_REPOSITORY =
+ "complete_client_repo";
+
+ protected static final String DEFAULT_CLIENT_REPOSITORY =
+ "default_security_client_repo";
- protected static final String DEFAULT_CLIENT_REPOSITORY =
- "default_security_client_repo";
-
protected static final String WSSE_NS = WSConstants.WSSE_NS;
-
+
protected static final String WSU_NS = WSConstants.WSU_NS;
-
- protected static final String ADDR_NS =
- AddressingConstants.Submission.WSA_NAMESPACE;
+
+ protected static final String ADDR_NS =
+ AddressingConstants.Submission.WSA_NAMESPACE;
private String targetEpr = "http://127.0.0.1:" +
- //5556 +
+// 5556 +
UtilServer.TESTING_PORT +
"/axis2/services/PingPort";
@@ -133,7 +133,7 @@
/**
* Each time an interop test is run the relevant service will be started
* with the given service repository
- *
+ * <p/>
* set up the service
*/
protected void setUp() throws Exception {
@@ -155,15 +155,15 @@
Class interopScenarioClientClass = Class
.forName("org.apache.axis2.security.InteropScenarioClient");
Constructor c = interopScenarioClientClass
- .getConstructor(new Class[] { boolean.class });
- Object clientObj = c.newInstance(new Object[] { this
+ .getConstructor(new Class[]{boolean.class});
+ Object clientObj = c.newInstance(new Object[]{this
.isUseSOAP12InStaticConfigTest() ? Boolean.TRUE
- : Boolean.FALSE });
+ : Boolean.FALSE});
Method m = interopScenarioClientClass.getMethod(
- "invokeWithStaticConfig", new Class[] { String.class,
- String.class });
- m.invoke(clientObj, new Object[] {
- Constants.TESTING_PATH + getClientRepo(), targetEpr });
+ "invokeWithStaticConfig", new Class[]{String.class,
+ String.class});
+ m.invoke(clientObj, new Object[]{
+ Constants.TESTING_PATH + getClientRepo(), targetEpr});
} catch (Exception e) {
e.printStackTrace();
@@ -177,18 +177,18 @@
Class interopScenarioClientClass = Class
.forName("org.apache.axis2.security.InteropScenarioClient");
Constructor c = interopScenarioClientClass
- .getConstructor(new Class[] { boolean.class });
- Object clientObj = c.newInstance(new Object[] { this
+ .getConstructor(new Class[]{boolean.class});
+ Object clientObj = c.newInstance(new Object[]{this
.isUseSOAP12InStaticConfigTest() ? Boolean.TRUE
- : Boolean.FALSE });
+ : Boolean.FALSE});
Method m = interopScenarioClientClass.getMethod(
- "invokeWithGivenConfig", new Class[] { String.class,
- String.class, OutflowConfiguration.class,
- InflowConfiguration.class });
- m.invoke(clientObj, new Object[] {
+ "invokeWithGivenConfig", new Class[]{String.class,
+ String.class, OutflowConfiguration.class,
+ InflowConfiguration.class});
+ m.invoke(clientObj, new Object[]{
Constants.TESTING_PATH + DEFAULT_CLIENT_REPOSITORY,
targetEpr, getOutflowConfiguration(),
- getInflowConfiguration() });
+ getInflowConfiguration()});
} catch (Exception e) {
e.printStackTrace();