You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by aj...@apache.org on 2006/05/04 20:24:35 UTC
svn commit: r399805 - in
/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen:
./ eclipse/ eclipse/ui/ eclipse/util/ resource/
Author: ajith
Date: Thu May 4 11:24:33 2006
New Revision: 399805
URL: http://svn.apache.org/viewcvs?rev=399805&view=rev
Log:
1. Adding the new option for the codegen - the server side interface generation option
Modified:
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/OptionsPage.java
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/util/SettingsConstants.java
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/util/UIConstants.java
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/resource/Codegen.properties
Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java?rev=399805&r1=399804&r2=399805&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java Thu May 4 11:24:33 2006
@@ -62,7 +62,8 @@
String packageName,
String selectedLanguage,
String outputLocation,
- String namespace2packageList
+ String namespace2packageList,
+ boolean isServerSideInterface
)
{
Map optionMap = new HashMap();
@@ -134,6 +135,11 @@
CommandLineOptionConstants.WSDL2JavaConstants.NAME_SPACE_TO_PACKAGE_OPTION, getStringArray(namespace2packageList)));
}
+ //ns2pkg mapping
+ if (isServerSideInterface){
+ optionMap.put(CommandLineOptionConstants.WSDL2JavaConstants.SERVER_SIDE_INTERFACE_OPTION, new CommandLineOption(
+ CommandLineOptionConstants.WSDL2JavaConstants.SERVER_SIDE_INTERFACE_OPTION, new String[0]));
+ }
return optionMap;
}
Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java?rev=399805&r1=399804&r2=399805&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java Thu May 4 11:24:33 2006
@@ -205,7 +205,9 @@
optionsPage.getPackageName(),
optionsPage.getSelectedLanguage(),
outputPage.getOutputLocation(),
- optionsPage.getNs2PkgMapping());
+ optionsPage.getNs2PkgMapping(),
+ optionsPage.getGenerateServerSideInterface());
+
CodeGenConfiguration codegenConfig = new CodeGenConfiguration(service, optionsMap);
//set the baseURI
codegenConfig.setBaseURI(generator.getBaseUri(wsdlSelectionPage.getFileName()));
Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/OptionsPage.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/OptionsPage.java?rev=399805&r1=399804&r2=399805&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/OptionsPage.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/OptionsPage.java Thu May 4 11:24:33 2006
@@ -98,6 +98,11 @@
* Checkbox to enable the generate all classes
*/
private Button generateAllCheckBoxButton;
+
+ /**
+ * check box for server side interface
+ */
+ private Button generateServerSideInterfaceCheckBoxButton;
private Combo databindingTypeCombo;
@@ -148,6 +153,7 @@
settings.put(PREF_COMBO_SERVICENAME_INDEX, 0);
settings.put(PREF_DATABINDER_INDEX, 0);
settings.put(PREF_GEN_ALL, false);
+ settings.put(PREF_GEN_SS_INTERFACE, false);
}
/*
@@ -319,7 +325,10 @@
}
});
// Server side check box
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+ gd.horizontalSpan = 3;
serverSideCheckBoxButton = new Button(container, SWT.CHECK);
+ serverSideCheckBoxButton.setLayoutData(gd);
serverSideCheckBoxButton.setText(CodegenWizardPlugin
.getResourceString("page2.serverside.caption"));
serverSideCheckBoxButton.setSelection(settings
@@ -372,6 +381,26 @@
}
});
+ //the server side interface option
+ generateServerSideInterfaceCheckBoxButton = new Button(container, SWT.CHECK);
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+ gd.horizontalSpan = 1;
+ generateServerSideInterfaceCheckBoxButton.setLayoutData(gd);
+ generateServerSideInterfaceCheckBoxButton.setSelection(settings
+ .getBoolean(PREF_GEN_SS_INTERFACE));
+ generateServerSideInterfaceCheckBoxButton.setText(CodegenWizardPlugin
+ .getResourceString("page2.ssInterface.caption"));
+ generateServerSideInterfaceCheckBoxButton.addSelectionListener(new SelectionListener() {
+ public void widgetSelected(SelectionEvent e) {
+ settings.put(PREF_GEN_SS_INTERFACE, generateServerSideInterfaceCheckBoxButton
+ .getSelection());
+ }
+
+ public void widgetDefaultSelected(SelectionEvent e) {
+ }
+ });
+
+
// Databinding
label = new Label(container, SWT.NULL);
label.setText(CodegenWizardPlugin
@@ -612,13 +641,15 @@
}
/**
- * Fill the combo with proper language names
+ * Fill the combo with proper databinding names
*
*/
private void fillDatabinderCombo() {
databindingTypeCombo.add(DATA_BINDING_ADB);
databindingTypeCombo.add(DATA_BINDING_XMLBEANS);
+ //databindingTypeCombo.add(DATA_BINDING_JIBX);
+ //databindingTypeCombo.add(DATA_BINDING_JAXME);
databindingTypeCombo.add(DATA_BINDING_NONE);
}
@@ -645,9 +676,11 @@
if (this.serverSideCheckBoxButton.getSelection()) {
this.serverXMLCheckBoxButton.setEnabled(true);
this.generateAllCheckBoxButton.setEnabled(true);
+ this.generateServerSideInterfaceCheckBoxButton.setEnabled(true);
} else {
this.serverXMLCheckBoxButton.setEnabled(false);
this.generateAllCheckBoxButton.setEnabled(false);
+ this.generateServerSideInterfaceCheckBoxButton.setEnabled(false);
}
}
@@ -772,6 +805,14 @@
}
+ /**
+ *
+ * @return
+ */
+ public boolean getGenerateServerSideInterface() {
+ return this.generateServerSideInterfaceCheckBoxButton.getSelection();
+ }
+
/**
*
* @return
Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/util/SettingsConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/util/SettingsConstants.java?rev=399805&r1=399804&r2=399805&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/util/SettingsConstants.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/util/SettingsConstants.java Thu May 4 11:24:33 2006
@@ -88,6 +88,7 @@
static final String PREF_DATABINDER_INDEX = "PREF_DATABINDER_INDEX";
static final String PREF_GEN_ALL = "PREF_GEN_ALL";
+ static final String PREF_GEN_SS_INTERFACE = "PREF_GEN_SERVERSIDE_INTERFACE";
// ##################################################################################
// Java source file selection page
Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/util/UIConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/util/UIConstants.java?rev=399805&r1=399804&r2=399805&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/util/UIConstants.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/util/UIConstants.java Thu May 4 11:24:33 2006
@@ -23,6 +23,8 @@
public static final String DATA_BINDING_NONE = "none" ;
public static final String DATA_BINDING_ADB = "adb" ;
public static final String DATA_BINDING_XMLBEANS = "xmlbeans" ;
+ public static final String DATA_BINDING_JIBX = "jibx" ;
+ public static final String DATA_BINDING_JAXME = "jaxme" ;
Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/resource/Codegen.properties
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/resource/Codegen.properties?rev=399805&r1=399804&r2=399805&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/resource/Codegen.properties (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/resource/Codegen.properties Thu May 4 11:24:33 2006
@@ -56,6 +56,7 @@
page2.serviceName.caption=Service Name
page2.portName.caption=Port Name
page2.genAll.caption=Generate Client code
+page2.ssInterface.caption=Generate an Interface for Skeleton
page2.wsdlNotFound.message=specified WSDL is not found!
page2.noports.message=No ports found in the specified service
#######################################################################