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 th...@apache.org on 2006/10/19 15:56:14 UTC
svn commit: r465627 - in
/webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl:
WSDL2C.java codegen/emitter/CEmitter.java
codegen/extension/DefaultDatabindingExtension.java
databinding/CDefaultTypeMapper.java
Author: thilina
Date: Thu Oct 19 06:56:13 2006
New Revision: 465627
URL: http://svn.apache.org/viewvc?view=rev&rev=465627
Log:
fixing http://issues.apache.org/jira/browse/AXIS2C-365
Thanx Milinda..
Added:
webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/databinding/CDefaultTypeMapper.java (with props)
Modified:
webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/WSDL2C.java
webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/CEmitter.java
webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/DefaultDatabindingExtension.java
Modified: webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/WSDL2C.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/WSDL2C.java?view=diff&rev=465627&r1=465626&r2=465627
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/WSDL2C.java (original)
+++ webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/WSDL2C.java Thu Oct 19 06:56:13 2006
@@ -20,9 +20,10 @@
public static void main(String[] args) throws Exception {
String[] cargs = new String[args.length + 2];
System.arraycopy(args, 0, cargs, 0, args.length);
- cargs[args.length] = "-Dorg.apache.adb.properties=/org/apache/axis2/schema/c-schema-compile.properties";
- cargs[args.length + 1] = "-lc";
-
+ System.setProperty("org.apache.adb.properties","/org/apache/axis2/schema/c-schema-compile.properties");
+ cargs[args.length] = "-l";
+ cargs[args.length +1] = "c";
+
WSDL2Code.main(cargs);
}
}
Modified: webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/CEmitter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/CEmitter.java?view=diff&rev=465627&r1=465626&r2=465627
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/CEmitter.java (original)
+++ webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/CEmitter.java Thu Oct 19 06:56:13 2006
@@ -25,6 +25,7 @@
import org.apache.axis2.description.PolicyInclude;
import org.apache.axis2.description.AxisMessage;
import org.apache.neethi.Policy;
+import org.apache.axiom.om.OMFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -315,12 +316,14 @@
* @return Returns character removed string.
*/
protected String makeCClassName(String word) {
- //currently avoid only java key words
+ //currently avoid only java key words and service names with '.' characters
if (JavaUtils.isJavaKeyword(word)) {
return JavaUtils.makeNonJavaKeyword(word);
}
- return word;
+
+ String cClassName = word.replace(".", "_");
+ return cClassName;
}
Modified: webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/DefaultDatabindingExtension.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/DefaultDatabindingExtension.java?view=diff&rev=465627&r1=465626&r2=465627
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/DefaultDatabindingExtension.java (original)
+++ webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/DefaultDatabindingExtension.java Thu Oct 19 06:56:13 2006
@@ -20,6 +20,7 @@
import org.apache.axis2.wsdl.codegen.CodeGenerationException;
import org.apache.axis2.wsdl.databinding.DefaultTypeMapper;
import org.apache.axis2.wsdl.databinding.TypeMapper;
+import org.apache.axis2.wsdl.databinding.CDefaultTypeMapper;
import org.apache.axis2.wsdl.i18n.CodegenMessages;
public class DefaultDatabindingExtension extends AbstractDBProcessingExtension {
@@ -42,7 +43,15 @@
//registered for -d none, we have to generate a new type mapper
//that serves only the default types
if (mapper ==null){
- configuration.setTypeMapper(new DefaultTypeMapper());
+ if (configuration.getOutputLanguage() != null &&
+ !configuration.getOutputLanguage().trim().equals("") &&
+ configuration.getOutputLanguage().toLowerCase().equals("c")) {
+ configuration.setTypeMapper(new CDefaultTypeMapper());
+
+ } else {
+ configuration.setTypeMapper(new DefaultTypeMapper());
+ }
+
}
}
}
Added: webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/databinding/CDefaultTypeMapper.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/databinding/CDefaultTypeMapper.java?view=auto&rev=465627
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/databinding/CDefaultTypeMapper.java (added)
+++ webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/databinding/CDefaultTypeMapper.java Thu Oct 19 06:56:13 2006
@@ -0,0 +1,41 @@
+/*
+ * 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.wsdl.databinding;
+
+import javax.xml.namespace.QName;
+
+public class CDefaultTypeMapper extends TypeMappingAdapter {
+ private String defaultStructName = "axiom_node_t*";
+ public CDefaultTypeMapper() {
+ }
+
+ /**
+ * Gets the type mapping name.
+ * always returns the default mapping
+ *
+ * @see TypeMapper#getTypeMappingName(javax.xml.namespace.QName)
+ */
+ public String getTypeMappingName(QName qname) {
+
+ if ((qname != null)) {
+ return defaultStructName;
+ }else{
+ return null;
+ }
+
+ }
+}
Propchange: webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/databinding/CDefaultTypeMapper.java
------------------------------------------------------------------------------
svn:executable = *
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org