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 gd...@apache.org on 2005/07/11 19:49:08 UTC
svn commit: r210165 [12/20] - in /webservices/axis/trunk/java/modules:
addressing/src/org/apache/axis2/handlers/addressing/
addressing/test/org/apache/axis2/handlers/addressing/
addressing/test/org/apache/axis2/handlers/util/ core/src/org/apache/axis2/...
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/control/Controller.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/control/Controller.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/control/Controller.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/control/Controller.java Mon Jul 11 10:48:55 2005
@@ -34,14 +34,19 @@
public ArrayList getMethodList(WizardBean bean) throws ProcessException {
ArrayList returnList = null;
try {
- returnList = new ClassFileHandler().getMethodNamesFromClass(bean.getPage2bean().getAutomaticClassName(),
- bean.getPage1bean().getFileLocation());
+ returnList =
+ new ClassFileHandler().getMethodNamesFromClass(
+ bean.getPage2bean().getAutomaticClassName(),
+ bean.getPage1bean().getFileLocation());
} catch (IOException e) {
- throw new ProcessException("IO Error, The class file location may be faulty!", e);
+ throw new ProcessException(
+ "IO Error, The class file location may be faulty!", e);
} catch (ClassNotFoundException e) {
- throw new ProcessException(" The specified class does not exist!!!");
+ throw new ProcessException(
+ " The specified class does not exist!!!");
} catch (Exception e) {
- throw new ProcessException("Unknown Error! See whether all parameters are available");
+ throw new ProcessException(
+ "Unknown Error! See whether all parameters are available");
}
return returnList;
}
@@ -62,26 +67,32 @@
//see if the class file location is valid
classFileFolder = new File(page1Bean.getFileLocation());
if (!classFileFolder.exists()) {
- throw new ProcessException("Specified Class file location is empty!!");
+ throw new ProcessException(
+ "Specified Class file location is empty!!");
}
if (!classFileFolder.isDirectory()) {
- throw new ProcessException("The class file location must be a folder!");
+ throw new ProcessException(
+ "The class file location must be a folder!");
}
//see if the service.xml file is valid
if (page2Bean.isManual()) {
serviceFile = new File(page2Bean.getManualFileName());
if (!serviceFile.exists()) {
- throw new ProcessException("Specified Service XML file is missing!");
+ throw new ProcessException(
+ "Specified Service XML file is missing!");
}
} else {
ArrayList methodList = page2Bean.getSelectedMethodNames();
if (methodList.isEmpty()) {
- throw new ProcessException("There are no methods selected to generate the service!!");
+ throw new ProcessException(
+ "There are no methods selected to generate the service!!");
}
- serviceFile = new ServiceFileCreator().createServiceFile(page2Bean.getProviderClassName(),
- page2Bean.getAutomaticClassName(),
- page2Bean.getSelectedMethodNames());//create the file here
+ serviceFile =
+ new ServiceFileCreator().createServiceFile(
+ page2Bean.getProviderClassName(),
+ page2Bean.getAutomaticClassName(),
+ page2Bean.getSelectedMethodNames());//create the file here
isServiceCreated = true;
}
@@ -104,7 +115,9 @@
new FileCopier().copyFiles(serviceFile, metaInfFolder);
//jar the temp directory. the output folder will be created if missing
- new JarFileWriter().writeJarFile(outputFolder, outputFileName, tempFileFolder);
+ new JarFileWriter().writeJarFile(outputFolder,
+ outputFileName,
+ tempFileFolder);
} catch (Exception e) {
throw new ProcessException(e);
} finally {
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/plugin/ServiceArchiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/plugin/ServiceArchiver.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/plugin/ServiceArchiver.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/plugin/ServiceArchiver.java Mon Jul 11 10:48:55 2005
@@ -39,7 +39,9 @@
super();
plugin = this;
try {
- resourceBundle = ResourceBundle.getBundle("org.apache.axis.tool.service.resource.ServiceResources");
+ resourceBundle =
+ ResourceBundle.getBundle(
+ "org.apache.axis.tool.service.resource.ServiceResources");
} catch (MissingResourceException x) {
resourceBundle = null;
}
@@ -88,7 +90,9 @@
public static ImageDescriptor getWizardImageDescriptor() {
if (wizardImageDescriptor == null) {
- wizardImageDescriptor = ServiceArchiver.imageDescriptorFromPlugin("Axis_Service_Archiver", "icons/asf-feather.gif");
+ wizardImageDescriptor =
+ ServiceArchiver.imageDescriptorFromPlugin(
+ "Axis_Service_Archiver", "icons/asf-feather.gif");
}
return wizardImageDescriptor;
}
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/WizardPane1.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/WizardPane1.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/WizardPane1.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/WizardPane1.java Mon Jul 11 10:48:55 2005
@@ -39,7 +39,8 @@
public WizardPane1() {
super("page1");
this.setTitle(ServiceArchiver.getResourceString("page1.title"));
- this.setDescription(ServiceArchiver.getResourceString("page1.welcometext"));
+ this.setDescription(
+ ServiceArchiver.getResourceString("page1.welcometext"));
this.setImageDescriptor(ServiceArchiver.getWizardImageDescriptor());
}
@@ -54,7 +55,8 @@
container.setLayout(layout);
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
Label lable = new Label(container, SWT.NULL);
- lable.setText(ServiceArchiver.getResourceString("page1.fileLocationLabel"));
+ lable.setText(
+ ServiceArchiver.getResourceString("page1.fileLocationLabel"));
classFileLocationText = new Text(container, SWT.BORDER);
classFileLocationText.setLayoutData(gd);
@@ -65,7 +67,8 @@
});
browseButton = new Button(container, SWT.PUSH);
- browseButton.setText(ServiceArchiver.getResourceString("general.browse"));
+ browseButton.setText(
+ ServiceArchiver.getResourceString("general.browse"));
browseButton.addMouseListener(new MouseAdapter() {
public void mouseUp(MouseEvent e) {
handleBrowse();
@@ -79,7 +82,8 @@
private void handleBrowse() {
DirectoryDialog dirDialog = new DirectoryDialog(this.getShell());
- dirDialog.setMessage(ServiceArchiver.getResourceString("page1.filedialogTitle"));
+ dirDialog.setMessage(
+ ServiceArchiver.getResourceString("page1.filedialogTitle"));
String returnText = dirDialog.open();
if (returnText != null) {
this.classFileLocationText.setText(returnText);
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/WizardPane2.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/WizardPane2.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/WizardPane2.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/WizardPane2.java Mon Jul 11 10:48:55 2005
@@ -37,7 +37,8 @@
public WizardPane2() {
super("page2");
this.setTitle(ServiceArchiver.getResourceString("page2.title"));
- this.setDescription(ServiceArchiver.getResourceString("page2.welcometext"));
+ this.setDescription(
+ ServiceArchiver.getResourceString("page2.welcometext"));
this.setImageDescriptor(ServiceArchiver.getWizardImageDescriptor());
}
@@ -51,7 +52,9 @@
container.setLayout(layout);
manualSelectionLabel = new Label(container, SWT.NULL);
- manualSelectionLabel.setText(ServiceArchiver.getResourceString("page2.selectservicexml.caption"));
+ manualSelectionLabel.setText(
+ ServiceArchiver.getResourceString(
+ "page2.selectservicexml.caption"));
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
serviceXMLText = new Text(container, SWT.BORDER);
@@ -63,7 +66,8 @@
});
browseButton = new Button(container, SWT.PUSH);
- browseButton.setText(ServiceArchiver.getResourceString("general.browse"));
+ browseButton.setText(
+ ServiceArchiver.getResourceString("general.browse"));
browseButton.addMouseListener(new MouseAdapter() {
public void mouseUp(MouseEvent e) {
handleBrowse();
@@ -74,7 +78,8 @@
gd.horizontalSpan = 2;
selectAutoFileGenerationCheckBox = new Button(container, SWT.CHECK);
selectAutoFileGenerationCheckBox.setLayoutData(gd);
- selectAutoFileGenerationCheckBox.setText(ServiceArchiver.getResourceString("page2.generateauto.caption"));
+ selectAutoFileGenerationCheckBox.setText(
+ ServiceArchiver.getResourceString("page2.generateauto.caption"));
selectAutoFileGenerationCheckBox.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
handleSelection();
@@ -122,9 +127,13 @@
private void handleModify() {
String serviceXMLString = serviceXMLText.getText().trim().toLowerCase();
if (serviceXMLString.equals("")) {
- this.updateMessage(ServiceArchiver.getResourceString("page2.error.servicenameempty"));
+ this.updateMessage(
+ ServiceArchiver.getResourceString(
+ "page2.error.servicenameempty"));
} else if (!serviceXMLString.endsWith("service.xml")) {
- this.updateMessage(ServiceArchiver.getResourceString("page2.error.servicenamewrong"));
+ this.updateMessage(
+ ServiceArchiver.getResourceString(
+ "page2.error.servicenamewrong"));
} else {
this.updateMessage(null);
}
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/WizardPane3.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/WizardPane3.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/WizardPane3.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/WizardPane3.java Mon Jul 11 10:48:55 2005
@@ -29,7 +29,9 @@
public WizardPane3() {
super("page3");
this.setTitle(ServiceArchiver.getResourceString("page2.title"));
- this.setDescription(ServiceArchiver.getResourceString("Generate the service XML file"));
+ this.setDescription(
+ ServiceArchiver.getResourceString(
+ "Generate the service XML file"));
this.setImageDescriptor(ServiceArchiver.getWizardImageDescriptor());
}
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/WizardPane4.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/WizardPane4.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/WizardPane4.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/WizardPane4.java Mon Jul 11 10:48:55 2005
@@ -36,7 +36,8 @@
public WizardPane4() {
super("Page4");
this.setTitle(ServiceArchiver.getResourceString("page4.title"));
- this.setDescription(ServiceArchiver.getResourceString("page4.welcometext"));
+ this.setDescription(
+ ServiceArchiver.getResourceString("page4.welcometext"));
this.setImageDescriptor(ServiceArchiver.getWizardImageDescriptor());
}
@@ -54,7 +55,8 @@
gd.grabExcessHorizontalSpace = true;
Label lable = new Label(container, SWT.NULL);
- lable.setText(ServiceArchiver.getResourceString("page4.outputlocation.label"));
+ lable.setText(
+ ServiceArchiver.getResourceString("page4.outputlocation.label"));
outputFileLocationTextBox = new Text(container, SWT.BORDER);
outputFileLocationTextBox.setLayoutData(gd);
@@ -67,7 +69,8 @@
gd = new GridData(GridData.HORIZONTAL_ALIGN_END);
browseButton = new Button(container, SWT.PUSH);
- browseButton.setText(ServiceArchiver.getResourceString("general.browse"));
+ browseButton.setText(
+ ServiceArchiver.getResourceString("general.browse"));
browseButton.setLayoutData(gd);
browseButton.addMouseListener(new MouseAdapter() {
public void mouseUp(MouseEvent e) {
@@ -76,7 +79,8 @@
});
lable = new Label(container, SWT.NULL);
- lable.setText(ServiceArchiver.getResourceString("page4.outputname.label"));
+ lable.setText(
+ ServiceArchiver.getResourceString("page4.outputname.label"));
gd = new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalSpan = 2;
@@ -98,7 +102,8 @@
private void handleBrowse() {
DirectoryDialog dirDialog = new DirectoryDialog(this.getShell());
- dirDialog.setMessage(ServiceArchiver.getResourceString("page4.dirdialog.caption"));
+ dirDialog.setMessage(
+ ServiceArchiver.getResourceString("page4.dirdialog.caption"));
String returnText = dirDialog.open();
if (returnText != null) {
this.outputFileLocationTextBox.setText(returnText);
@@ -111,7 +116,8 @@
String outputFilenameText = outputFileNameTextbox.getText();
if (outputLocationText == null || outputLocationText.trim().equals("")) {
this.updateMessage("");
- } else if (outputLocationText == null || outputLocationText.trim().equals("")) {
+ } else if (outputLocationText == null ||
+ outputLocationText.trim().equals("")) {
this.updateMessage("");
} else {
updateMessage(null);
@@ -125,7 +131,8 @@
public Page3Bean getBean() {
Page3Bean pageBean = new Page3Bean();
- pageBean.setOutputFolderName(this.outputFileLocationTextBox.getText().trim());
+ pageBean.setOutputFolderName(
+ this.outputFileLocationTextBox.getText().trim());
pageBean.setOutputFileName(this.outputFileNameTextbox.getText().trim());
return pageBean;
}
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/swing/ui/MainWindow.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/swing/ui/MainWindow.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/swing/ui/MainWindow.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/swing/ui/MainWindow.java Mon Jul 11 10:48:55 2005
@@ -52,9 +52,14 @@
private void init() {
this.getContentPane().setLayout(null);
- this.setBounds((int) Toolkit.getDefaultToolkit().getScreenSize().getWidth() / 2 - 400 / 2,
- (int) Toolkit.getDefaultToolkit().getScreenSize().getHeight() / 2 - 360 / 2,
- 400, 360);
+ this.setBounds(
+ (int) Toolkit.getDefaultToolkit().getScreenSize().getWidth() /
+ 2 -
+ 400 / 2,
+ (int) Toolkit.getDefaultToolkit().getScreenSize().getHeight() /
+ 2 -
+ 360 / 2,
+ 400, 360);
this.setResizable(false);
this.setDefaultCloseOperation(EXIT_ON_CLOSE);
@@ -79,7 +84,10 @@
//
this.nextButton = new JButton("Next");
this.getContentPane().add(this.nextButton);
- this.nextButton.setBounds(hgap + bWidth + hgap, 300 + vgap, bWidth, bHeight);
+ this.nextButton.setBounds(hgap + bWidth + hgap,
+ 300 + vgap,
+ bWidth,
+ bHeight);
this.nextButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
moveForward();
@@ -88,7 +96,10 @@
this.cancelButton = new JButton("Close");
this.getContentPane().add(this.cancelButton);
- this.cancelButton.setBounds(hgap + (bWidth + hgap) * 2, 300 + vgap, bWidth, bHeight);
+ this.cancelButton.setBounds(hgap + (bWidth + hgap) * 2,
+ 300 + vgap,
+ bWidth,
+ bHeight);
this.cancelButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
if (confirmExit())
@@ -98,7 +109,10 @@
this.finishButton = new JButton("Finish");
this.getContentPane().add(this.finishButton);
- this.finishButton.setBounds(hgap + (bWidth + hgap) * 3, 300 + vgap, bWidth, bHeight);
+ this.finishButton.setBounds(hgap + (bWidth + hgap) * 3,
+ 300 + vgap,
+ bWidth,
+ bHeight);
this.finishButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
processFinish();
@@ -111,24 +125,33 @@
}
private void showErrorMessage() {
- JOptionPane.showMessageDialog(this, "Required Value Not set!!!", "Error", JOptionPane.ERROR_MESSAGE);
+ JOptionPane.showMessageDialog(this,
+ "Required Value Not set!!!",
+ "Error",
+ JOptionPane.ERROR_MESSAGE);
}
private void showErrorMessage(String message) {
- JOptionPane.showMessageDialog(this, message, "Error", JOptionPane.ERROR_MESSAGE);
+ JOptionPane.showMessageDialog(this,
+ message,
+ "Error",
+ JOptionPane.ERROR_MESSAGE);
}
private void showSuccessMessage(String message) {
- JOptionPane.showMessageDialog(this, message, "Error", JOptionPane.INFORMATION_MESSAGE);
+ JOptionPane.showMessageDialog(this,
+ message,
+ "Error",
+ JOptionPane.INFORMATION_MESSAGE);
}
private boolean confirmExit() {
int returnType = JOptionPane.showOptionDialog(this,
- "Are you sure you want to exit?",
- "Exit service builder",
- JOptionPane.YES_NO_OPTION,
- JOptionPane.WARNING_MESSAGE,
- null, null, null);
+ "Are you sure you want to exit?",
+ "Exit service builder",
+ JOptionPane.YES_NO_OPTION,
+ JOptionPane.WARNING_MESSAGE,
+ null, null, null);
return (returnType == JOptionPane.YES_OPTION);
}
@@ -150,13 +173,22 @@
private void moveToPage(int page) {
switch (page) {
case PAGE_1:
- processPage(new WizardPane1(this.wizardBean, this), false, true, false);
+ processPage(new WizardPane1(this.wizardBean, this),
+ false,
+ true,
+ false);
break;
case PAGE_2:
- processPage(new WizardPane2(this.wizardBean, this), true, true, false);
+ processPage(new WizardPane2(this.wizardBean, this),
+ true,
+ true,
+ false);
break;
case PAGE_3:
- processPage(new WizardPane3(this.wizardBean, this), true, false, true);
+ processPage(new WizardPane3(this.wizardBean, this),
+ true,
+ false,
+ true);
break;
default:
return;
@@ -178,7 +210,10 @@
}
}
- private void processPage(WizardPane pane, boolean prevButtonState, boolean nextButtonState, boolean finishButtonState) {
+ private void processPage(WizardPane pane,
+ boolean prevButtonState,
+ boolean nextButtonState,
+ boolean finishButtonState) {
this.wizardPaneContainer.removeAll();
currentWizardPane = pane;
this.wizardPaneContainer.add(pane);
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/swing/ui/WizardPane.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/swing/ui/WizardPane.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/swing/ui/WizardPane.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/swing/ui/WizardPane.java Mon Jul 11 10:48:55 2005
@@ -63,7 +63,10 @@
public abstract boolean validateValues();
protected void showErrorMessage(String message) {
- JOptionPane.showMessageDialog(this, message, "Error", JOptionPane.ERROR_MESSAGE);
+ JOptionPane.showMessageDialog(this,
+ message,
+ "Error",
+ JOptionPane.ERROR_MESSAGE);
}
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/swing/ui/WizardPane1.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/swing/ui/WizardPane1.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/swing/ui/WizardPane1.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/swing/ui/WizardPane1.java Mon Jul 11 10:48:55 2005
@@ -61,17 +61,24 @@
this.setSize(width, height);
initDescription("Welcome to the new AXIS Service packager Wizard Interface.\n\n " +
- "Insert the location for the class files here.This should be a folder with \n" +
- " the compiled classes");
+ "Insert the location for the class files here.This should be a folder with \n" +
+ " the compiled classes");
this.classFileLocationLabel = new JLabel("class file location");
this.add(this.classFileLocationLabel);
- this.classFileLocationLabel.setBounds(hgap, descHeight, Constants.UIConstants.LABEL_WIDTH, Constants.UIConstants.GENERAL_COMP_HEIGHT);
+ this.classFileLocationLabel.setBounds(hgap,
+ descHeight,
+ Constants.UIConstants.LABEL_WIDTH,
+ Constants.UIConstants.GENERAL_COMP_HEIGHT);
this.classFileLocationTextBox = new JTextField();
this.add(this.classFileLocationTextBox);
- this.classFileLocationTextBox.setBounds(Constants.UIConstants.LABEL_WIDTH + 2 * hgap, descHeight, Constants.UIConstants.TEXT_BOX_WIDTH, Constants.UIConstants.GENERAL_COMP_HEIGHT);
+ this.classFileLocationTextBox.setBounds(
+ Constants.UIConstants.LABEL_WIDTH + 2 * hgap,
+ descHeight,
+ Constants.UIConstants.TEXT_BOX_WIDTH,
+ Constants.UIConstants.GENERAL_COMP_HEIGHT);
this.classFileLocationTextBox.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
handleTextBoxChange();
@@ -91,7 +98,12 @@
this.browseButton = new JButton(".");
this.add(this.browseButton);
- this.browseButton.setBounds(Constants.UIConstants.LABEL_WIDTH + 2 * hgap + Constants.UIConstants.TEXT_BOX_WIDTH, descHeight, Constants.UIConstants.BROWSE_BUTTON_WIDTH, Constants.UIConstants.GENERAL_COMP_HEIGHT);
+ this.browseButton.setBounds(
+ Constants.UIConstants.LABEL_WIDTH + 2 * hgap +
+ Constants.UIConstants.TEXT_BOX_WIDTH,
+ descHeight,
+ Constants.UIConstants.BROWSE_BUTTON_WIDTH,
+ Constants.UIConstants.GENERAL_COMP_HEIGHT);
this.browseButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
classFileLocationTextBox.setText(browseForAFolder());
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/swing/ui/WizardPane2.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/swing/ui/WizardPane2.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/swing/ui/WizardPane2.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/swing/ui/WizardPane2.java Mon Jul 11 10:48:55 2005
@@ -93,14 +93,18 @@
this.setSize(width, height);
initDescription("\n Select either the service xml file or the class that you want to \n " +
- " expose as the service to auto generate a service.xml. \n " +
- " Only the class files that are in the previously selected location can\n" +
- " be laded from here");
+ " expose as the service to auto generate a service.xml. \n " +
+ " Only the class files that are in the previously selected location can\n" +
+ " be laded from here");
ButtonGroup group = new ButtonGroup();
- this.selectManualFileRadioButton = new JRadioButton("Select a file manually");
- this.selectManualFileRadioButton.setBounds(hgap, descHeight, Constants.UIConstants.RADIO_BUTTON_WIDTH, Constants.UIConstants.GENERAL_COMP_HEIGHT);
+ this.selectManualFileRadioButton =
+ new JRadioButton("Select a file manually");
+ this.selectManualFileRadioButton.setBounds(hgap,
+ descHeight,
+ Constants.UIConstants.RADIO_BUTTON_WIDTH,
+ Constants.UIConstants.GENERAL_COMP_HEIGHT);
this.add(this.selectManualFileRadioButton);
group.add(selectManualFileRadioButton);
this.selectManualFileRadioButton.addActionListener(new ActionListener() {
@@ -108,8 +112,12 @@
changeSelectionScreen();
}
});
- this.createAutomaticFileRadioButton = new JRadioButton("Create a file automatically");
- this.createAutomaticFileRadioButton.setBounds(hgap, descHeight + vgap + Constants.UIConstants.GENERAL_COMP_HEIGHT, Constants.UIConstants.RADIO_BUTTON_WIDTH, Constants.UIConstants.GENERAL_COMP_HEIGHT);
+ this.createAutomaticFileRadioButton =
+ new JRadioButton("Create a file automatically");
+ this.createAutomaticFileRadioButton.setBounds(hgap,
+ descHeight + vgap + Constants.UIConstants.GENERAL_COMP_HEIGHT,
+ Constants.UIConstants.RADIO_BUTTON_WIDTH,
+ Constants.UIConstants.GENERAL_COMP_HEIGHT);
this.add(this.createAutomaticFileRadioButton);
group.add(createAutomaticFileRadioButton);
this.createAutomaticFileRadioButton.addActionListener(new ActionListener() {
@@ -120,7 +128,11 @@
this.selectionPanel = new JPanel();
this.selectionPanel.setLayout(null);
- this.selectionPanel.setBounds(0, descHeight + 2 * Constants.UIConstants.GENERAL_COMP_HEIGHT + 2 * vgap, width, 100);
+ this.selectionPanel.setBounds(0,
+ descHeight + 2 * Constants.UIConstants.GENERAL_COMP_HEIGHT +
+ 2 * vgap,
+ width,
+ 100);
this.add(this.selectionPanel);
//select manual option by default
@@ -169,7 +181,8 @@
public ManualSelectionPanel(boolean loadVals) {
init();
if (loadVals) {
- this.serverXMLFileLocationTextBox.setText(myBean.getManualFileName());
+ this.serverXMLFileLocationTextBox.setText(
+ myBean.getManualFileName());
}
}
@@ -179,11 +192,18 @@
this.serverXMLFileLocationLabel = new JLabel("Service File");
this.add(this.serverXMLFileLocationLabel);
- this.serverXMLFileLocationLabel.setBounds(hgap, vgap, Constants.UIConstants.LABEL_WIDTH, Constants.UIConstants.GENERAL_COMP_HEIGHT);
+ this.serverXMLFileLocationLabel.setBounds(hgap,
+ vgap,
+ Constants.UIConstants.LABEL_WIDTH,
+ Constants.UIConstants.GENERAL_COMP_HEIGHT);
this.serverXMLFileLocationTextBox = new JTextField();
this.add(this.serverXMLFileLocationTextBox);
- this.serverXMLFileLocationTextBox.setBounds(Constants.UIConstants.LABEL_WIDTH + 2 * hgap, vgap, Constants.UIConstants.TEXT_BOX_WIDTH, Constants.UIConstants.GENERAL_COMP_HEIGHT);
+ this.serverXMLFileLocationTextBox.setBounds(
+ Constants.UIConstants.LABEL_WIDTH + 2 * hgap,
+ vgap,
+ Constants.UIConstants.TEXT_BOX_WIDTH,
+ Constants.UIConstants.GENERAL_COMP_HEIGHT);
this.serverXMLFileLocationTextBox.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
setOutFileName();
@@ -203,7 +223,12 @@
this.browseButton = new JButton(".");
this.add(this.browseButton);
- this.browseButton.setBounds(Constants.UIConstants.LABEL_WIDTH + 2 * hgap + Constants.UIConstants.TEXT_BOX_WIDTH, vgap, Constants.UIConstants.BROWSE_BUTTON_WIDTH, Constants.UIConstants.GENERAL_COMP_HEIGHT);
+ this.browseButton.setBounds(
+ Constants.UIConstants.LABEL_WIDTH + 2 * hgap +
+ Constants.UIConstants.TEXT_BOX_WIDTH,
+ vgap,
+ Constants.UIConstants.BROWSE_BUTTON_WIDTH,
+ Constants.UIConstants.GENERAL_COMP_HEIGHT);
this.browseButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
serverXMLFileLocationTextBox.setText(browseForAFile("xml"));
@@ -234,8 +259,10 @@
public AutomaticSelectionPanel(boolean loadVals) {
init();
if (loadVals) {
- this.classFileNameTextBox.setText(myBean.getAutomaticClassName());
- this.providerClassNameTextBox.setText(myBean.getProviderClassName());
+ this.classFileNameTextBox.setText(
+ myBean.getAutomaticClassName());
+ this.providerClassNameTextBox.setText(
+ myBean.getProviderClassName());
}
}
@@ -245,11 +272,18 @@
this.classFileListLable = new JLabel("Class Name");
this.add(this.classFileListLable);
- this.classFileListLable.setBounds(hgap, vgap, Constants.UIConstants.LABEL_WIDTH, Constants.UIConstants.GENERAL_COMP_HEIGHT);
+ this.classFileListLable.setBounds(hgap,
+ vgap,
+ Constants.UIConstants.LABEL_WIDTH,
+ Constants.UIConstants.GENERAL_COMP_HEIGHT);
this.classFileNameTextBox = new JTextField();
this.add(this.classFileNameTextBox);
- this.classFileNameTextBox.setBounds(Constants.UIConstants.LABEL_WIDTH + 2 * hgap, vgap, Constants.UIConstants.TEXT_BOX_WIDTH, Constants.UIConstants.GENERAL_COMP_HEIGHT);
+ this.classFileNameTextBox.setBounds(
+ Constants.UIConstants.LABEL_WIDTH + 2 * hgap,
+ vgap,
+ Constants.UIConstants.TEXT_BOX_WIDTH,
+ Constants.UIConstants.GENERAL_COMP_HEIGHT);
this.classFileNameTextBox.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
setClassName();
@@ -269,11 +303,18 @@
this.providerClassLable = new JLabel("Provider Class Name");
this.add(this.providerClassLable);
- this.providerClassLable.setBounds(hgap, (Constants.UIConstants.GENERAL_COMP_HEIGHT + vgap), Constants.UIConstants.LABEL_WIDTH, Constants.UIConstants.GENERAL_COMP_HEIGHT);
+ this.providerClassLable.setBounds(hgap,
+ (Constants.UIConstants.GENERAL_COMP_HEIGHT + vgap),
+ Constants.UIConstants.LABEL_WIDTH,
+ Constants.UIConstants.GENERAL_COMP_HEIGHT);
this.providerClassNameTextBox = new JTextField();
this.add(this.providerClassNameTextBox);
- this.providerClassNameTextBox.setBounds(Constants.UIConstants.LABEL_WIDTH + 2 * hgap, (Constants.UIConstants.GENERAL_COMP_HEIGHT + vgap * 2), Constants.UIConstants.TEXT_BOX_WIDTH, Constants.UIConstants.GENERAL_COMP_HEIGHT);
+ this.providerClassNameTextBox.setBounds(
+ Constants.UIConstants.LABEL_WIDTH + 2 * hgap,
+ (Constants.UIConstants.GENERAL_COMP_HEIGHT + vgap * 2),
+ Constants.UIConstants.TEXT_BOX_WIDTH,
+ Constants.UIConstants.GENERAL_COMP_HEIGHT);
this.providerClassNameTextBox.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
setProviderClassName();
@@ -293,9 +334,12 @@
this.loadButton = new JButton("Load");
this.add(this.loadButton);
- this.loadButton.setBounds(hgap, (Constants.UIConstants.GENERAL_COMP_HEIGHT + vgap) * 2 + vgap,
- Constants.UIConstants.GENERAL_BUTTON_WIDTH,
- Constants.UIConstants.GENERAL_COMP_HEIGHT);
+ this.loadButton.setBounds(hgap, (Constants.UIConstants.GENERAL_COMP_HEIGHT +
+ vgap) *
+ 2 +
+ vgap,
+ Constants.UIConstants.GENERAL_BUTTON_WIDTH,
+ Constants.UIConstants.GENERAL_COMP_HEIGHT);
this.loadButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
loadAllMethods();
@@ -305,10 +349,12 @@
this.advancedButton = new JButton("Advanced");
this.add(this.advancedButton);
- this.advancedButton.setBounds(2 * hgap + Constants.UIConstants.GENERAL_BUTTON_WIDTH
- , (Constants.UIConstants.GENERAL_COMP_HEIGHT + vgap) * 2 + vgap,
- Constants.UIConstants.GENERAL_BUTTON_WIDTH,
- Constants.UIConstants.GENERAL_COMP_HEIGHT);
+ this.advancedButton.setBounds(
+ 2 * hgap + Constants.UIConstants.GENERAL_BUTTON_WIDTH
+ , (Constants.UIConstants.GENERAL_COMP_HEIGHT + vgap) * 2 +
+ vgap,
+ Constants.UIConstants.GENERAL_BUTTON_WIDTH,
+ Constants.UIConstants.GENERAL_COMP_HEIGHT);
this.advancedButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
openDialog();
@@ -319,7 +365,8 @@
private void loadAllMethods() {
try {
- ArrayList methodList = new Controller().getMethodList(parentBean);
+ ArrayList methodList = new Controller().getMethodList(
+ parentBean);
myBean.setSelectedMethodNames(methodList);
loadButton.setEnabled(false);
advancedButton.setEnabled(true);
@@ -361,7 +408,8 @@
private ArrayList completeMethodList;
- public AdvancedSelectionDialog() throws HeadlessException, ProcessException {
+ public AdvancedSelectionDialog() throws HeadlessException,
+ ProcessException {
super();
super.setModal(true);
super.setTitle("Select Methods");
@@ -371,9 +419,11 @@
private void init() throws ProcessException {
//load the class file list
- this.completeMethodList = new Controller().getMethodList(parentBean);
+ this.completeMethodList =
+ new Controller().getMethodList(parentBean);
int methodCount = this.completeMethodList.size();
- int panelHeight = methodCount * (Constants.UIConstants.GENERAL_COMP_HEIGHT + vgap);
+ int panelHeight = methodCount *
+ (Constants.UIConstants.GENERAL_COMP_HEIGHT + vgap);
this.lablePanel = new JPanel();
this.lablePanel.setLayout(null);
@@ -387,14 +437,20 @@
this.selectedValues = new boolean[methodCount];
for (int i = 0; i < methodCount; i++) {
- tempCheckBox = new JCheckBox(this.completeMethodList.get(i).toString());
- currentSelection = currentSelectedList.contains(this.completeMethodList.get(i));
+ tempCheckBox =
+ new JCheckBox(
+ this.completeMethodList.get(i).toString());
+ currentSelection =
+ currentSelectedList.contains(
+ this.completeMethodList.get(i));
tempCheckBox.setSelected(currentSelection);
selectedValues[i] = currentSelection;
- tempCheckBox.setBounds(hgap, vgap + (Constants.UIConstants.GENERAL_COMP_HEIGHT + vgap) * i,
- Constants.UIConstants.LABEL_WIDTH * 3,
- Constants.UIConstants.GENERAL_COMP_HEIGHT);
- tempCheckBox.addActionListener(new CheckBoxActionListner(tempCheckBox, i));
+ tempCheckBox.setBounds(hgap, vgap +
+ (Constants.UIConstants.GENERAL_COMP_HEIGHT + vgap) * i,
+ Constants.UIConstants.LABEL_WIDTH * 3,
+ Constants.UIConstants.GENERAL_COMP_HEIGHT);
+ tempCheckBox.addActionListener(
+ new CheckBoxActionListner(tempCheckBox, i));
this.lablePanel.add(tempCheckBox);
}
@@ -402,8 +458,8 @@
okButton = new JButton("OK");
this.getContentPane().add(this.okButton);
this.okButton.setBounds(hgap, panelHeight + vgap,
- Constants.UIConstants.GENERAL_BUTTON_WIDTH,
- Constants.UIConstants.GENERAL_COMP_HEIGHT);
+ Constants.UIConstants.GENERAL_BUTTON_WIDTH,
+ Constants.UIConstants.GENERAL_COMP_HEIGHT);
this.okButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
loadValuesToBean();
@@ -413,16 +469,21 @@
cancelButton = new JButton("Cancel");
this.getContentPane().add(this.cancelButton);
- this.cancelButton.setBounds(hgap * 2 + Constants.UIConstants.GENERAL_BUTTON_WIDTH, panelHeight + vgap,
- Constants.UIConstants.GENERAL_BUTTON_WIDTH,
- Constants.UIConstants.GENERAL_COMP_HEIGHT);
+ this.cancelButton.setBounds(
+ hgap * 2 + Constants.UIConstants.GENERAL_BUTTON_WIDTH, panelHeight +
+ vgap,
+ Constants.UIConstants.GENERAL_BUTTON_WIDTH,
+ Constants.UIConstants.GENERAL_COMP_HEIGHT);
this.cancelButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
closeMe();
}
});
- this.setSize(width, panelHeight + 2 * Constants.UIConstants.GENERAL_COMP_HEIGHT + 30);
+ this.setSize(width,
+ panelHeight +
+ 2 * Constants.UIConstants.GENERAL_COMP_HEIGHT +
+ 30);
this.setResizable(false);
}
Modified: webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/swing/ui/WizardPane3.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/swing/ui/WizardPane3.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/swing/ui/WizardPane3.java (original)
+++ webservices/axis/trunk/java/modules/tool/src/org/apache/axis2/tool/service/swing/ui/WizardPane3.java Mon Jul 11 10:48:55 2005
@@ -68,16 +68,23 @@
this.setSize(width, height);
initDescription("\nInput the location for the output file and the name for \n" +
- "the compiled jar file ");
+ "the compiled jar file ");
this.outputFileLocationLabel = new JLabel("Output Folder");
this.add(this.outputFileLocationLabel);
- this.outputFileLocationLabel.setBounds(hgap, descHeight, Constants.UIConstants.LABEL_WIDTH, Constants.UIConstants.GENERAL_COMP_HEIGHT);
+ this.outputFileLocationLabel.setBounds(hgap,
+ descHeight,
+ Constants.UIConstants.LABEL_WIDTH,
+ Constants.UIConstants.GENERAL_COMP_HEIGHT);
this.outputFileLocationTextBox = new JTextField();
this.add(this.outputFileLocationTextBox);
- this.outputFileLocationTextBox.setBounds(Constants.UIConstants.LABEL_WIDTH + 2 * hgap, descHeight, Constants.UIConstants.TEXT_BOX_WIDTH, Constants.UIConstants.GENERAL_COMP_HEIGHT);
+ this.outputFileLocationTextBox.setBounds(
+ Constants.UIConstants.LABEL_WIDTH + 2 * hgap,
+ descHeight,
+ Constants.UIConstants.TEXT_BOX_WIDTH,
+ Constants.UIConstants.GENERAL_COMP_HEIGHT);
this.outputFileLocationTextBox.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
handleLocationChange();
@@ -98,7 +105,12 @@
this.browseButton = new JButton(".");
this.add(this.browseButton);
- this.browseButton.setBounds(Constants.UIConstants.LABEL_WIDTH + 2 * hgap + Constants.UIConstants.TEXT_BOX_WIDTH, descHeight, Constants.UIConstants.BROWSE_BUTTON_WIDTH, Constants.UIConstants.GENERAL_COMP_HEIGHT);
+ this.browseButton.setBounds(
+ Constants.UIConstants.LABEL_WIDTH + 2 * hgap +
+ Constants.UIConstants.TEXT_BOX_WIDTH,
+ descHeight,
+ Constants.UIConstants.BROWSE_BUTTON_WIDTH,
+ Constants.UIConstants.GENERAL_COMP_HEIGHT);
this.browseButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
outputFileLocationTextBox.setText(browseForAFolder());
@@ -110,11 +122,18 @@
this.outputFileNameLabel = new JLabel("Out File Name");
this.add(this.outputFileNameLabel);
- this.outputFileNameLabel.setBounds(hgap, descHeight + Constants.UIConstants.GENERAL_COMP_HEIGHT + vgap, Constants.UIConstants.LABEL_WIDTH, Constants.UIConstants.GENERAL_COMP_HEIGHT);
+ this.outputFileNameLabel.setBounds(hgap,
+ descHeight + Constants.UIConstants.GENERAL_COMP_HEIGHT + vgap,
+ Constants.UIConstants.LABEL_WIDTH,
+ Constants.UIConstants.GENERAL_COMP_HEIGHT);
this.outputFileNameTextBox = new JTextField();
this.add(this.outputFileNameTextBox);
- this.outputFileNameTextBox.setBounds(Constants.UIConstants.LABEL_WIDTH + 2 * hgap, descHeight + Constants.UIConstants.GENERAL_COMP_HEIGHT + vgap, Constants.UIConstants.TEXT_BOX_WIDTH, Constants.UIConstants.GENERAL_COMP_HEIGHT);
+ this.outputFileNameTextBox.setBounds(
+ Constants.UIConstants.LABEL_WIDTH + 2 * hgap,
+ descHeight + Constants.UIConstants.GENERAL_COMP_HEIGHT + vgap,
+ Constants.UIConstants.TEXT_BOX_WIDTH,
+ Constants.UIConstants.GENERAL_COMP_HEIGHT);
this.outputFileNameTextBox.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
handleFileNameChange();
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDL2Code.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDL2Code.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDL2Code.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDL2Code.java Mon Jul 11 10:48:55 2005
@@ -23,30 +23,40 @@
public static void main(String[] args) throws Exception {
- CommandLineOptionParser commandLineOptionParser = new CommandLineOptionParser(args);
+ CommandLineOptionParser commandLineOptionParser = new CommandLineOptionParser(
+ args);
validateCommandLineOptions(commandLineOptionParser);
new CodeGenerationEngine(commandLineOptionParser).generate();
}
private static void printUsage() {
- System.out.println("Usage WSDL2Code -uri <Location of WSDL> :WSDL file location ");
+ System.out.println(
+ "Usage WSDL2Code -uri <Location of WSDL> :WSDL file location ");
System.out.println("-o <output Location> : output file location ");
- System.out.println("-a : Generate async style code only. Default if off");
- System.out.println("-s : Generate sync style code only. Default if off. takes precedence over -a");
+ System.out.println(
+ "-a : Generate async style code only. Default if off");
+ System.out.println(
+ "-s : Generate sync style code only. Default if off. takes precedence over -a");
System.out.println("-p <package name> : set custom package name");
- System.out.println("-l <language> : valid languages are java and csharp. Default is java");
+ System.out.println(
+ "-l <language> : valid languages are java and csharp. Default is java");
System.out.println("-t : Generate TestCase to test the generated code");
- System.out.println("-ss : Generate server side code (i.e. skeletons).Default is off");
- System.out.println("-sd : Generate service descriptor (i.e. axis2.xml).Default is off.Valid with -ss ");
+ System.out.println(
+ "-ss : Generate server side code (i.e. skeletons).Default is off");
+ System.out.println(
+ "-sd : Generate service descriptor (i.e. axis2.xml).Default is off.Valid with -ss ");
System.exit(0);
}
- private static void validateCommandLineOptions(CommandLineOptionParser parser) {
+ private static void validateCommandLineOptions(
+ CommandLineOptionParser parser) {
if (parser.getInvalidOptions().size() > 0)
printUsage();
- if (null == parser.getAllOptions().get(CommandLineOptionConstants.WSDL_LOCATION_URI_OPTION))
+ if (null ==
+ parser.getAllOptions().get(
+ CommandLineOptionConstants.WSDL_LOCATION_URI_OPTION))
printUsage();
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDLVersionWrapper.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDLVersionWrapper.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDLVersionWrapper.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/WSDLVersionWrapper.java Mon Jul 11 10:48:55 2005
@@ -34,7 +34,8 @@
* @param description WSDL 2.0 WOM description
* @param definition WSDL 1.1 WSDL4J based <code>Definition</code>
*/
- public WSDLVersionWrapper(WSDLDescription description, Definition definition) {
+ public WSDLVersionWrapper(WSDLDescription description,
+ Definition definition) {
this.definition = definition;
this.description = description;
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilder.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilder.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilder.java Mon Jul 11 10:48:55 2005
@@ -27,5 +27,6 @@
public WSDLVersionWrapper build(InputStream in) throws WSDLException;
- public WSDLVersionWrapper build(InputStream in, WSDLComponentFactory wsdlComponentFactory) throws WSDLException;
+ public WSDLVersionWrapper build(InputStream in,
+ WSDLComponentFactory wsdlComponentFactory) throws WSDLException;
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilderFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilderFactory.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilderFactory.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilderFactory.java Mon Jul 11 10:48:55 2005
@@ -43,7 +43,8 @@
if (wsdlDocumentType == wsdl20) {
return new WSDL2ToWOMBuilder();
}
- throw new WSDLException(WSDLException.INVALID_WSDL, "The document type specified is not valid");
+ throw new WSDLException(WSDLException.INVALID_WSDL,
+ "The document type specified is not valid");
}
@@ -53,11 +54,17 @@
try {
doc = Utils.newDocument(in);
} catch (ParserConfigurationException e) {
- throw new WSDLException(WSDLException.PARSER_ERROR, "Parser Configuration Exception", e);
+ throw new WSDLException(WSDLException.PARSER_ERROR,
+ "Parser Configuration Exception",
+ e);
} catch (IOException e1) {
- throw new WSDLException(WSDLException.PARSER_ERROR, "WSDL Document read error", e1);
+ throw new WSDLException(WSDLException.PARSER_ERROR,
+ "WSDL Document read error",
+ e1);
} catch (SAXException e2) {
- throw new WSDLException(WSDLException.PARSER_ERROR, "Parser Exception", e2);
+ throw new WSDLException(WSDLException.PARSER_ERROR,
+ "Parser Exception",
+ e2);
}
@@ -70,7 +77,8 @@
return (WOMBuilder) new WSDL2ToWOMBuilder();
}
- throw new WSDLException(WSDLException.OTHER_ERROR, "Unable to Figure out the WSDL vesion of the Document");
+ throw new WSDLException(WSDLException.OTHER_ERROR,
+ "Unable to Figure out the WSDL vesion of the Document");
}
/**
@@ -83,12 +91,15 @@
*/
private static int getWSDLVersion(Document doc) throws WSDLException {
//TODO check weather the namespaces are correct and the / problem too
- if (WSDLConstants.WSDL2_0_NAMESPACE.equals(doc.getDocumentElement().getNamespaceURI())) {
+ if (WSDLConstants.WSDL2_0_NAMESPACE.equals(
+ doc.getDocumentElement().getNamespaceURI())) {
return wsdl20;
- } else if (WSDLConstants.WSDL1_1_NAMESPACE.equals(doc.getDocumentElement().getNamespaceURI())) {
+ } else if (WSDLConstants.WSDL1_1_NAMESPACE.equals(
+ doc.getDocumentElement().getNamespaceURI())) {
return WSDL11;
}
- throw new WSDLException(WSDLException.OTHER_ERROR, "Unable to Figure out the WSDL vesion of the Document");
+ throw new WSDLException(WSDLException.OTHER_ERROR,
+ "Unable to Figure out the WSDL vesion of the Document");
}
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDL2ToWOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDL2ToWOMBuilder.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDL2ToWOMBuilder.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDL2ToWOMBuilder.java Mon Jul 11 10:48:55 2005
@@ -29,7 +29,8 @@
throw new UnsupportedOperationException("Not Implemented");
}
- public WSDLVersionWrapper build(InputStream in, WSDLComponentFactory wsdlComponenetFactory) throws WSDLException {
+ public WSDLVersionWrapper build(InputStream in,
+ WSDLComponentFactory wsdlComponenetFactory) throws WSDLException {
throw new UnsupportedOperationException("Not Implemented");
}
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDLComponentFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDLComponentFactory.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDLComponentFactory.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDLComponentFactory.java Mon Jul 11 10:48:55 2005
@@ -1,6 +1,22 @@
package org.apache.axis2.wsdl.builder;
-import org.apache.wsdl.*;
+import org.apache.wsdl.MessageReference;
+import org.apache.wsdl.WSDLBinding;
+import org.apache.wsdl.WSDLBindingFault;
+import org.apache.wsdl.WSDLBindingMessageReference;
+import org.apache.wsdl.WSDLBindingOperation;
+import org.apache.wsdl.WSDLDescription;
+import org.apache.wsdl.WSDLEndpoint;
+import org.apache.wsdl.WSDLExtensibilityAttribute;
+import org.apache.wsdl.WSDLFaultReference;
+import org.apache.wsdl.WSDLFeature;
+import org.apache.wsdl.WSDLImport;
+import org.apache.wsdl.WSDLInclude;
+import org.apache.wsdl.WSDLInterface;
+import org.apache.wsdl.WSDLOperation;
+import org.apache.wsdl.WSDLProperty;
+import org.apache.wsdl.WSDLService;
+import org.apache.wsdl.WSDLTypes;
import org.apache.wsdl.extensions.ExtensionFactory;
/**
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java Mon Jul 11 10:48:55 2005
@@ -48,11 +48,14 @@
return new WSDLVersionWrapper(wsdlDescription, wsdl1Definition);
}
- public WSDLVersionWrapper build(InputStream in, WSDLComponentFactory wsdlComponentFactory) throws WSDLException {
+ public WSDLVersionWrapper build(InputStream in,
+ WSDLComponentFactory wsdlComponentFactory) throws WSDLException {
WSDLDescription wsdlDescription = wsdlComponentFactory.createDescription();
Definition wsdl1Definition = this.readInTheWSDLFile(in);
- WSDLPump pump = new WSDLPump(wsdlDescription, wsdl1Definition, wsdlComponentFactory);
+ WSDLPump pump = new WSDLPump(wsdlDescription,
+ wsdl1Definition,
+ wsdlComponentFactory);
pump.pump();
return new WSDLVersionWrapper(wsdlDescription, wsdl1Definition);
@@ -67,9 +70,13 @@
try {
doc = Utils.newDocument(in);
} catch (ParserConfigurationException e) {
- throw new WSDLException(WSDLException.PARSER_ERROR, "Parser Configuration Error", e);
+ throw new WSDLException(WSDLException.PARSER_ERROR,
+ "Parser Configuration Error",
+ e);
} catch (SAXException e) {
- throw new WSDLException(WSDLException.PARSER_ERROR, "Parser SAX Error", e);
+ throw new WSDLException(WSDLException.PARSER_ERROR,
+ "Parser SAX Error",
+ e);
} catch (IOException e) {
throw new WSDLException(WSDLException.INVALID_WSDL, "IO Error", e);
Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java?rev=210165&r1=210164&r2=210165&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java Mon Jul 11 10:48:55 2005
@@ -18,7 +18,22 @@
import com.ibm.wsdl.extensions.soap.SOAPConstants;
import org.apache.axis2.wsdl.builder.WSDLComponentFactory;
import org.apache.crimson.tree.XmlDocument;
-import org.apache.wsdl.*;
+import org.apache.wsdl.Component;
+import org.apache.wsdl.MessageReference;
+import org.apache.wsdl.WSDLBinding;
+import org.apache.wsdl.WSDLBindingFault;
+import org.apache.wsdl.WSDLBindingMessageReference;
+import org.apache.wsdl.WSDLBindingOperation;
+import org.apache.wsdl.WSDLConstants;
+import org.apache.wsdl.WSDLDescription;
+import org.apache.wsdl.WSDLEndpoint;
+import org.apache.wsdl.WSDLExtensibilityAttribute;
+import org.apache.wsdl.WSDLExtensibilityElement;
+import org.apache.wsdl.WSDLFaultReference;
+import org.apache.wsdl.WSDLInterface;
+import org.apache.wsdl.WSDLOperation;
+import org.apache.wsdl.WSDLService;
+import org.apache.wsdl.WSDLTypes;
import org.apache.wsdl.extensions.DefaultExtensibilityElement;
import org.apache.wsdl.extensions.ExtensionConstants;
import org.apache.wsdl.extensions.ExtensionFactory;
@@ -26,7 +41,22 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import javax.wsdl.*;
+import javax.wsdl.Binding;
+import javax.wsdl.BindingFault;
+import javax.wsdl.BindingInput;
+import javax.wsdl.BindingOperation;
+import javax.wsdl.BindingOutput;
+import javax.wsdl.Definition;
+import javax.wsdl.Fault;
+import javax.wsdl.Input;
+import javax.wsdl.Message;
+import javax.wsdl.Operation;
+import javax.wsdl.Output;
+import javax.wsdl.Part;
+import javax.wsdl.Port;
+import javax.wsdl.PortType;
+import javax.wsdl.Service;
+import javax.wsdl.Types;
import javax.wsdl.extensions.ExtensibilityElement;
import javax.wsdl.extensions.UnknownExtensibilityElement;
import javax.wsdl.extensions.schema.Schema;
@@ -72,7 +102,7 @@
public void pump() {
if (null != this.wsdl4jParsedDefinition && null != this.womDefinition) {
this.populateDefinition(this.womDefinition,
- this.wsdl4jParsedDefinition);
+ this.wsdl4jParsedDefinition);
} else {
throw new WSDLProcessingException("Properties not set properly");
}
@@ -86,7 +116,8 @@
wsdlDefinition
.setTargetNameSpace(wsdl4JDefinition.getTargetNamespace());
wsdlDefinition.setNamespaces(wsdl4JDefinition.getNamespaces());
- this.copyExtensibleElements(wsdl4JDefinition.getExtensibilityElements(), wsdlDefinition);
+ this.copyExtensibleElements(
+ wsdl4JDefinition.getExtensibilityElements(), wsdlDefinition);
/////////////////////////////////////////////////////////////////////
// Order of the following items shouldn't be changed unless you //
@@ -109,7 +140,7 @@
this.copyExtensibleElements(wsdl4jTypes.getExtensibilityElements(),
- wsdlTypes);
+ wsdlTypes);
this.womDefinition.setTypes(wsdlTypes);
}
@@ -128,7 +159,7 @@
portType = (PortType) portTypeIterator.next();
this.populateInterfaces(wsdlInterface, portType);
this.copyExtensibilityAttribute(portType.getExtensionAttributes(),
- wsdlInterface);
+ wsdlInterface);
wsdlDefinition.addInterface(wsdlInterface);
}
@@ -145,8 +176,9 @@
wsdlBinding = this.wsdlComponenetFactory.createBinding();
wsdl4jBinding = (Binding) bindingIterator.next();
this.populateBindings(wsdlBinding, wsdl4jBinding);
- this.copyExtensibleElements(wsdl4jBinding.getExtensibilityElements(),
- wsdlBinding);
+ this.copyExtensibleElements(
+ wsdl4jBinding.getExtensibilityElements(),
+ wsdlBinding);
wsdlDefinition.addBinding(wsdlBinding);
}
@@ -161,8 +193,9 @@
wsdlService = this.wsdlComponenetFactory.createService();
wsdl4jService = (Service) serviceIterator.next();
this.populateServices(wsdlService, wsdl4jService);
- this.copyExtensibleElements(wsdl4jService.getExtensibilityElements(),
- wsdlService);
+ this.copyExtensibleElements(
+ wsdl4jService.getExtensibilityElements(),
+ wsdlService);
wsdlDefinition.addService(wsdlService);
}
@@ -195,9 +228,10 @@
wsdloperation = this.wsdlComponenetFactory.createOperation();
wsdl4jOperation = (Operation) wsdl4JOperationsIterator.next();
this.populateOperations(wsdloperation,
- wsdl4jOperation,
- wsdl4jPortType.getQName().getNamespaceURI());
- this.copyExtensibleElements(wsdl4jOperation.getExtensibilityElements(), wsdloperation);
+ wsdl4jOperation,
+ wsdl4jPortType.getQName().getNamespaceURI());
+ this.copyExtensibleElements(
+ wsdl4jOperation.getExtensibilityElements(), wsdloperation);
wsdlInterface.setOperation(wsdloperation);
}
}
@@ -205,7 +239,8 @@
/**
* Pre Condition: The Interface Components must be copied by now.
*/
- private void populateBindings(WSDLBinding wsdlBinding, Binding wsdl4JBinding) {
+ private void populateBindings(WSDLBinding wsdlBinding,
+ Binding wsdl4JBinding) {
//Copy attrebutes
wsdlBinding.setName(wsdl4JBinding.getQName());
QName interfaceName = wsdl4JBinding.getPortType().getQName();
@@ -215,7 +250,7 @@
//FIXME Do We need this eventually???
if (null == wsdlInterface)
throw new WSDLProcessingException("Interface/PortType not found for the Binding :"
- + wsdlBinding.getName());
+ + wsdlBinding.getName());
wsdlBinding.setBoundInterface(wsdlInterface);
Iterator bindingoperationsIterator =
wsdl4JBinding.getBindingOperations().iterator();
@@ -227,17 +262,21 @@
wsdl4jBindingOperation =
(BindingOperation) bindingoperationsIterator.next();
this.populateBindingOperation(wsdlBindingOperation,
- wsdl4jBindingOperation,
- wsdl4JBinding.getQName().getNamespaceURI());
- wsdlBindingOperation.setOperation(wsdlInterface.getOperation(wsdl4jBindingOperation.getOperation().getName()));
- this.copyExtensibleElements(wsdl4jBindingOperation.getExtensibilityElements(),
- wsdlBindingOperation);
+ wsdl4jBindingOperation,
+ wsdl4JBinding.getQName().getNamespaceURI());
+ wsdlBindingOperation.setOperation(
+ wsdlInterface.getOperation(
+ wsdl4jBindingOperation.getOperation().getName()));
+ this.copyExtensibleElements(
+ wsdl4jBindingOperation.getExtensibilityElements(),
+ wsdlBindingOperation);
wsdlBinding.addBindingOperation(wsdlBindingOperation);
}
}
- public void populateServices(WSDLService wsdlService, Service wsdl4jService) {
+ public void populateServices(WSDLService wsdlService,
+ Service wsdl4jService) {
wsdlService.setName(wsdl4jService.getQName());
Iterator wsdl4jportsIterator =
wsdl4jService.getPorts().values().iterator();
@@ -248,10 +287,10 @@
wsdlEndpoint = this.wsdlComponenetFactory.createEndpoint();
wsdl4jPort = (Port) wsdl4jportsIterator.next();
this.populatePorts(wsdlEndpoint,
- wsdl4jPort,
- wsdl4jService.getQName().getNamespaceURI());
+ wsdl4jPort,
+ wsdl4jService.getQName().getNamespaceURI());
this.copyExtensibleElements(wsdl4jPort.getExtensibilityElements(),
- wsdlEndpoint);
+ wsdlEndpoint);
wsdlService.setEndpoint(wsdlEndpoint);
}
@@ -260,10 +299,11 @@
/////////////////////////////////////////////////////////////////////////////
//////////////////////////// Internal Component Copying ///////////////////
public void populateOperations(WSDLOperation wsdlOperation,
- Operation wsdl4jOperation, String nameSpaceOfTheOperation) {
+ Operation wsdl4jOperation,
+ String nameSpaceOfTheOperation) {
//Copy Name Attrebute
wsdlOperation.setName(new QName(nameSpaceOfTheOperation,
- wsdl4jOperation.getName()));
+ wsdl4jOperation.getName()));
//This code make no attempt to make use of the special xs:Token
//defined in the WSDL 2.0. eg like #any, #none
@@ -273,17 +313,22 @@
if (null != wsdl4jInputMessage) {
MessageReference wsdlInputMessage = this.wsdlComponenetFactory
.createMessageReference();
- wsdlInputMessage.setDirection(WSDLConstants.WSDL_MESSAGE_DIRECTION_IN);
- wsdlInputMessage.setMessageLabel(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ wsdlInputMessage.setDirection(
+ WSDLConstants.WSDL_MESSAGE_DIRECTION_IN);
+ wsdlInputMessage.setMessageLabel(
+ WSDLConstants.MESSAGE_LABEL_IN_VALUE);
Message message = wsdl4jInputMessage.getMessage();
if (null != message) {
- wsdlInputMessage.setElement(this.generateReferenceQname(message));
- this.copyExtensibleElements((message).getExtensibilityElements(),
- wsdlInputMessage);
+ wsdlInputMessage.setElement(
+ this.generateReferenceQname(message));
+ this.copyExtensibleElements(
+ (message).getExtensibilityElements(),
+ wsdlInputMessage);
}
- this.copyExtensibilityAttribute(wsdl4jInputMessage.getExtensionAttributes(),
- wsdlInputMessage);
+ this.copyExtensibilityAttribute(
+ wsdl4jInputMessage.getExtensionAttributes(),
+ wsdlInputMessage);
wsdlOperation.setInputMessage(wsdlInputMessage);
}
@@ -292,17 +337,22 @@
if (null != wsdl4jOutputMessage) {
MessageReference wsdlOutputMessage =
this.wsdlComponenetFactory.createMessageReference();
- wsdlOutputMessage.setDirection(WSDLConstants.WSDL_MESSAGE_DIRECTION_OUT);
- wsdlOutputMessage.setMessageLabel(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
+ wsdlOutputMessage.setDirection(
+ WSDLConstants.WSDL_MESSAGE_DIRECTION_OUT);
+ wsdlOutputMessage.setMessageLabel(
+ WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
Message outputMessage = wsdl4jOutputMessage.getMessage();
if (null != outputMessage) {
- wsdlOutputMessage.setElement(this.generateReferenceQname(outputMessage));
- this.copyExtensibleElements((outputMessage).getExtensibilityElements(),
- wsdlOutputMessage);
+ wsdlOutputMessage.setElement(
+ this.generateReferenceQname(outputMessage));
+ this.copyExtensibleElements(
+ (outputMessage).getExtensibilityElements(),
+ wsdlOutputMessage);
}
- this.copyExtensibilityAttribute(wsdl4jOutputMessage.getExtensionAttributes(),
- wsdlOutputMessage);
+ this.copyExtensibilityAttribute(
+ wsdl4jOutputMessage.getExtensionAttributes(),
+ wsdlOutputMessage);
wsdlOperation.setOutputMessage(wsdlOutputMessage);
}
@@ -314,20 +364,23 @@
Fault fault = (Fault) faults.get(faultKeyIterator.next());
faultReference = wsdlComponenetFactory.createFaultReference();
- faultReference.setDirection(WSDLConstants.WSDL_MESSAGE_DIRECTION_OUT);
+ faultReference.setDirection(
+ WSDLConstants.WSDL_MESSAGE_DIRECTION_OUT);
Message faultMessage = fault.getMessage();
if (null != faultMessage) {
- faultReference.setRef(this.generateReferenceQname(faultMessage));
+ faultReference.setRef(
+ this.generateReferenceQname(faultMessage));
}
wsdlOperation.addOutFault(faultReference);
- this.copyExtensibilityAttribute(fault.getExtensionAttributes(), faultReference);
+ this.copyExtensibilityAttribute(fault.getExtensionAttributes(),
+ faultReference);
//TODO Fault Message lable
}
//Set the MEP
wsdlOperation.setMessageExchangePattern(WSDL11MEPFinder
- .getMEP(wsdl4jOperation));
+ .getMEP(wsdl4jOperation));
}
@@ -339,9 +392,11 @@
// Check whether this message parts have been made to a type
Iterator multipartListIterator = this.resolvedMultipartMessageList.iterator();
boolean multipartAlreadyResolved = false;
- while (multipartListIterator.hasNext() && !multipartAlreadyResolved) {
+ while (multipartListIterator.hasNext() &&
+ !multipartAlreadyResolved) {
QName temp = (QName) multipartListIterator.next();
- multipartAlreadyResolved = wsdl4jMessage.getQName().equals(temp);
+ multipartAlreadyResolved =
+ wsdl4jMessage.getQName().equals(temp);
}
if (multipartAlreadyResolved) {
//This message with multiple parts has resolved and a new type has been
@@ -361,16 +416,19 @@
Element schemaElement = newDoc.createElement("schema");//http://www.w3.org/2001/XMLSchema
types = wsdlComponenetFactory.createTypes();
ExtensionFactory extensionFactory = wsdlComponenetFactory.createExtensionFactory();
- org.apache.wsdl.extensions.Schema typesElement = (org.apache.wsdl.extensions.Schema) extensionFactory.getExtensionElement(ExtensionConstants.SCHEMA);
+ org.apache.wsdl.extensions.Schema typesElement = (org.apache.wsdl.extensions.Schema) extensionFactory.getExtensionElement(
+ ExtensionConstants.SCHEMA);
typesElement.setElelment(schemaElement);
types.addExtensibilityElement(typesElement);
this.womDefinition.setTypes(types);
}
- Iterator schemaEIIterator = types.getExtensibilityElements().iterator();
+ Iterator schemaEIIterator = types.getExtensibilityElements()
+ .iterator();
while (schemaEIIterator.hasNext()) {
WSDLExtensibilityElement temp = (WSDLExtensibilityElement) schemaEIIterator.next();
if (ExtensionConstants.SCHEMA.equals(temp.getType())) {
- element = ((org.apache.wsdl.extensions.Schema) temp).getElelment();
+ element =
+ ((org.apache.wsdl.extensions.Schema) temp).getElelment();
break;
}
}
@@ -392,8 +450,11 @@
child = doc.createElement("element");
- child.setAttribute("name", "var" + elementName.getLocalPart());
- child.setAttribute("type", elementName.getNamespaceURI() + ":" + elementName.getLocalPart());
+ child.setAttribute("name",
+ "var" + elementName.getLocalPart());
+ child.setAttribute("type",
+ elementName.getNamespaceURI() + ":" +
+ elementName.getLocalPart());
cmplxContent.appendChild(child);
}
@@ -429,20 +490,24 @@
return referenceQName;
}
- private void populateBindingOperation(WSDLBindingOperation wsdlBindingOperation,
- BindingOperation wsdl4jBindingOperation,
- String nameSpaceOfTheBindingOperation) {
-
- wsdlBindingOperation.setName(new QName(nameSpaceOfTheBindingOperation,
- wsdl4jBindingOperation.getName()));
+ private void populateBindingOperation(
+ WSDLBindingOperation wsdlBindingOperation,
+ BindingOperation wsdl4jBindingOperation,
+ String nameSpaceOfTheBindingOperation) {
+
+ wsdlBindingOperation.setName(
+ new QName(nameSpaceOfTheBindingOperation,
+ wsdl4jBindingOperation.getName()));
BindingInput wsdl4jInputBinding =
wsdl4jBindingOperation.getBindingInput();
if (null != wsdl4jInputBinding) {
WSDLBindingMessageReference wsdlInputBinding =
this.wsdlComponenetFactory.createWSDLBindingMessageReference();
- wsdlInputBinding.setDirection(WSDLConstants.WSDL_MESSAGE_DIRECTION_IN);
- this.copyExtensibleElements(wsdl4jInputBinding.getExtensibilityElements(),
- wsdlInputBinding);
+ wsdlInputBinding.setDirection(
+ WSDLConstants.WSDL_MESSAGE_DIRECTION_IN);
+ this.copyExtensibleElements(
+ wsdl4jInputBinding.getExtensibilityElements(),
+ wsdlInputBinding);
wsdlBindingOperation.setInput(wsdlInputBinding);
}
@@ -451,10 +516,12 @@
if (null != wsdl4jOutputBinding) {
WSDLBindingMessageReference wsdlOutputBinding = this.wsdlComponenetFactory
.createWSDLBindingMessageReference();
- wsdlOutputBinding.setDirection(WSDLConstants.WSDL_MESSAGE_DIRECTION_OUT);
+ wsdlOutputBinding.setDirection(
+ WSDLConstants.WSDL_MESSAGE_DIRECTION_OUT);
- this.copyExtensibleElements(wsdl4jOutputBinding.getExtensibilityElements(),
- wsdlOutputBinding);
+ this.copyExtensibleElements(
+ wsdl4jOutputBinding.getExtensibilityElements(),
+ wsdlOutputBinding);
wsdlBindingOperation.setOutput(wsdlOutputBinding);
}
@@ -462,9 +529,11 @@
Map bindingFaults = wsdl4jBindingOperation.getBindingFaults();
Iterator keyIterator = bindingFaults.keySet().iterator();
while (keyIterator.hasNext()) {
- BindingFault bindingFault = (BindingFault) bindingFaults.get(keyIterator.next());
+ BindingFault bindingFault = (BindingFault) bindingFaults.get(
+ keyIterator.next());
WSDLBindingFault womBindingFault = this.wsdlComponenetFactory.createBindingFault();
- this.copyExtensibleElements(bindingFault.getExtensibilityElements(), womBindingFault);
+ this.copyExtensibleElements(
+ bindingFault.getExtensibilityElements(), womBindingFault);
wsdlBindingOperation.addOutFault(womBindingFault);
}
@@ -474,8 +543,11 @@
String targetNamspace) {
wsdlEndpoint.setName(new QName(targetNamspace, wsdl4jPort.getName()));
- wsdlEndpoint.setBinding(this.womDefinition.getBinding(wsdl4jPort
- .getBinding().getQName()));
+ wsdlEndpoint.setBinding(
+ this.womDefinition.getBinding(
+ wsdl4jPort
+ .getBinding()
+ .getQName()));
}
@@ -498,8 +570,9 @@
// Throw an exception if there are no interfaces defined as at yet.
if (0 == this.womDefinition.getWsdlInterfaces().size())
throw new WSDLProcessingException("There are no "
- + "Interfaces/PortTypes identified in the current partially built"
- + "WOM");
+ +
+ "Interfaces/PortTypes identified in the current partially built"
+ + "WOM");
//If there is only one Interface available hten return that because
// normally
@@ -514,14 +587,18 @@
// superinterfaces of it
// and return.
WSDLInterface newBoundInterface = this.womDefinition.createInterface();
- newBoundInterface.setName(new QName(service.getNamespace(), service
- .getName().getLocalPart()
- + BOUND_INTERFACE_NAME));
+ newBoundInterface.setName(
+ new QName(service.getNamespace(),
+ service
+ .getName()
+ .getLocalPart()
+ + BOUND_INTERFACE_NAME));
Iterator interfaceIterator = this.womDefinition.getWsdlInterfaces()
.values().iterator();
while (interfaceIterator.hasNext()) {
newBoundInterface
- .addSuperInterface((WSDLInterface) interfaceIterator.next());
+ .addSuperInterface(
+ (WSDLInterface) interfaceIterator.next());
}
return newBoundInterface;
}
@@ -558,7 +635,7 @@
org.apache.wsdl.extensions.SOAPAddress extensibilityElement = (org.apache.wsdl.extensions.SOAPAddress) extensionFactory
.getExtensionElement(soapAddress.getElementType());
extensibilityElement.setLocationURI(soapAddress
- .getLocationURI());
+ .getLocationURI());
Boolean required = soapAddress.getRequired();
if (null != required) {
extensibilityElement.setRequired(required.booleanValue());
@@ -566,37 +643,47 @@
component.addExtensibilityElement(extensibilityElement);
} else if (wsdl4jElement instanceof Schema) {
Schema schema = (Schema) wsdl4jElement;
- org.apache.wsdl.extensions.Schema extensibilityElement = (org.apache.wsdl.extensions.Schema) extensionFactory.getExtensionElement(schema.getElementType());
+ org.apache.wsdl.extensions.Schema extensibilityElement = (org.apache.wsdl.extensions.Schema) extensionFactory.getExtensionElement(
+ schema.getElementType());
extensibilityElement.setElelment(schema.getElement());
Boolean required = schema.getRequired();
if (null != required) {
extensibilityElement.setRequired(required.booleanValue());
}
component.addExtensibilityElement(extensibilityElement);
- } else if (SOAPConstants.Q_ELEM_SOAP_OPERATION.equals(wsdl4jElement.getElementType())) {
+ } else if (SOAPConstants.Q_ELEM_SOAP_OPERATION.equals(
+ wsdl4jElement.getElementType())) {
SOAPOperation soapOperation = (SOAPOperation) wsdl4jElement;
- org.apache.wsdl.extensions.SOAPOperation extensibilityElement = (org.apache.wsdl.extensions.SOAPOperation) extensionFactory.getExtensionElement(soapOperation.getElementType());
- extensibilityElement.setSoapAction(soapOperation.getSoapActionURI());
+ org.apache.wsdl.extensions.SOAPOperation extensibilityElement = (org.apache.wsdl.extensions.SOAPOperation) extensionFactory.getExtensionElement(
+ soapOperation.getElementType());
+ extensibilityElement.setSoapAction(
+ soapOperation.getSoapActionURI());
extensibilityElement.setStyle(soapOperation.getStyle());
Boolean required = soapOperation.getRequired();
if (null != required) {
extensibilityElement.setRequired(required.booleanValue());
}
component.addExtensibilityElement(extensibilityElement);
- } else if (SOAPConstants.Q_ELEM_SOAP_BODY.equals(wsdl4jElement.getElementType())) {
+ } else if (SOAPConstants.Q_ELEM_SOAP_BODY.equals(
+ wsdl4jElement.getElementType())) {
SOAPBody soapBody = (SOAPBody) wsdl4jElement;
- org.apache.wsdl.extensions.SOAPBody extensibilityElement = (org.apache.wsdl.extensions.SOAPBody) extensionFactory.getExtensionElement(soapBody.getElementType());
- extensibilityElement.setNamespaceURI(soapBody.getNamespaceURI());
+ org.apache.wsdl.extensions.SOAPBody extensibilityElement = (org.apache.wsdl.extensions.SOAPBody) extensionFactory.getExtensionElement(
+ soapBody.getElementType());
+ extensibilityElement.setNamespaceURI(
+ soapBody.getNamespaceURI());
extensibilityElement.setUse(soapBody.getUse());
Boolean required = soapBody.getRequired();
if (null != required) {
extensibilityElement.setRequired(required.booleanValue());
}
component.addExtensibilityElement(extensibilityElement);
- } else if (SOAPConstants.Q_ELEM_SOAP_BINDING.equals(wsdl4jElement.getElementType())) {
+ } else if (SOAPConstants.Q_ELEM_SOAP_BINDING.equals(
+ wsdl4jElement.getElementType())) {
SOAPBinding soapBinding = (SOAPBinding) wsdl4jElement;
- org.apache.wsdl.extensions.SOAPBinding extensibilityElement = (org.apache.wsdl.extensions.SOAPBinding) extensionFactory.getExtensionElement(soapBinding.getElementType());
- extensibilityElement.setTransportURI(soapBinding.getTransportURI());
+ org.apache.wsdl.extensions.SOAPBinding extensibilityElement = (org.apache.wsdl.extensions.SOAPBinding) extensionFactory.getExtensionElement(
+ soapBinding.getElementType());
+ extensibilityElement.setTransportURI(
+ soapBinding.getTransportURI());
extensibilityElement.setStyle(soapBinding.getStyle());
Boolean required = soapBinding.getRequired();
if (null != required) {