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/05 20:24:23 UTC

svn commit: r453307 [2/2] - in /webservices/axis2/branches/java/1_1/modules/tool: axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/ axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/ axis2-eclip...

Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/OutputPage.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/OutputPage.java?view=diff&rev=453307&r1=453306&r2=453307
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/OutputPage.java (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/OutputPage.java Thu Oct  5 11:24:22 2006
@@ -16,6 +16,8 @@
 
 package org.apache.axis2.tool.codegen.eclipse.ui;
 
+import java.io.File;
+
 import org.apache.axis2.tool.codegen.eclipse.plugin.CodegenWizardPlugin;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -25,38 +27,71 @@
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.DirectoryDialog;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.List;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.dialogs.ContainerSelectionDialog;
 
 public class OutputPage extends AbstractWizardPage {
 
 	private Text outputLocation;
+	
+	private Text axisHomeLocation;
+	
+	private Text jarFileNameText;
 
 	private Button browseButton;
-
-	private Button locationSelectCheckBox;
+	
+	private Button axisHomeBrowseButton;
+	
+	private Button axisLoadLibsButton;
+	
+	private Button copyLibButton;
+	
+	private Button jarCreationButton;
+
+	private Button workspaceProjectOptionsButton;
+
+	private Button filesyStemOptionsButton;
+
+	private Button copyPluginLibButton;
+	
+	private boolean workspaceSaveOption = false;
+	
+	private boolean jarFileCopyOption = false;
+	
+	private Label axisHomeLabel;
+	
+	private Label axisLoadLibResultsLabel;
+	
+	private Label jarFileNameLabel;
+	
 
 	/**
 	 * 
 	 */
 	public OutputPage() {
-		super("page3");
+		 super("page3");
 	}
 
 	/**
-	 * Creates some initial values for the settings. On the output page, this is
-	 * not very much.
+	 * Creates some initial values for the settings. 
 	 */
 	protected void initializeDefaultSettings() {
 		settings.put(PREF_OUTPUT_LOCATION, "");
-		settings.put(PREF_CHECK_BROWSE_PROJECTS, true);
+		settings.put(PREF_AXIS_HOME_OUTPUT_LOCATION, "");
+		settings.put(PREF_JAR_FILE_NAME, "");
+		settings.put(PREF_CHECK_WORKSPACE, false);
+		settings.put(PREF_CHECK_FILE_SYSTEM, true);
+		settings.put(PREF_CHECK_AXIS_LIB_COPY, false);
+		settings.put(PREF_CHECK_JAR_CREATION, false);
+		settings.put(PREF_CHECK_AXIS_PLUGIN_LIB_COPY, false);
+		workspaceSaveOption = false;
 	}
 
 	/*
@@ -73,21 +108,47 @@
 
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 
-		locationSelectCheckBox = new Button(container, SWT.CHECK);
-		locationSelectCheckBox.setText(CodegenWizardPlugin
-				.getResourceString("page3.browseWorkspace.title")); 
-		gd.horizontalSpan = 3;
-		locationSelectCheckBox.setLayoutData(gd);
-		locationSelectCheckBox.setSelection(settings.getBoolean(PREF_CHECK_BROWSE_PROJECTS));
-		locationSelectCheckBox.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				// in any case just wipe out whatever is in the text box
-				outputLocation.setText("");
-				settings.put(PREF_CHECK_BROWSE_PROJECTS, locationSelectCheckBox.getSelection());
-			};
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan = 3;
+		Label selectLabel = new Label(container, SWT.NULL);
+		selectLabel
+				.setText(CodegenWizardPlugin
+						.getResourceString("select the location where to put the output"));
+		selectLabel.setLayoutData(gd);
+
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan = 3;
+		workspaceProjectOptionsButton = new Button(container, SWT.RADIO);
+		workspaceProjectOptionsButton.setLayoutData(gd);
+		workspaceProjectOptionsButton.setText(CodegenWizardPlugin
+				.getResourceString("page3.workspace.caption"));
+		workspaceProjectOptionsButton.setToolTipText(CodegenWizardPlugin
+				.getResourceString("page3.workspace.desc"));
+		settings.put(PREF_CHECK_WORKSPACE, false);
+		settings.put(PREF_CHECK_FILE_SYSTEM, true);
+		workspaceProjectOptionsButton.setSelection(settings
+				.getBoolean(PREF_CHECK_WORKSPACE));
+		workspaceProjectOptionsButton
+				.addSelectionListener(new SelectionAdapter() {
+					public void widgetSelected(SelectionEvent e) {
+						handleCheckboxSelection();
+					}
+				});
 
-			public void widgetDefaultSelected(SelectionEvent e) {
-			};
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan = 3;
+		filesyStemOptionsButton = new Button(container, SWT.RADIO);
+		filesyStemOptionsButton.setLayoutData(gd);
+		filesyStemOptionsButton.setText(CodegenWizardPlugin
+				.getResourceString("page3.filesystem.caption"));
+		filesyStemOptionsButton.setToolTipText(CodegenWizardPlugin
+				.getResourceString("page3.filesystem.desc"));
+		filesyStemOptionsButton.setSelection(settings
+				.getBoolean(PREF_CHECK_FILE_SYSTEM));
+		filesyStemOptionsButton.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent e) {
+				handleCheckboxSelection();
+			}
 		});
 
 		gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -95,10 +156,12 @@
 		label
 				.setText(org.apache.axis2.tool.codegen.eclipse.plugin.CodegenWizardPlugin
 						.getResourceString("page3.output.caption"));
-
+		
+		settings.put(PREF_OUTPUT_LOCATION, "");
+		settings.put(PREF_AXIS_HOME_OUTPUT_LOCATION, "");
 		outputLocation = new Text(container, SWT.BORDER);
-		outputLocation.setLayoutData(gd);
 		outputLocation.setText(settings.get(PREF_OUTPUT_LOCATION));
+		outputLocation.setLayoutData(gd);
 		outputLocation.addModifyListener(new ModifyListener() {
 			public void modifyText(ModifyEvent e) {
 				settings.put(PREF_OUTPUT_LOCATION, outputLocation.getText());
@@ -107,15 +170,151 @@
 		});
 
 		browseButton = new Button(container, SWT.PUSH);
-		browseButton
-				.setText(CodegenWizardPlugin
-						.getResourceString("page3.outselection.browse"));
+		browseButton.setText(CodegenWizardPlugin
+				.getResourceString("page3.outselection.browse"));
 		browseButton.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent e) {
 				handleBrowse();
 			}
 		});
+		
+		
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan = 3;
+		copyPluginLibButton = new Button(container, SWT.CHECK);
+		copyPluginLibButton.setText(CodegenWizardPlugin
+				.getResourceString("page3.copypluginlib.caption"));
+		copyPluginLibButton.setToolTipText(CodegenWizardPlugin
+				.getResourceString("page3.copypluginlib.caption"));
+		copyPluginLibButton.setSelection(settings.getBoolean(PREF_CHECK_AXIS_PLUGIN_LIB_COPY));
+		copyPluginLibButton.setLayoutData(gd);
+		copyPluginLibButton.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent e) {
+				handleCopyPluginLibsCheckBox();
+			}
+		});
+		
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan=3;
+		Label fillLabel = new Label(container, SWT.NULL);
+		fillLabel.setText("");
+		
+		//filling label 
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan = 3;
+		Label fillLabel1 = new Label(container, SWT.HORIZONTAL | SWT.SEPARATOR);
+		fillLabel1.setLayoutData(gd);
+
+		
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan = 3;
+		copyLibButton = new Button(container, SWT.CHECK);
+		copyLibButton.setText(CodegenWizardPlugin
+				.getResourceString("page3.addaxislib.caption"));
+		copyLibButton.setToolTipText(CodegenWizardPlugin
+				.getResourceString("page3.addaxislib.desc"));
+		copyLibButton.setLayoutData(gd);
+		copyLibButton.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent e) {
+				handlejarCheckBox();
+			}
+		});
+		
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		axisHomeLabel = new Label(container, SWT.NULL);
+		axisHomeLabel
+				.setText(CodegenWizardPlugin
+						.getResourceString("page3.axishome.caption"));
+		
+		
+		axisHomeLocation = new Text(container, SWT.BORDER);
+		axisHomeLocation.setLayoutData(gd);
+		axisHomeLocation.setText(settings.get(PREF_AXIS_HOME_OUTPUT_LOCATION));
+		axisHomeLocation.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				settings.put(PREF_AXIS_HOME_OUTPUT_LOCATION, axisHomeLocation.getText());
+				handleAxisHomeModifyEvent();
+			}
+		});
 
+		axisHomeBrowseButton = new Button(container, SWT.PUSH);
+		axisHomeBrowseButton.setText(CodegenWizardPlugin
+				.getResourceString("page3.outselection.browse"));
+		axisHomeBrowseButton.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent e) {
+				handleAxisHomeBrowse();
+			}
+		});
+		
+		axisLoadLibsButton = new Button(container, SWT.PUSH);
+		axisLoadLibsButton.setText(CodegenWizardPlugin
+				.getResourceString("page3.loadlibs.browse"));
+		axisLoadLibsButton.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent e) {
+				handleLoadLibsBrowse();
+			}
+		});
+		
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan = 2;
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		axisLoadLibResultsLabel = new Label(container, SWT.NULL);
+		axisLoadLibResultsLabel	.setText("");
+		axisLoadLibResultsLabel.setLayoutData(gd);
+		
+		//filling label 
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan = 3;
+		Label fillLabel2 = new Label(container, SWT.HORIZONTAL | SWT.SEPARATOR);
+		fillLabel2.setLayoutData(gd);
+		
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan = 3;
+		jarCreationButton= new Button(container, SWT.CHECK);
+		jarCreationButton.setText(CodegenWizardPlugin
+				.getResourceString("page3.jarcreation.caption"));
+		jarCreationButton.setToolTipText(CodegenWizardPlugin
+				.getResourceString("page3.jarcreation.desc"));
+		jarCreationButton.setLayoutData(gd);
+		jarCreationButton.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent e) {
+				handlejarCreationCheckBox();
+			}
+		});
+		
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		jarFileNameLabel = new Label(container, SWT.NULL);
+		jarFileNameLabel
+				.setText(CodegenWizardPlugin
+						.getResourceString("page3.jarname.caption"));
+				
+		jarFileNameText = new Text(container, SWT.BORDER);
+		jarFileNameText.setLayoutData(gd);
+		jarFileNameText.setText(settings.get(PREF_JAR_FILE_NAME));
+		jarFileNameText.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				settings.put(PREF_JAR_FILE_NAME, jarFileNameText.getText());
+				handleAxisHomeModifyEvent();
+			}
+		});
+		
+		//filling label 
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan = 3;
+		Label fillLabel3 = new Label(container, SWT.HORIZONTAL | SWT.SEPARATOR);
+		fillLabel3.setLayoutData(gd);
+		
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalSpan = 3; 
+		Label hintLabel = new Label(container, SWT.NULL);
+		hintLabel
+				.setText(CodegenWizardPlugin
+						.getResourceString("page3.hint.caption"));
+		hintLabel.setLayoutData(gd);
+		
+		
+		disableControls();
+		
 		setControl(container);
 
 		/*
@@ -135,6 +334,30 @@
 		return outputLocation.getText();
 	}
 
+	public String getAxisHomeLocation() {
+		return axisHomeLocation.getText();
+	}
+	
+	public String getJarFilename() {
+		return jarFileNameText.getText();
+	}
+	
+	public boolean getAxis2PluginLibCopyCheckBoxSelection(){
+		return settings.getBoolean(PREF_CHECK_AXIS_PLUGIN_LIB_COPY);
+	}
+	
+	public boolean getAxisLibCopyCheckBoxSelection(){
+		return settings.getBoolean(PREF_CHECK_AXIS_LIB_COPY);
+	}
+	
+	public boolean getCreateJarCheckBoxSelection(){
+		return settings.getBoolean(PREF_CHECK_JAR_CREATION);
+	}
+	
+	public boolean oktoLoadLibs(){
+		return jarFileCopyOption;
+	}
+	
 	/**
 	 * Worker method for handling modifications to the textbox
 	 * 
@@ -149,13 +372,121 @@
 		updateStatus(null);
 	}
 
+	
+	private void handleAxisHomeModifyEvent() {
+		String text = this.axisHomeLocation.getText();
+		if ((text == null) || (text.trim().equals(""))) {
+			updateStatus(org.apache.axis2.tool.codegen.eclipse.plugin.CodegenWizardPlugin
+					.getResourceString("page3.error.nolocation"));
+			return;
+		}
+		updateStatus(null);
+	}
+
+	private void handleCheckboxSelection() {
+		if (workspaceProjectOptionsButton.getSelection()) {
+			settings.put(PREF_CHECK_WORKSPACE, true);
+			settings.put(PREF_CHECK_FILE_SYSTEM, false);
+			workspaceSaveOption = true;
+		} else if (filesyStemOptionsButton.getSelection()) {
+			settings.put(PREF_CHECK_FILE_SYSTEM, true);
+			settings.put(PREF_CHECK_WORKSPACE, false);
+			workspaceSaveOption = false;
+		}
+	}
+	
+	
+	private void handlejarCheckBox() {
+		if(copyLibButton.getSelection()){
+			enableControls();
+			settings.put(PREF_CHECK_AXIS_LIB_COPY, true);
+		}else{
+			disableControls();
+			settings.put(PREF_CHECK_AXIS_LIB_COPY, false);
+		}
+	}
+	
+	private void handleCopyPluginLibsCheckBox() {
+		if(copyPluginLibButton.getSelection()){
+			settings.put(PREF_CHECK_AXIS_PLUGIN_LIB_COPY, true);
+		}else{
+			settings.put(PREF_CHECK_AXIS_PLUGIN_LIB_COPY, false);
+		}
+	}
+	
+	private void handlejarCreationCheckBox() {
+		if(jarCreationButton.getSelection()){
+			settings.put(PREF_CHECK_JAR_CREATION, true);
+		}else{
+			settings.put(PREF_CHECK_JAR_CREATION, false);
+		}
+	}
+	
+	private void disableControls(){
+		this.axisHomeBrowseButton.setEnabled(false);
+		this.axisHomeLocation.setEnabled(false);
+		this.jarCreationButton.setEnabled(false);
+		this.axisHomeLabel.setEnabled(false);
+		this.axisLoadLibResultsLabel.setEnabled(false);
+		this.axisLoadLibsButton.setEnabled(false);
+		this.jarFileNameLabel.setEnabled(false);
+		this.jarFileNameText.setEnabled(false);
+	}
+	
+	private void enableControls(){
+		this.axisHomeBrowseButton.setEnabled(true);
+		this.axisHomeLocation.setEnabled(true);
+		this.jarCreationButton.setEnabled(true);
+		this.axisHomeLabel.setEnabled(true);
+		this.axisLoadLibResultsLabel.setEnabled(true);
+		this.axisLoadLibsButton.setEnabled(true);
+		this.jarFileNameLabel.setEnabled(true);
+		this.jarFileNameText.setEnabled(true);
+	}
+	
+	private void handleAxisHomeBrowse() {
+			DirectoryDialog dialog = new DirectoryDialog(this.getShell());
+			String returnString = dialog.open();
+			if (returnString != null) {
+				axisHomeLocation.setText(returnString);
+				settings.put(PREF_AXIS_HOME_OUTPUT_LOCATION, returnString);
+			}
+	}
+	
+	private void handleLoadLibsBrowse() {
+		String axis_home = settings.get(PREF_AXIS_HOME_OUTPUT_LOCATION);
+		String axis_target_lib=axis_home+"/target/lib";
+
+		File axis_libs_directory = new File(axis_target_lib);
+		 if (axis_libs_directory.isDirectory()) {
+			 axisLoadLibResultsLabel.setText("Axis libs loadded successfully !!");
+			 jarFileCopyOption =true;
+		 }else{
+			 axisLoadLibResultsLabel.setText("Axis libs are not available, try maven goal create-lib !!");
+			 jarFileCopyOption=false;
+		 }
+	}
+
+	
 	/**
 	 * Handle the browse button events: opens a dialog where the user can choose
 	 * an external directory location
 	 * 
 	 */
 	private void handleBrowse() {
-		boolean location = locationSelectCheckBox.getSelection();
+		// Change this to add the clarity of 2 option buttions
+		// boolean location = locationSelectCheckBox.getSelection();
+		boolean location = false;
+		if(settings.getBoolean(PREF_CHECK_FILE_SYSTEM)){
+			location = false;
+		}else if(settings.getBoolean(PREF_CHECK_WORKSPACE)){
+			location = true;
+		}
+
+		if (workspaceSaveOption) {
+			location = true;
+		}
+
 		if (!location) {
 			DirectoryDialog dialog = new DirectoryDialog(this.getShell());
 			String returnString = dialog.open();
@@ -164,12 +495,9 @@
 			}
 		} else {
 			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-			
+
 			ContainerSelectionDialog dialog = new ContainerSelectionDialog(
-					getShell(),
-					root,
-					false,
-					CodegenWizardPlugin
+					getShell(), root, false, CodegenWizardPlugin
 							.getResourceString("page3.containerbox.title"));
 			if (dialog.open() == ContainerSelectionDialog.OK) {
 				Object[] result = dialog.getResult();

Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/WSDLFileSelectionPage.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/WSDLFileSelectionPage.java?view=diff&rev=453307&r1=453306&r2=453307
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/WSDLFileSelectionPage.java (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/WSDLFileSelectionPage.java Thu Oct  5 11:24:22 2006
@@ -37,8 +37,7 @@
 
 public class WSDLFileSelectionPage extends AbstractWizardPage {
 
-    private Text fileText;
-
+    private Text fileText; 
 
    
     /**
@@ -68,13 +67,21 @@
         GridLayout layout = new GridLayout();
         container.setLayout(layout);
         layout.numColumns = 3;
-        layout.verticalSpacing = 9;
+        //layout.verticalSpacing = 9;
 
+      
         GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+        gd.horizontalSpan = 3;
         Label label = new Label(container, SWT.NULL);
         label.setText(CodegenWizardPlugin
+                .getResourceString("page1.discription.label"));
+        label.setLayoutData(gd);
+        
+        gd = new GridData(GridData.FILL_HORIZONTAL);
+        Label labelFile = new Label(container, SWT.NULL);
+        labelFile.setText(CodegenWizardPlugin
                 .getResourceString("page1.fileselection.label"));
-
+        
         fileText = new Text(container, SWT.BORDER | SWT.SINGLE);
         fileText.setLayoutData(gd);
         fileText.setText(settings.get(PREF_WSDL_LOCATION));
@@ -162,4 +169,4 @@
     }
     
     
-}
\ No newline at end of file
+}

Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/ClassFileReader.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/ClassFileReader.java?view=diff&rev=453307&r1=453306&r2=453307
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/ClassFileReader.java (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/ClassFileReader.java Thu Oct  5 11:24:22 2006
@@ -14,75 +14,75 @@
 * limitations under the License.
 */
 
-package org.apache.axis2.tool.codegen.eclipse.util;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.List;
-
-/**
- * A utility class for reading/loading classes and
- * extracting the information.
- *
- */
-public class ClassFileReader {
-
-	/**
-	 * try whether a given class can be loaded from the given location
-	 * @param className
-	 * @param classPathEntries
-	 * @param errorListener
-	 * @return
-	 */
-	public static boolean tryLoadingClass(String className,
-			String[] classPathEntries, List errorListener) {
-		//make a URL class loader from the entries
-		ClassLoader classLoader;
-
-		if (classPathEntries.length > 0) {
-			URL[] urls = new URL[classPathEntries.length];
-
-			try {
-				for (int i = 0; i < classPathEntries.length; i++) {
-					String classPathEntry = classPathEntries[i];
-					//this should be a file(or a URL)
-					if (classPathEntry.startsWith("http://")) {
-						urls[i] = new URL(classPathEntry);
-					} else {
-						urls[i] = new File(classPathEntry).toURL();
-					}
-				}
-			} catch (MalformedURLException e) {
-				if (errorListener!=null){
-					errorListener.add(e);
-				}
-				return false;
-			}
-
-			classLoader = new URLClassLoader(urls);
-
-		} else {
-			classLoader = Thread.currentThread().getContextClassLoader();
-		}
-		
-		//try to load the class with the given name
-		
-		try {
-			Class clazz=classLoader.loadClass(className);
-			clazz.getMethods();
-		    
-			
-		} catch (Throwable t) {
-			if (errorListener!=null){
-				errorListener.add(t);
-			}
-			return false;
-		}
-
-		return true;
-
-	}
-
-}
+package org.apache.axis2.tool.codegen.eclipse.util;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.List;
+
+/**
+ * A utility class for reading/loading classes and
+ * extracting the information.
+ *
+ */
+public class ClassFileReader {
+
+	/**
+	 * try whether a given class can be loaded from the given location
+	 * @param className
+	 * @param classPathEntries
+	 * @param errorListener
+	 * @return
+	 */
+	public static boolean tryLoadingClass(String className,
+			String[] classPathEntries, List errorListener) {
+		//make a URL class loader from the entries
+		ClassLoader classLoader;
+
+		if (classPathEntries.length > 0) {
+			URL[] urls = new URL[classPathEntries.length];
+
+			try {
+				for (int i = 0; i < classPathEntries.length; i++) {
+					String classPathEntry = classPathEntries[i];
+					//this should be a file(or a URL)
+					if (classPathEntry.startsWith("http://")) {
+						urls[i] = new URL(classPathEntry);
+					} else {
+						urls[i] = new File(classPathEntry).toURL();
+					}
+				}
+			} catch (MalformedURLException e) {
+				if (errorListener!=null){
+					errorListener.add(e);
+				}
+				return false;
+			}
+
+			classLoader = new URLClassLoader(urls);
+
+		} else {
+			classLoader = Thread.currentThread().getContextClassLoader();
+		}
+		
+		//try to load the class with the given name
+		
+		try {
+			Class clazz=classLoader.loadClass(className);
+			clazz.getMethods();
+		    
+			
+		} catch (Throwable t) {
+			if (errorListener!=null){
+				errorListener.add(t);
+			}
+			return false;
+		}
+
+		return true;
+
+	}
+
+}

Modified: webservices/axis2/branches/java/1_1/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/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/NamespaceFinder.java?view=diff&rev=453307&r1=453306&r2=453307
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/NamespaceFinder.java (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/NamespaceFinder.java Thu Oct  5 11:24:22 2006
@@ -14,40 +14,40 @@
 * limitations under the License.
 */
 
-package org.apache.axis2.tool.codegen.eclipse.util;
-
-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 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
-		String nsUri = "";
-		for(int i=classNameParts.length-1;i>=0;i--){
-			nsUri = nsUri + classNameParts[i] + (i==0?"":".");
-		}
-		
-		return NS_PREFIX + nsUri;
-		
-		
-	}
-	
-	public static String getSchemaTargetNamespaceFromClass(String fullyQualifiedClassName){
-		return getTargetNamespaceFromClass(fullyQualifiedClassName) +SCHEMA_NS_SUFFIX;
-	}
-
-	public static String getDefaultSchemaNamespacePrefix(){
-		return SCHEMA_NS_DEFAULT_PREFIX;
-	}
-	
-	public static String getDefaultNamespacePrefix(){
-		return NS_DEFAULT_PREFIX;
-	}
-}
+package org.apache.axis2.tool.codegen.eclipse.util;
+
+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 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
+		String nsUri = "";
+		for(int i=classNameParts.length-1;i>=0;i--){
+			nsUri = nsUri + classNameParts[i] + (i==0?"":".");
+		}
+		
+		return NS_PREFIX + nsUri;
+		
+		
+	}
+	
+	public static String getSchemaTargetNamespaceFromClass(String fullyQualifiedClassName){
+		return getTargetNamespaceFromClass(fullyQualifiedClassName) +SCHEMA_NS_SUFFIX;
+	}
+
+	public static String getDefaultSchemaNamespacePrefix(){
+		return SCHEMA_NS_DEFAULT_PREFIX;
+	}
+	
+	public static String getDefaultNamespacePrefix(){
+		return NS_DEFAULT_PREFIX;
+	}
+}

Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/SettingsConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/SettingsConstants.java?view=diff&rev=453307&r1=453306&r2=453307
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/SettingsConstants.java (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/SettingsConstants.java Thu Oct  5 11:24:22 2006
@@ -30,6 +30,12 @@
     static final String PREF_TOOL_SELECTION_WSDL2JAVA = "PREF_TOOL_SELECTION_WSDL2JAVA";
 
     static final String PREF_TOOL_SELECTION_JAVA2WSDL = "PREF_TOOL_SELECTION_JAVA2WSDL";
+    
+    // ######################################################################
+//     Codegen Options selection page
+    static final String PREF_OPTION_SELECTION_DEFULT = "PREF_OPTION_SELECTION_DEFULT";
+
+    static final String PREF_OPTION_SELECTION_CUSTOM = "PREF_OPTION_SELECTION_CUSTOM";
 
     // ######################################################################
     // Output selection page
@@ -108,12 +114,19 @@
     //output page
     static final String JAVA_OUTPUT_WSDL_NAME = "OUTPUT_WSDL";
     static final String PREF_JAVA_OUTPUT_WSDL_LOCATION = "OUTPUT_WSDL_LOCATION";
-    static final String PREF_JAVA_OUTPUT_SELECTION = "OUTPUT_WSDL_LOCATION_SELECT";
+    static final String PREF_JAVA_OUTPUT_FILESYATEM= "OUTPUT_WSDL_LOCATION_FILESYATEM";
+    static final String PREF_JAVA_OUTPUT_WORKSPACE = "OUTPUT_WSDL_LOCATION_WORKSPACE";
     // ##################################################################################
     // Page constants
      static final int WSDL_2_JAVA_TYPE = 1;
      static final int JAVA_2_WSDL_TYPE = 2;
      static final int UNSPECIFIED_TYPE = 3;
+     
+     // ##################################################################################
+     // Codegen Options constants
+      static final int CODEGEN_DEFAULT_TYPE = 11;
+      static final int CODEGEN_CUSTOM_TYPE = 12;
+      static final int CODEGEN_UNDECLEARED_TYPE = 13;
     
     // ##################################################################################
     // WSDL Mode constants
@@ -125,5 +138,24 @@
      static final String WSDL_STYLE_DOCUMENT="Document";
      static final String WSDL_STYLE_RPC="rpc";
      static final String WSDL_STYLE_WRAPPED="wrapped";
+
+     // ###########################################################
+     static final String PREF_CHECK_WORKSPACE ="PREF_CHECK_WORKSPACE";
+     
+     static final String PREF_CHECK_FILE_SYSTEM ="PREF_CHECK_FILE_SYSTEM";
+
+     static final String PREF_CHECK_AXIS_LIB_COPY ="PREF_CHECK_FILE_SYSTEM";
+     
+     static final String PREF_CHECK_JAR_CREATION ="PREF_CHECK_FILE_SYSTEM";
+     
+     static final String PREF_AXIS_HOME_OUTPUT_LOCATION = "PREF_OUTPUT_LOCATION";
+     
+     static final String PREF_JAR_FILE_NAME = "PREF_OUTPUT_LOCATION";
+     
+     static final String PREF_CODEGEN_OPTION_INDEX = "PREF_CODEGEN_OPTION_INDEX";
+     
+     static final String PREF_CHECK_AXIS_PLUGIN_LIB_COPY ="PREF_CHECK_AXIS_PLUGIN_LIB_COPY";
+     
+     
     
 }

Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/UIConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/UIConstants.java?view=diff&rev=453307&r1=453306&r2=453307
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/UIConstants.java (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/UIConstants.java Thu Oct  5 11:24:22 2006
@@ -26,6 +26,20 @@
     public static final String DATA_BINDING_JIBX = "jibx" ;
     public static final String DATA_BINDING_JAXME = "jaxme" ;
     
-    
-
+	// Selected Option by the user at the previous page (default/false Custom/true)
+	public static boolean selectedOption = false;
+	
+	//codegen options
+	public static final String DEFAULT = "default" ;
+	public static final String CUSTOM = "custom" ;
+	
+	//Default package name 
+	public static final String DEFAULT_PACKAGENAME = "org.example.webservice" ;
+	
+	//Folder names
+	public static final String LIB = "lib" ;
+	public static final String TARGET = "target" ;
+	public static final String PLUGINS = "plugins" ;
+	public static final String AXIS_CODEGEN_PLUGIN_FOLDER = "Axis2_Codegen_Wizard_1.2.0" ;
+	
 }

Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/WSDLPropertyReader.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/WSDLPropertyReader.java?view=diff&rev=453307&r1=453306&r2=453307
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/WSDLPropertyReader.java (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/WSDLPropertyReader.java Thu Oct  5 11:24:22 2006
@@ -14,97 +14,98 @@
 * limitations under the License.
 */
 
-package org.apache.axis2.tool.codegen.eclipse.util;
-
-import org.apache.axis2.util.URLProcessor;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-
-
-/**
- * This class presents a convenient way of reading the 
- * WSDL file(url) and producing a useful set of information
- * It does NOT use any of the standard WSDL classes from 
- * Axis2, rather it uses wsdl4j to read the wsdl and extract 
- * the properties (This is meant as a convenience for the UI
- * only. We may not need the whole conversion the WSDLpump 
- * goes through)
- * One would need to change this to suit a proper WSDL 
- */
-public class WSDLPropertyReader {
-    private Definition wsdlDefinition = null;
-    
-	public void readWSDL(String filepath) throws Exception{
-		WSDLReader reader = WSDLFactory.newInstance().newWSDLReader();
-		wsdlDefinition = reader.readWSDL(filepath); 
-	}
-	
-	/**
-	 * Returns the namespace map from definition
-	 * @return
-	 */
-	public Map getDefinitionNamespaceMap(){
-		return wsdlDefinition.getNamespaces();
-	}
-	
-	/**
-	 * get the default package derived by the targetNamespace
-	 */
-	public String packageFromTargetNamespace(){
-		return  URLProcessor.makePackageName(wsdlDefinition.getTargetNamespace());
-		
-	}
-	/**
-	 * Returns a list of service names
-	 * the names are QNames
-	 * @return
-	 */
-	public List getServiceList(){
-		List returnList = new ArrayList();
-		Service service = null;
-		Map serviceMap = wsdlDefinition.getServices();
-		if(serviceMap!=null && !serviceMap.isEmpty()){
-		   Iterator serviceIterator = serviceMap.values().iterator();
-		   while(serviceIterator.hasNext()){
-			   service = (Service)serviceIterator.next();
-			   returnList.add(service.getQName());
-		   }
-		}
-		
-		return returnList;
-	}
-
-	/**
-	 * Returns a list of ports for a particular service
-	 * the names are QNames
-	 * @return
-	 */
-	public List getPortNameList(QName serviceName){
-		List returnList = new ArrayList();
-		Service service = wsdlDefinition.getService(serviceName);
-		Port port = null; 
-		if(service!=null){
-		   Map portMap = service.getPorts();
-		   if (portMap!=null && !portMap.isEmpty()){
-			   Iterator portIterator = portMap.values().iterator();
-			   while(portIterator.hasNext()){
-				 port = (Port)portIterator.next();
-				 returnList.add(port.getName());
-			   }
-		   }
-		  
-		}
-		
-		return returnList;
-	}
-}
+package org.apache.axis2.tool.codegen.eclipse.util;
+
+import org.apache.axis2.util.URLProcessor;
+
+import javax.wsdl.Definition;
+import javax.wsdl.Port;
+import javax.wsdl.Service;
+import javax.wsdl.factory.WSDLFactory;
+import javax.wsdl.xml.WSDLReader;
+import javax.xml.namespace.QName;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+
+
+/**
+ * This class presents a convenient way of reading the 
+ * WSDL file(url) and producing a useful set of information
+ * It does NOT use any of the standard WSDL classes from 
+ * Axis2, rather it uses wsdl4j to read the wsdl and extract 
+ * the properties (This is meant as a convenience for the UI
+ * only. We may not need the whole conversion the WSDLpump 
+ * goes through)
+ * One would need to change this to suit a proper WSDL 
+ */
+public class WSDLPropertyReader {
+    private Definition wsdlDefinition = null;
+    
+	public void readWSDL(String filepath) throws Exception{
+		WSDLReader reader = WSDLFactory.newInstance().newWSDLReader();
+		wsdlDefinition = reader.readWSDL(filepath); 
+	}
+	
+	/**
+	 * Returns the namespace map from definition
+	 * @return
+	 */
+	public Map getDefinitionNamespaceMap(){
+		return wsdlDefinition.getNamespaces();
+	}
+	
+	/**
+	 * get the default package derived by the targetNamespace
+	 */
+	public String packageFromTargetNamespace(){
+		return  URLProcessor.makePackageName(wsdlDefinition.getTargetNamespace());
+		
+	}
+	
+	/**
+	 * Returns a list of service names
+	 * the names are QNames
+	 * @return
+	 */
+	public List getServiceList(){
+		List returnList = new ArrayList();
+		Service service = null;
+		Map serviceMap = wsdlDefinition.getServices();
+		if(serviceMap!=null && !serviceMap.isEmpty()){
+		   Iterator serviceIterator = serviceMap.values().iterator();
+		   while(serviceIterator.hasNext()){
+			   service = (Service)serviceIterator.next();
+			   returnList.add(service.getQName());
+		   }
+		}
+		
+		return returnList;
+	}
+
+	/**
+	 * Returns a list of ports for a particular service
+	 * the names are QNames
+	 * @return
+	 */
+	public List getPortNameList(QName serviceName){
+		List returnList = new ArrayList();
+		Service service = wsdlDefinition.getService(serviceName);
+		Port port = null; 
+		if(service!=null){
+		   Map portMap = service.getPorts();
+		   if (portMap!=null && !portMap.isEmpty()){
+			   Iterator portIterator = portMap.values().iterator();
+			   while(portIterator.hasNext()){
+				 port = (Port)portIterator.next();
+				 returnList.add(port.getName());
+			   }
+		   }
+		  
+		}
+		
+		return returnList;
+	}
+}

Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/resource/Codegen.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/resource/Codegen.properties?view=diff&rev=453307&r1=453306&r2=453307
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/resource/Codegen.properties (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/resource/Codegen.properties Thu Oct  5 11:24:22 2006
@@ -1,115 +1,145 @@
-#############################################################################
-################### Property file for the Axis2 Code generator ##############
-#############################################################################
-##
-#General
-general.Error=Error
-general.Error.prefix=An error occured while code generating
-general.name=Axis2 Codegen Wizard
-general.browse=Browse...
-general.search=Search..
-general.invalid.state=Invalid state!
-general.useraborted.state=User aborted!
-############################################################################
-# Initial tool selection page - Page0
-# Tool selection
-page0.name=Axis2 Code generation wizard
-page0.title=Select the wizard
-page0.desc=Welcome to the Axis2 code generator wizard. 
-#
-page0.options.desc=Please specify what you want to do. You can generate java code from a WSDL or WSDL from a Java source file
-page0.java2wsdl.desc=Select this option if you already have a java source file and need to generate a WSDL 
-page0.java2wsdl.caption=Generate a WSDL from a Java source file
-#
-page0.wsdl2java.desc=Select this option if you need to generate stubs/skeletons from a WSDL 
-page0.wsdl2java.caption=Generate Java source code from a WSDL file
-############################################################################
-#WSDL selection page - Page1
-#WSDL selection page name
-page1.name=page1
-page1.title=WSDL selection page
-page1.desc=Welcome to the Axis2 code generator wizard. Select the WSDL file
-#labels
-page1.fileselection.label=&WSDL file:
-page1.fileselection.browse=Browse...
-#Errors
-page1.error.filemissingerror=File name should be specified
-page1.error.wrongextension=File extension must be wsdl
-#
-###################################################################
-#Options - Page2
-page2.name=page2
-page2.title=Options
-page2.desc=Set the options for the code generator
-#labels
-page2.language.caption=Select the output language
-page2.syncAsync.caption=Generate both sync and async
-page2.sync.caption=Generate sync style only
-page2.async.caption=Generate async style only
-page2.package.caption=Custom package name
-page2.namespace.caption=Namespace
-page2.namespace2Pkg.caption=Namespace to package mappings
-page2.serverside.caption=Generate serverside code
-page2.serviceXML.caption=Generate a default services.xml
-page2.testcase.caption=Generate a test case
-page2.databindingCheck.caption=Databinding Name
-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
-####################################################################### 
-#Output location selection - Page3  
-page3.name=page3
-page3.title=Output
-page3.desc=Set the output project for the generated code
-#lables
-page3.output.caption=Output path
-page3.outselection.browse=Browse...
-page3.containerbox.title=Select new file container
-page3.browseWorkspace.title=Browse Workspace projects only
-#errors
-page3.error.nolocation=output location needs to be specified
-#
-##########################################################################
-#java source file selection = page 4
-page4.name=page4
-page4.title=Java source/classpath selection
-page4.desc=Select the classes and the libraries
-#labels
-page4.classpath.label=Java Class path Entries. Select either folders or jar files
-page4.classname.label=Class name
-page4.addDir.label=Add Folder
-page4.addJar.label=Add Jar
-page4.removeEntry.label=Remove
-page4.error.invalidClassName=Fully qualified class name needs to be specified!
-page4.error.ClassNameNotTerminated=Class name is not properly terminated!
-page4.tryLoad.label=Test Class Loading..
-page4.unknownError.label=Unknown error!
-page4.successLoading.label=Class file can be loaded successfully
-###############################################################
-#java2wsdl options = page 5
-page5.name=page5
-page5.title=Java to WSDL Options
-page5.desc=Set the Options for the generator
-page5.targetNamespace.label=Target Namespace
-page5.targetNamespacePrefix.label=Target Namespace Prefix
-page5.schemaTargetNs.label=Schema target namespace
-page5.schemaTargetNsPrefix.label=Schema target namespace Prefix
-page5.serviceName.label=Service Name
-
-###############################################################
-#java2wsdl output location - page 6
-page6.name=page6
-page6.title=WSDL file output location
-page6.desc=Select the location for the generated WSDL.
-####
-page6.output.label=Output Location
-page6.outputname.label=Output File Name
-page6.selectOption.label=Browse Workspace projects only
-#Wizard
-generator.generating=Generating code...
-generator.readingWOM=Reading WSDL file...
-#Success message
-wizard.success=Code generation successful!
+#############################################################################
+################### Property file for the Axis2 Code generator ##############
+#############################################################################
+##
+#General
+general.Error=Error
+general.Error.prefix=An error occured while code generating
+general.name=Axis2 Codegen Wizard
+general.browse=Browse...
+general.search=Search..
+general.invalid.state=Invalid state!
+general.useraborted.state=User aborted!
+############################################################################
+# Initial tool selection page - Page0
+# Tool selection
+page0.name=Axis2 Code generation wizard
+page0.title=Select the wizard
+page0.desc=Welcome to the Axis2 code generator wizard. 
+#
+page0.options.desc=Please specify what you want to do. \nHint : You can generate java code from a WSDL or WSDL from a Java source file
+page0.java2wsdl.desc=Select this option if you already have a java source file and need to generate a WSDL 
+page0.java2wsdl.caption=Generate a WSDL from a Java source file
+#
+page0.wsdl2java.desc=Select this option if you need to generate stubs/skeletons from a WSDL 
+page0.wsdl2java.caption=Generate Java source code from a WSDL file
+############################################################################
+#WSDL selection page - Page1
+#WSDL selection page name
+page1.name=page1
+page1.title=WSDL selection page
+page1.desc=Welcome to the Axis2 code generator wizard. Select the WSDL file
+#labels
+page1.fileselection.label=&WSDL file:
+page1.discription.label= Please select the wsdl file : 
+page1.fileselection.browse=Browse...
+#Errors
+page1.error.filemissingerror=File name should be specified
+page1.error.wrongextension=File extension must be wsdl
+#
+####################################################################### 
+#Options - page3
+page2.name=page3
+page2.title=Options
+page2.desc=Set the options for the code generator
+#labels
+page2.language.caption=Select the output language
+page2.syncAsync.caption=Generate both sync and async
+page2.sync.caption=Generate sync style only
+page2.async.caption=Generate async style only
+page2.package.caption=Custom package name
+page2.namespace.caption=Namespace
+page2.namespace2Pkg.caption=Namespace to package mappings
+page2.serverside.caption=Generate serverside code
+page2.clientside.caption=Client Side Options
+page2.serviceXML.caption=Generate a default services.xml
+page2.testcase.caption=Generate a test case
+page2.databindingCheck.caption=Databinding Name
+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
+#
+page2.options.desc=Select the codegen option
+page2.default.desc=Select this to codegen by accpting the default options
+page2.default.caption=Default Codegen Options
+#
+page2.custom.desc=Select this option if you need to customize the codegen options
+page2.custom.caption=Custom Codegen Options
+####################################################################### 
+#Output location selection - page4  
+page3.name=page4
+page3.title=Output
+page3.desc=Set the output location for the generated code
+#lables
+page3.output.caption=Output path
+page3.axishome.caption=Axis Home
+page3.jarname.caption=Jar File Name
+page3.outselection.browse=Browse...
+page3.loadlibs.browse=Check Libs...
+page3.containerbox.title=Select new file container
+page3.workspace.caption=Browse and Add the source to a project on current eclipse workspace
+page3.workspace.desc=Select this to add the godegen results under a project on current eclipse workspace
+page3.filesystem.caption=Browse and Save the codegen results on local filesystem
+page3.filesystem.desc=Select this to save the results of the codegen on local filesystem
+page3.addaxislib.caption=Add Axis2 libraries to the codegen result project
+page3.addaxislib.desc=Click this to Copy the Axis2 Libraries to the created project library
+page3.jarcreation.caption=Create a jar file of codegen result project and add to output location lib
+page3.jarcreation.desc=Click this to create a jar file of the godegen results and put that in output location
+page3.copypluginlib.caption=Add the Axis2 codegen jars to the codegen reulted project
+page3.copypluginlib.desc=Click this to add all the Axis2 libs in to the generated project as the result ofcodegen
+page3.hint.caption=Hint : If you are adding the codegen results to a eclipse project on current eclipse workspace \n  Please make sure to refresh that perticular eclipse project. Also if you select the options to \n  add libs to the project, make sure to add those libs to the project library path.
+#errors
+page3.error.nolocation=output location needs to be specified
+#
+##########################################################################
+#java source file selection = page5
+page4.name=page5
+page4.title=Java source/classpath selection
+page4.desc=Select the classes and the libraries
+#labels
+page4.classpath.label=Java Class path Entries. Select either folders or jar files
+page4.classname.label=Fully Qualified Class name
+page4.addDir.label=Add Folder
+page4.addJar.label=Add Jar
+page4.removeEntry.label=Remove
+page4.error.invalidClassName=Fully qualified class name needs to be specified!
+page4.error.ClassNameNotTerminated=Class name is not properly terminated!
+page4.tryLoad.label=Test Class Loading..
+page4.unknownError.label=Unknown error!
+page4.successLoading.label=Class file can be loaded successfully
+page4.hint.caption=Hint : Please give the fully qualified class name ex:com.foo.BarService\n         Then add the folder or the jar file contain that class file \n         Finally check the class file can be loaded from the plugin
+
+###############################################################
+#java2wsdl options = page6
+page5.name=page6
+page5.title=Java to WSDL Options
+page5.desc=Set the Options for the generator
+page5.targetNamespace.label=Target Namespace
+page5.targetNamespacePrefix.label=Target Namespace Prefix
+page5.schemaTargetNs.label=Schema target namespace
+page5.schemaTargetNsPrefix.label=Schema target namespace Prefix
+page5.serviceName.label=Service Name
+
+###############################################################
+#java2wsdl output location - page7
+page6.name=page7
+page6.title=WSDL file output location
+page6.desc=Select the location for the generated WSDL.
+####
+page6.output.label=Output Location
+page6.outputname.label=Output File Name
+page6.workspace.caption=Browse and Add the WSDL to a project on current eclipse workspace
+page6.workspace.desc=Select this to add the WSDL file under a project on current eclipse workspace
+page6.filesystem.caption=Browse and Save the WSDL file on local filesystem
+page6.filesystem.desc=Select this to save the resulted WSDL on local filesystem
+#Wizard
+generator.generating=Generating code...
+generator.readingWOM=Reading WSDL file...
+#Success message
+wizard.success=Code generation successful!
+
+##############################################################
+

Modified: webservices/axis2/branches/java/1_1/modules/tool/conf/codegen/build.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/conf/codegen/build.properties?view=diff&rev=453307&r1=453306&r2=453307
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/conf/codegen/build.properties (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/conf/codegen/build.properties Thu Oct  5 11:24:22 2006
@@ -1,10 +1,61 @@
-source.Axis2CodegenWizard.jar = src/
-output.Axis2CodegenWizard.jar = bin/
-bin.includes = plugin.xml,\
-               Axis2CodegenWizard.jar,\
-               icons/,\
-               lib/,\
-               bin/
-src.includes = icons/,\
-               plugin.xml,\
-               src/
+source.Axis2CodegenWizard.jar = src/
+output.Axis2CodegenWizard.jar = bin/
+bin.includes = plugin.xml,\
+               Axis2CodegenWizard.jar,\
+               icons/,\
+               help_toc.xml,\
+               help/,\
+               lib/,\
+               src/,\
+               lib/activation-1.1.jar,\
+               lib/annogen-0.1.0.jar,\
+               lib/ant-1.6.5.jar,\
+               lib/axiom-api-1.1.1.jar,\
+               lib/axiom-api-SNAPSHOT.jar,\
+               lib/axiom-dom-1.1.1.jar,\
+               lib/axiom-dom-SNAPSHOT.jar,\
+               lib/axiom-impl-1.1.1.jar,\
+               lib/axiom-impl-SNAPSHOT.jar,\
+               lib/axis2-rahas-SNAPSHOT.jar,\
+               lib/axis2-SNAPSHOT.jar,\
+               lib/commons-codec-1.3.jar,\
+               lib/commons-discovery-0.2.jar,\
+               lib/commons-fileupload-1.0.jar,\
+               lib/commons-fileupload-1.1.1.jar,\
+               lib/commons-httpclient-3.0.1.jar,\
+               lib/commons-httpclient-3.0.jar,\
+               lib/commons-io-1.2.jar,\
+               lib/commons-logging-1.1.jar,\
+               lib/jakarta-httpcore-4.0-alpha2.jar,\
+               lib/junit-3.8.1.jar,\
+               lib/junit-3.8.2.jar,\
+               lib/log4j-1.2.13.jar,\
+               lib/mail-1.4.jar,\
+               lib/maven-itest-plugin-1.0.jar,\
+               lib/neethi-SNAPSHOT.jar,\
+               lib/opensaml-1.1.jar,\
+               lib/servletapi-2.3.jar,\
+               lib/stax-api-1.0.1.jar,\
+               lib/stax-api-1.0.jar,\
+               lib/woden-SNAPSHOT.jar,\
+               lib/wsdl4j-1.5.2.jar,\
+               lib/wsdl4j-1.6.1.jar,\
+               lib/wss4j-SNAPSHOT.jar,\
+               lib/wstx-asl-2.9.3.jar,\
+               lib/wstx-asl-3.0.1.jar,\
+               lib/xbean-2.1.0.jar,\
+               lib/xbean-2.2.0.jar,\
+               lib/xml-apis-1.3.02.jar,\
+               lib/xml-apis-1.3.03.jar,\
+               lib/XmlSchema-1.1.jar,\
+               lib/XmlSchema-SNAPSHOT.jar,\
+               lib/xmlsec-1.3.0.jar,\
+               lib/xmlunit-1.0.jar
+src.includes = icons/,\
+               plugin.xml,\
+               src/,\
+               help_toc.xml,\
+               help/,\
+               .project,\
+               .classpath,\
+               build.properties

Modified: webservices/axis2/branches/java/1_1/modules/tool/conf/codegen/plugin.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/conf/codegen/plugin.xml?view=diff&rev=453307&r1=453306&r2=453307
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/conf/codegen/plugin.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/conf/codegen/plugin.xml Thu Oct  5 11:24:22 2006
@@ -11,85 +11,136 @@
       <library name="Axis2CodegenWizard.jar">
          <export name="*"/>
       </library>
+      <library name="lib/activation-1.1.jar">
+         <export name="*"/>
+      </library>
       <library name="lib/annogen-0.1.0.jar">
          <export name="*"/>
       </library>
-      <library name="lib/axiom-dom-1.0.jar">
+      <library name="lib/ant-1.6.5.jar">
          <export name="*"/>
       </library>
-      <library name="lib/axiom-impl-1.0.jar">
+      <library name="lib/axiom-api-1.1.1.jar">
          <export name="*"/>
       </library>
-      <library name="lib/axis2-adb-1.0.jar">
+      <library name="lib/axiom-api-SNAPSHOT.jar">
          <export name="*"/>
       </library>
-      <library name="lib/axis2-codegen-1.0.jar">
+      <library name="lib/axiom-dom-1.1.1.jar">
          <export name="*"/>
       </library>
-      <library name="lib/axis2-common-1.0.jar">
+      <library name="lib/axiom-dom-SNAPSHOT.jar">
          <export name="*"/>
       </library>
-      <library name="lib/axis2-core-1.0.jar">
+      <library name="lib/axiom-impl-1.1.1.jar">
          <export name="*"/>
       </library>
-      <library name="lib/axis2-java2wsdl-1.0.jar">
+      <library name="lib/axiom-impl-SNAPSHOT.jar">
          <export name="*"/>
       </library>
-      <library name="lib/axis2-jibx-1.0.jar">
+      <library name="lib/axis2-rahas-SNAPSHOT.jar">
          <export name="*"/>
       </library>
-      <library name="lib/axis2-xmlbeans-1.0.jar">
+      <library name="lib/axis2-SNAPSHOT.jar">
          <export name="*"/>
       </library>
-      <library name="lib/commons-logging-1.0.4.jar">
+      <library name="lib/commons-codec-1.3.jar">
          <export name="*"/>
       </library>
-      <library name="lib/geronimo-spec-activation-1.0.2-rc4.jar">
+      <library name="lib/commons-discovery-0.2.jar">
          <export name="*"/>
       </library>
-      <library name="lib/jakarta-oro-2.0.8.jar">
+      <library name="lib/commons-fileupload-1.0.jar">
          <export name="*"/>
       </library>
-      <library name="lib/jalopy-1.0b11.jar">
+      <library name="lib/commons-fileupload-1.1.1.jar">
          <export name="*"/>
       </library>
-      <library name="lib/jaxme2-0.5.1.jar">
+      <library name="lib/commons-httpclient-3.0.1.jar">
          <export name="*"/>
       </library>
-      <library name="lib/jaxmeapi-0.5.1.jar">
+      <library name="lib/commons-httpclient-3.0.jar">
          <export name="*"/>
       </library>
-      <library name="lib/jdom.jar">
+      <library name="lib/commons-io-1.2.jar">
          <export name="*"/>
       </library>
-      <library name="lib/jibx-bind-1.1-beta3.jar">
+      <library name="lib/commons-logging-1.1.jar">
          <export name="*"/>
       </library>
-      <library name="lib/jibx-run-1.1-beta3.jar">
+      <library name="lib/jakarta-httpcore-4.0-alpha2.jar">
          <export name="*"/>
       </library>
-      <library name="lib/log4j-1.2.8.jar">
+      <library name="lib/junit-3.8.1.jar">
          <export name="*"/>
       </library>
-      <library name="lib/neethi-1.0.1.jar">
+      <library name="lib/junit-3.8.2.jar">
+         <export name="*"/>
+      </library>
+      <library name="lib/log4j-1.2.13.jar">
+         <export name="*"/>
+      </library>
+      <library name="lib/mail-1.4.jar">
+         <export name="*"/>
+      </library>
+      <library name="lib/maven-itest-plugin-1.0.jar">
+         <export name="*"/>
+      </library>
+      <library name="lib/neethi-SNAPSHOT.jar">
+         <export name="*"/>
+      </library>
+      <library name="lib/opensaml-1.1.jar">
+         <export name="*"/>
+      </library>
+      <library name="lib/servletapi-2.3.jar">
+         <export name="*"/>
+      </library>
+      <library name="lib/stax-api-1.0.1.jar">
          <export name="*"/>
       </library>
       <library name="lib/stax-api-1.0.jar">
          <export name="*"/>
       </library>
+      <library name="lib/woden-SNAPSHOT.jar">
+         <export name="*"/>
+      </library>
       <library name="lib/wsdl4j-1.5.2.jar">
          <export name="*"/>
       </library>
+      <library name="lib/wsdl4j-1.6.1.jar">
+         <export name="*"/>
+      </library>
+      <library name="lib/wss4j-SNAPSHOT.jar">
+         <export name="*"/>
+      </library>
       <library name="lib/wstx-asl-2.9.3.jar">
          <export name="*"/>
       </library>
+      <library name="lib/wstx-asl-3.0.1.jar">
+         <export name="*"/>
+      </library>
       <library name="lib/xbean-2.1.0.jar">
          <export name="*"/>
       </library>
-      <library name="lib/XmlSchema-1.0.2.jar">
+      <library name="lib/xbean-2.2.0.jar">
+         <export name="*"/>
+      </library>
+      <library name="lib/xml-apis-1.3.02.jar">
+         <export name="*"/>
+      </library>
+      <library name="lib/xml-apis-1.3.03.jar">
+         <export name="*"/>
+      </library>
+      <library name="lib/XmlSchema-1.1.jar">
+         <export name="*"/>
+      </library>
+      <library name="lib/XmlSchema-SNAPSHOT.jar">
+         <export name="*"/>
+      </library>
+      <library name="lib/xmlsec-1.3.0.jar">
          <export name="*"/>
       </library>
-      <library name="lib/axiom-api-1.0.jar">
+      <library name="lib/xmlunit-1.0.jar">
          <export name="*"/>
       </library>
    </runtime>



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org