You are viewing a plain text version of this content. The canonical link for it is here.
Posted to muse-commits@ws.apache.org by da...@apache.org on 2007/05/09 16:51:38 UTC
svn commit: r536550 - in
/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools:
generator/synthesizer/ProxyClassSynthesizer.java
generator/synthesizer/ProxyInterfaceSynthesizer.java
inspector/ResourceInspector.java
Author: danj
Date: Wed May 9 07:51:37 2007
New Revision: 536550
URL: http://svn.apache.org/viewvc?view=rev&rev=536550
Log:
Fix for MUSE-221 (support for binaryBase64), contributed by Alberto Galdo of eUSA - Thanks!
Modified:
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ProxyClassSynthesizer.java
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ProxyInterfaceSynthesizer.java
webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/inspector/ResourceInspector.java
Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ProxyClassSynthesizer.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ProxyClassSynthesizer.java?view=diff&rev=536550&r1=536549&r2=536550
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ProxyClassSynthesizer.java (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ProxyClassSynthesizer.java Wed May 9 07:51:37 2007
@@ -29,7 +29,6 @@
import org.apache.muse.core.proxy.ProxyHandler;
import org.apache.muse.core.proxy.ReflectionProxyHandler;
-import org.apache.muse.tools.generator.util.ConfigurationData;
import org.apache.muse.tools.generator.util.ConfigurationDataDescriptor;
import org.apache.muse.tools.inspector.JavaMethod;
import org.apache.muse.tools.inspector.JavaProperty;
@@ -39,13 +38,6 @@
import org.w3c.dom.Document;
public class ProxyClassSynthesizer extends ProxyInterfaceSynthesizer {
- static ConfigurationDataDescriptor[] REQUIRED_PARAMETERS =
- new ConfigurationDataDescriptor[] {
- ConfigurationData.CAPABILITIES_MAP_LIST_CONFIGURATION,
- ConfigurationData.GENERATE_CUSTOM_HEADERS_CONFIGURATION,
- ConfigurationData.WSDL_DOCUMENT_LIST_CONFIGURATION
- };
-
StringBuffer _operationNamesCode;
StringBuffer _returnTypesCode;
StringBuffer _actionsCode;
@@ -318,12 +310,7 @@
}
private void updateReturnTypes(JavaMethod method) {
- Class type = method.getReturnType();
-
- if(type.isArray()) {
- type = ReflectUtils.getClassFromArrayClass(type);
- }
-
+ Class type = method.getReturnType();
_returnTypesCode.append(ReflectUtils.getShortName(type));
_returnTypesCode.append(".class");
_returnTypesCode.append(", ");
Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ProxyInterfaceSynthesizer.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ProxyInterfaceSynthesizer.java?view=diff&rev=536550&r1=536549&r2=536550
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ProxyInterfaceSynthesizer.java (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/generator/synthesizer/ProxyInterfaceSynthesizer.java Wed May 9 07:51:37 2007
@@ -177,11 +177,9 @@
clazz = WsResourceClient.class;
}
- if(clazz != null) {
- Set set = (Set)_clientCapabilitiesMap.get(clazz);
- if(set.contains(uri) || _ignoredCapabilitySet.contains(uri)) {
- needsGeneratedCode = false;
- }
+ Set set = (Set)_clientCapabilitiesMap.get(clazz);
+ if(set.contains(uri) || _ignoredCapabilitySet.contains(uri)) {
+ needsGeneratedCode = false;
}
return needsGeneratedCode;
Modified: webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/inspector/ResourceInspector.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/inspector/ResourceInspector.java?view=diff&rev=536550&r1=536549&r2=536550
==============================================================================
--- webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/inspector/ResourceInspector.java (original)
+++ webservices/muse/trunk/modules/muse-tools/src/org/apache/muse/tools/inspector/ResourceInspector.java Wed May 9 07:51:37 2007
@@ -134,9 +134,6 @@
public static final QName BOOLEAN_QNAME =
new QName(NAMESPACE_URI, "boolean", PREFIX);
- public static final QName BYTE_QNAME =
- new QName(NAMESPACE_URI, "byte", PREFIX);
-
public static final QName COMPLEX_TYPE_QNAME =
new QName(NAMESPACE_URI, "complexType", PREFIX);
@@ -220,7 +217,6 @@
_JAVA_TYPES.put(QNAME_QNAME, QName.class);
_JAVA_TYPES.put(BOOLEAN_QNAME, boolean.class);
_JAVA_TYPES.put(BASE_64_QNAME, byte[].class);
- _JAVA_TYPES.put(BYTE_QNAME, byte[].class);
_JAVA_TYPES.put(INT_QNAME, int.class);
_JAVA_TYPES.put(INTEGER_QNAME, int.class);
_JAVA_TYPES.put(SHORT_QNAME, short.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org