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 sa...@apache.org on 2006/12/07 11:29:20 UTC
svn commit: r483407 - in /webservices/axis2/trunk/java/modules/tool:
axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/
axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/
axis2-eclip...
Author: sandakith
Date: Thu Dec 7 02:29:19 2006
New Revision: 483407
URL: http://svn.apache.org/viewvc?view=rev&rev=483407
Log:
Made chages to plugins to enable a full round of top-down and bottom-up to work on default settings.
1) Did chage the ServiceXMLcreator to add both MessageReceivers
2) The namespace generated by the codegenerator was wrong, removed the Classname from the namespace.
3) replace the types with xsd on target namespace defaultly generated
Modified:
webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/JavaWSDLOptionsPage.java
webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/NamespaceFinder.java
webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/ServiceXMLCreater.java
Modified: webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/JavaWSDLOptionsPage.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/JavaWSDLOptionsPage.java?view=diff&rev=483407&r1=483406&r2=483407
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/JavaWSDLOptionsPage.java (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/JavaWSDLOptionsPage.java Thu Dec 7 02:29:19 2006
@@ -73,7 +73,8 @@
targetNamespacePrefixText.setText(NamespaceFinder.getDefaultNamespacePrefix());
schemaTargetNamespacePrefixText.setText(NamespaceFinder.getDefaultSchemaNamespacePrefix());
- serviceNameText.setText(fullyQualifiedClassName.replaceAll("\\.","_"));
+ //serviceNameText.setText(fullyQualifiedClassName.replaceAll("\\.","_"));
+ serviceNameText.setText(NamespaceFinder.getServiceNameText(fullyQualifiedClassName));
}
/**
* @param pageName
Modified: webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/NamespaceFinder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/NamespaceFinder.java?view=diff&rev=483407&r1=483406&r2=483407
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/NamespaceFinder.java (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/NamespaceFinder.java Thu Dec 7 02:29:19 2006
@@ -19,18 +19,17 @@
public class NamespaceFinder {
private static String NS_PREFIX = "http://";
- private static String SCHEMA_NS_SUFFIX = "/types";
- private static String SCHEMA_NS_DEFAULT_PREFIX = "types";
+ private static String SCHEMA_NS_SUFFIX = "/xsd";
+ private static String SCHEMA_NS_DEFAULT_PREFIX = "xsd";
private static String NS_DEFAULT_PREFIX = "ns";
public static String getTargetNamespaceFromClass(String fullyQualifiedClassName){
//tokenize the className
String[] classNameParts = fullyQualifiedClassName.split("\\.");
- //add the strings in reverse order to make
- //the namespace
+ //add the strings in reverse order to make the namespace
String nsUri = "";
- for(int i=classNameParts.length-1;i>=0;i--){
+ for(int i=classNameParts.length-2;i>=0;i--){
nsUri = nsUri + classNameParts[i] + (i==0?"":".");
}
@@ -49,5 +48,10 @@
public static String getDefaultNamespacePrefix(){
return NS_DEFAULT_PREFIX;
+ }
+ public static String getServiceNameText(String fullyQualifiedClassName){
+ //tokenize the className
+ String[] classNameParts = fullyQualifiedClassName.split("\\.");
+ return classNameParts[classNameParts.length-1];
}
}
Modified: webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/ServiceXMLCreater.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/ServiceXMLCreater.java?view=diff&rev=483407&r1=483406&r2=483407
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/ServiceXMLCreater.java (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/ServiceXMLCreater.java Thu Dec 7 02:29:19 2006
@@ -42,19 +42,14 @@
public String toString() {
String serviceXML = "<service name=\"" + serviceName + "\" >\n" +
- "<description>\n" +
- "Please Type your service description here\n" +
- "</description>\n" +
- "<parameter name=\"ServiceClass\" locked=\"false\">" + serviceClass + "</parameter>\n";
- if (operations.size() > 0) {
- serviceXML = serviceXML + "<excludeOperations>\n";
- for (int i = 0; i < operations.size(); i++) {
- String s = (String) operations.get(i);
- String op = "<operation>" + s + "</operation>\n";
- serviceXML = serviceXML + op;
- }
- serviceXML = serviceXML + "</excludeOperations>\n";
- }
+ "\t<description>\n" +
+ "\t\tPlease Type your service description here\n" +
+ "\t</description>\n" +
+ "\t<messageReceivers>\n" +
+ "\t\t<messageReceiver mep=\"http://www.w3.org/2004/08/wsdl/in-only\" class=\"org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver\" />\n" +
+ "\t\t<messageReceiver mep=\"http://www.w3.org/2004/08/wsdl/in-out\" class=\"org.apache.axis2.rpc.receivers.RPCMessageReceiver\"/>\n" +
+ "\t</messageReceivers>\n" +
+ "\t<parameter name=\"ServiceClass\" locked=\"false\">" + serviceClass + "</parameter>\n" ;
serviceXML = serviceXML + "</service>\n";
return serviceXML;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org