You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ews-dev@ws.apache.org by he...@apache.org on 2005/03/03 12:59:06 UTC
svn commit: r156033 -
webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2eeServerCLOptionParser.java
Author: hemapani
Date: Thu Mar 3 03:59:04 2005
New Revision: 156033
URL: http://svn.apache.org/viewcvs?view=rev&rev=156033
Log:
apply the patch by Ashutosh Shahi, for the Bug EWS-4, Latest changes in Axis 1.2 RC3 break ews build
Modified:
webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2eeServerCLOptionParser.java
Modified: webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2eeServerCLOptionParser.java
URL: http://svn.apache.org/viewcvs/webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2eeServerCLOptionParser.java?view=diff&r1=156032&r2=156033
==============================================================================
--- webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2eeServerCLOptionParser.java (original)
+++ webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2eeServerCLOptionParser.java Thu Mar 3 03:59:04 2005
@@ -1,12 +1,12 @@
/*
* 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.
@@ -27,6 +27,7 @@
import org.apache.axis.wsdl.fromJava.Emitter;
import org.apache.geronimo.ews.ws4j2ee.module.Module;
import org.apache.geronimo.ews.ws4j2ee.module.ModuleFactory;
+import org.apache.axis.encoding.TypeMappingRegistryImpl;
import java.io.File;
import java.util.HashMap;
@@ -500,14 +501,9 @@
break;
case TYPEMAPPING_OPT:
value = option.getArgument();
- if (value.equals("1.1")) {
- emitter.setDefaultTypeMapping(DefaultTypeMappingImpl.getSingleton());
- } else if (value.equals("1.2")) {
- emitter.setDefaultTypeMapping(DefaultSOAPEncodingTypeMappingImpl.create());
- } else {
- System.out.println(Messages.getMessage("j2wBadTypeMapping00"));
- status = false;
- }
+ TypeMappingRegistryImpl tmr = new TypeMappingRegistryImpl();
+ tmr.doRegisterFromVersion(value);
+ emitter.setTypeMappingRegistry(tmr);
break;
case SOAPACTION_OPT:
value = option.getArgument();
@@ -597,7 +593,9 @@
// }
// Default to SOAP 1.2 JAX-RPC mapping
- emitter.setDefaultTypeMapping(DefaultTypeMappingImpl.getSingleton());
+ TypeMappingRegistryImpl tmr = new TypeMappingRegistryImpl();
+ tmr.doRegisterFromVersion("1.2");
+ emitter.setTypeMappingRegistry(tmr);
return true; // a-OK
}
---------------------------------------------------------------------
To unsubscribe, e-mail: ews-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: ews-dev-help@ws.apache.org