Attachment 69412 Details for Bug 188895 – Updated patch to include the plugin skeleton for axis2

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Updated patch to include the plugin skeleton for axis2

188895.patch (text/plain), 23.09 KB, created by Balan Subramanian

on 2007-05-30 17:50:44 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Balan Subramanian

Created: 2007-05-30 17:50:44 EDT

Size: 23.09 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.apache.axis2
>Index: plugin.properties
>===================================================================
>RCS file: plugin.properties
>diff -N plugin.properties
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ plugin.properties	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,21 @@
>+###############################################################################
>+# Copyright (c) 2006 IBM Corporation and others.
>+# All rights reserved. This program and the accompanying materials
>+# are made available under the terms of the Eclipse Public License v1.0
>+# which accompanies this distribution, and is available at
>+# http://www.eclipse.org/legal/epl-v10.html
>+# 
>+# Contributors:
>+# 	Balan Subramanian (bsubram@us.ibm.com)
>+#     IBM Corporation - initial API and implementation
>+###############################################################################
>+
>+###############################################################################
>+#  JAVA properties
>+###############################################################################
>+
>+# NLS_ENCODING=UTF-8
>+# NLS_MESSAGEFORMAT_VAR
>+
>+plugin.name=Apache Axis2
>+plugin.provider=Eclipse.org
>Index: .project
>===================================================================
>RCS file: .project
>diff -N .project
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ .project	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,22 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<projectDescription>
>+	<name>org.apache.axis2</name>
>+	<comment></comment>
>+	<projects>
>+	</projects>
>+	<buildSpec>
>+		<buildCommand>
>+			<name>org.eclipse.pde.ManifestBuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
>+		<buildCommand>
>+			<name>org.eclipse.pde.SchemaBuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
>+	</buildSpec>
>+	<natures>
>+		<nature>org.eclipse.pde.PluginNature</nature>
>+	</natures>
>+</projectDescription>
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: META-INF/MANIFEST.MF
>diff -N META-INF/MANIFEST.MF
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ META-INF/MANIFEST.MF	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,7 @@
>+Manifest-Version: 1.0
>+Bundle-ManifestVersion: 2
>+Bundle-Name: %plugin.name
>+Bundle-SymbolicName: org.apache.axis2
>+Bundle-Version: 1.1.0
>+Bundle-Vendor: %plugin.provider
>+Bundle-RequiredExecutionEnvironment: J2SE-1.4
>Index: build.properties
>===================================================================
>RCS file: build.properties
>diff -N build.properties
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ build.properties	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,1 @@
>+bin.includes = META-INF/
>#P org.eclipse.tptp.wsdm.editor
>Index: src/org/eclipse/tptp/wsdm/tooling/util/internal/EclipseUtils.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.editor/src/org/eclipse/tptp/wsdm/tooling/util/internal/EclipseUtils.java,v
>retrieving revision 1.1
>diff -u -r1.1 EclipseUtils.java
>--- src/org/eclipse/tptp/wsdm/tooling/util/internal/EclipseUtils.java	1 Feb 2007 05:04:45 -0000	1.1
>+++ src/org/eclipse/tptp/wsdm/tooling/util/internal/EclipseUtils.java	30 May 2007 21:50:19 -0000
>@@ -345,4 +345,18 @@
> 		String ns2 = Activator.getPlugin().getBundle().getSymbolicName();
> 		return ns2;
> 	}
>+	
>+	public static String getPluginResourceLocation(String pluginName, String resourceRelativePath) throws Exception
>+	{
>+		Bundle bundle = Platform.getBundle(pluginName);
>+		if (bundle == null)
>+			throw new Exception(Messages.bind(Messages.UNRESOLVED_BUNDLE_ERROR_, pluginName));
>+		URL url = null;
>+		if(resourceRelativePath == null)
>+			url = FileLocator.find(bundle,new Path(""),null);
>+		else
>+			url = FileLocator.find(bundle,new Path(resourceRelativePath),null);
>+		url = FileLocator.resolve(url);
>+		return url.getFile();
>+	}
> }
>Index: src/org/eclipse/tptp/wsdm/tooling/nls/messages/mrt/internal/Messages.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.editor/src/org/eclipse/tptp/wsdm/tooling/nls/messages/mrt/internal/Messages.java,v
>retrieving revision 1.14
>diff -u -r1.14 Messages.java
>--- src/org/eclipse/tptp/wsdm/tooling/nls/messages/mrt/internal/Messages.java	27 Apr 2007 22:58:07 -0000	1.14
>+++ src/org/eclipse/tptp/wsdm/tooling/nls/messages/mrt/internal/Messages.java	30 May 2007 21:50:19 -0000
>@@ -146,6 +146,7 @@
> 	public static String CODE_GEN_ERROR_AXIS2;
> 	public static String FAILED_TO_INITIALIZE_MUSE_DESCRIPTOR_ERROR_;
> 	public static String CODE_GEN_VALIDATE_SLOCATION;
>+	public static String USE_BUILT_IN_AXIS2_LABEL;
> 	public static String CODEGEN_PREF_SERVERLOC;
> 	public static String CODE_GEN_AXIS2_PROJECT_DIR;
> 	public static String CODE_GEN_AXIS2_LOCATION_ERROR_;
>Index: src/org/eclipse/tptp/wsdm/tooling/nls/messages/mrt/internal/messages.properties
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.editor/src/org/eclipse/tptp/wsdm/tooling/nls/messages/mrt/internal/messages.properties,v
>retrieving revision 1.20
>diff -u -r1.20 messages.properties
>--- src/org/eclipse/tptp/wsdm/tooling/nls/messages/mrt/internal/messages.properties	30 May 2007 19:21:27 -0000	1.20
>+++ src/org/eclipse/tptp/wsdm/tooling/nls/messages/mrt/internal/messages.properties	30 May 2007 21:50:19 -0000
>@@ -140,6 +140,7 @@
> CODE_GEN_ERROR_AXIS2 = IWAT0829E Invalid Axis2 Server Location
> FAILED_TO_INITIALIZE_MUSE_DESCRIPTOR_ERROR_ = IWAT0682E Failed to initialize muse descriptor
> CODE_GEN_VALIDATE_SLOCATION = Validating the Server Location 
>+USE_BUILT_IN_AXIS2_LABEL = Use built-in Apache Axis2 (1.1)
> CODEGEN_PREF_SERVERLOC = Please specify Axis2 server location:
> CODE_GEN_AXIS2_PROJECT_DIR = Please specify server home location
> CODE_GEN_AXIS2_LOCATION_ERROR_ = IWAT0830E Specified location {0} does not exist
>Index: src/org/eclipse/tptp/wsdm/tooling/preferences/internal/Axis2ServerLocationPreferencePage.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.editor/src/org/eclipse/tptp/wsdm/tooling/preferences/internal/Axis2ServerLocationPreferencePage.java,v
>retrieving revision 1.3
>diff -u -r1.3 Axis2ServerLocationPreferencePage.java
>--- src/org/eclipse/tptp/wsdm/tooling/preferences/internal/Axis2ServerLocationPreferencePage.java	30 May 2007 19:21:27 -0000	1.3
>+++ src/org/eclipse/tptp/wsdm/tooling/preferences/internal/Axis2ServerLocationPreferencePage.java	30 May 2007 21:50:19 -0000
>@@ -27,24 +27,31 @@
> import org.eclipse.swt.widgets.DirectoryDialog;
> import org.eclipse.swt.widgets.Label;
> import org.eclipse.swt.widgets.Text;
>-import org.eclipse.tptp.wsdm.tooling.codegen.mrt.internal.Axis2LicenseDialog;
>+import org.eclipse.tptp.wsdm.tooling.codegen.mrt.internal.ISoapServerDependency;
> import org.eclipse.tptp.wsdm.tooling.editor.internal.Activator;
> import org.eclipse.tptp.wsdm.tooling.nls.messages.mrt.internal.Messages;
>+import org.eclipse.tptp.wsdm.tooling.validation.util.internal.ValidationUtils;
> import org.eclipse.ui.IWorkbench;
> import org.eclipse.ui.IWorkbenchPreferencePage;
> 
> /**
>- * The class is used to create the Preference page for the MRT Editor.
>+ * The class is used to create the Preference page for the Axis jars used in code generation.
>  * It is used to set Axis2 Server Location.
>  *
>  */
> public class Axis2ServerLocationPreferencePage extends PreferencePage implements IWorkbenchPreferencePage 
> {
> 
>+	private Button _useBuiltInAxis2Button;
>+	
> 	private Text _serverLocation;
> 	
> 	private Button _browseButton;
> 	
>+	private ISoapServerDependency _axisValidator;
>+	
>+	public static final String USE_BUILT_IN_AXIS2_PREFERENCE_KEY = "MRT_CODE_GEN.USE_BUILT_IN_AXIS2";
>+	
> 	public static final String SERVER_LOCATION_PREFERENCE_KEY = "MRT_CODE_GEN.AXIS2_SERVER_LOCATION";
> 	
> 	/**
>@@ -52,7 +59,6 @@
> 	 */
> 	public Axis2ServerLocationPreferencePage() 
> 	{
>-		init();
> 	}
> 
> 	/**
>@@ -62,13 +68,11 @@
> 	public Axis2ServerLocationPreferencePage(String title) 
> 	{
> 		super(title);
>-		init();
> 	}
> 
> 	public Axis2ServerLocationPreferencePage(String title, ImageDescriptor image) 
> 	{
> 		super(title, image);
>-		init();
> 	}
> 
> 	protected Control createContents(Composite parent) 
>@@ -76,32 +80,37 @@
> 		Composite composite = new Composite(parent, SWT.NONE);
> 		GridLayout layout = new GridLayout();
> 		layout.numColumns = 2;
>-		composite.setLayout(layout);
>+		composite.setLayout(layout);		
> 		
>+		_useBuiltInAxis2Button = new Button(composite, SWT.CHECK);
> 		GridData data = new GridData();
> 		data.horizontalSpan = 2;
> 		data.grabExcessHorizontalSpace = true;
>+		_useBuiltInAxis2Button.setLayoutData(data);
>+		_useBuiltInAxis2Button.setText(Messages.USE_BUILT_IN_AXIS2_LABEL);
>+		_useBuiltInAxis2Button.addSelectionListener(new SelectionAdapter() 
>+		{
>+			public void widgetSelected(SelectionEvent event) 
>+			{
>+				handleUseBuiltInAxis2Button();
>+			}
>+		});
>+		
> 		Label label = new Label(composite, SWT.NONE);
>+		data = new GridData();
>+		data.horizontalSpan = 2;
>+		data.grabExcessHorizontalSpace = true;
> 		label.setLayoutData(data);
> 		String labelText = Messages.CODEGEN_PREF_SERVERLOC;
> 		label.setText(labelText);
> 		
>-		IPreferenceStore store = Activator.getPlugin().getPreferenceStore();
>-		String ss = store.getString(SERVER_LOCATION_PREFERENCE_KEY);
>+		_serverLocation = new Text(composite, SWT.BORDER);
> 		data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
> 		data.grabExcessHorizontalSpace = true;
> 		data.horizontalSpan = 1;
> 		data.widthHint = 240;
>-	
>-		_serverLocation = new Text(composite, SWT.BORDER);
> 		_serverLocation.setLayoutData(data);
> 		
>-		String runtime = "";
>-		if (runtime != null || runtime.length() > 0)
>-			_serverLocation.setText(ss);
>-		else
>-			_serverLocation.setText("");
>-		
> 		_browseButton = new Button(composite, SWT.PUSH);
> 		_browseButton.setText(Messages.HOOKUP_WIZARD_TXT5);
> 		_browseButton.addSelectionListener(new SelectionAdapter() 
>@@ -110,12 +119,52 @@
> 			{
> 				handleLocationBrowseButtonPressed();
> 			}
>-		});		
>+		});
>+		
>+		initializeControls();
>+		
> 		return composite;
> 	}
>+	
>+	private void initializeControls()
>+	{
>+		IPreferenceStore store = Activator.getPlugin().getPreferenceStore();
>+		boolean useBuiltInAxis2 = store.getBoolean(USE_BUILT_IN_AXIS2_PREFERENCE_KEY);
>+		_useBuiltInAxis2Button.setSelection(useBuiltInAxis2);
>+		_serverLocation.setEnabled(!useBuiltInAxis2);
>+		_browseButton.setEnabled(!useBuiltInAxis2);
>+		
>+		String runtime = store.getString(SERVER_LOCATION_PREFERENCE_KEY);		
>+		if (runtime != null || runtime.length() > 0)
>+		{
>+			_serverLocation.setText(runtime);
>+			if(!useBuiltInAxis2)
>+			{
>+				String errorMessage = _axisValidator.validateSoapServerHome(runtime);
>+				setErrorMessage(errorMessage);
>+			}			
>+		}			
>+		else
>+			_serverLocation.setText("");
>+	}
> 
> 	public void init(IWorkbench workbench) 
> 	{
>+		_axisValidator = ValidationUtils.getAllAxisValidators()[0];		
>+		IPreferenceStore store = Activator.getPlugin().getPreferenceStore();
>+		store.setDefault(SERVER_LOCATION_PREFERENCE_KEY,"");
>+		store.setDefault(USE_BUILT_IN_AXIS2_PREFERENCE_KEY, true);
>+	}
>+	
>+	private void handleUseBuiltInAxis2Button()
>+	{
>+		boolean useBuiltInAxis2 = _useBuiltInAxis2Button.getSelection();
>+		_serverLocation.setEnabled(!useBuiltInAxis2);
>+		_browseButton.setEnabled(!useBuiltInAxis2);
>+		if(useBuiltInAxis2)
>+			setErrorMessage(null);
>+		else
>+			setErrorMessage(_axisValidator.validateSoapServerHome(_serverLocation.getText()));
> 	}
> 	
> 	private void handleLocationBrowseButtonPressed() 
>@@ -126,49 +175,63 @@
> 		selectedDirectory = dialog.open();
> 		
> 		if (selectedDirectory != null)
>-			_serverLocation.setText(TextProcessor.process(selectedDirectory));
>+		{
>+			String selectedPath = TextProcessor.process(selectedDirectory);
>+			_serverLocation.setText(selectedPath);
>+			setErrorMessage(_axisValidator.validateSoapServerHome(selectedPath));
>+		}
>+			
> 	}
> 		
> 	protected void performDefaults() 
> 	{
> 		super.performDefaults();
> 		IPreferenceStore store = Activator.getPlugin().getPreferenceStore();
>-		String defaultValue = store.getDefaultString(SERVER_LOCATION_PREFERENCE_KEY);
>-		_serverLocation.setText(defaultValue);
>+		boolean useBuiltInAxis2 = store.getDefaultBoolean(USE_BUILT_IN_AXIS2_PREFERENCE_KEY);
>+		String runtime = store.getDefaultString(SERVER_LOCATION_PREFERENCE_KEY);
>+		_serverLocation.setText(runtime);
>+		_useBuiltInAxis2Button.setSelection(useBuiltInAxis2);
>+		_serverLocation.setEnabled(!useBuiltInAxis2);
>+		_browseButton.setEnabled(!useBuiltInAxis2);
>+		setErrorMessage(null);
>     }
> 
> 	protected void performApply()
> 	{
>-		popupAxis2LicenseDialog();		
>+		IPreferenceStore store = Activator.getPlugin().getPreferenceStore();
>+		boolean useBuiltInAxis2 = _useBuiltInAxis2Button.getSelection();
>+		if(!useBuiltInAxis2)
>+		{
>+			String errorMessage = validateAxisLocation();
>+			setErrorMessage(errorMessage);
>+			if(errorMessage!=null)
>+				return;
>+		}
>+		
>+		store.setValue(USE_BUILT_IN_AXIS2_PREFERENCE_KEY, useBuiltInAxis2);
>+		store.setValue(SERVER_LOCATION_PREFERENCE_KEY, _serverLocation.getText());
> 	}
> 	
> 	public boolean performOk()
> 	{
>-		popupAxis2LicenseDialog();		
>-		return true;
>-	}
>-	
>-	private void popupAxis2LicenseDialog()
>-	{
> 		IPreferenceStore store = Activator.getPlugin().getPreferenceStore();
>-		String oldLocation = store.getString(SERVER_LOCATION_PREFERENCE_KEY);
>-		String newLocation = _serverLocation.getText();
>-		if(newLocation == null || newLocation.equals(""))
>-			store.setValue(SERVER_LOCATION_PREFERENCE_KEY,_serverLocation.getText());
>-		else
>+		boolean useBuiltInAxis2 = _useBuiltInAxis2Button.getSelection();
>+		
>+		if(!useBuiltInAxis2)
> 		{
>-			if(!newLocation.equals(oldLocation))
>-			{
>-				int result = new Axis2LicenseDialog().showWindow();
>-				if(result == Axis2LicenseDialog.AGREE)
>-					store.setValue(SERVER_LOCATION_PREFERENCE_KEY,_serverLocation.getText());
>-			}
>+			String errorMessage = validateAxisLocation();
>+			setErrorMessage(errorMessage);
>+			if(errorMessage!=null)
>+				return false;
> 		}
>+		store.setValue(USE_BUILT_IN_AXIS2_PREFERENCE_KEY, useBuiltInAxis2);
>+		store.setValue(SERVER_LOCATION_PREFERENCE_KEY, _serverLocation.getText());
>+		return true;
> 	}
>-
>-	private void init()
>+	
>+	private String validateAxisLocation()
> 	{
>-		IPreferenceStore store = Activator.getPlugin().getPreferenceStore();
>-		store.setDefault(SERVER_LOCATION_PREFERENCE_KEY,"");		
>+		String newLocation = _serverLocation.getText();
>+		return _axisValidator.validateSoapServerHome(newLocation);
> 	}
> }
>Index: src/org/eclipse/tptp/wsdm/tooling/codegen/mrt/internal/GenerationOptionsPage.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.editor/src/org/eclipse/tptp/wsdm/tooling/codegen/mrt/internal/GenerationOptionsPage.java,v
>retrieving revision 1.4
>diff -u -r1.4 GenerationOptionsPage.java
>--- src/org/eclipse/tptp/wsdm/tooling/codegen/mrt/internal/GenerationOptionsPage.java	30 May 2007 19:21:26 -0000	1.4
>+++ src/org/eclipse/tptp/wsdm/tooling/codegen/mrt/internal/GenerationOptionsPage.java	30 May 2007 21:50:19 -0000
>@@ -12,6 +12,7 @@
> 
> package org.eclipse.tptp.wsdm.tooling.codegen.mrt.internal;
> 
>+import java.io.IOException;
> import java.util.HashMap;
> import java.util.Iterator;
> import java.util.Map;
>@@ -58,7 +59,9 @@
> import org.eclipse.tptp.wsdm.tooling.editor.mrt.relationship.dialog.internal.MemoryComboBox;
> import org.eclipse.tptp.wsdm.tooling.nls.messages.mrt.internal.Messages;
> import org.eclipse.tptp.wsdm.tooling.preferences.internal.Axis2ServerLocationPreferencePage;
>+import org.eclipse.tptp.wsdm.tooling.util.internal.EclipseUtils;
> import org.eclipse.tptp.wsdm.tooling.util.internal.Validation;
>+import org.eclipse.tptp.wsdm.tooling.util.internal.WsdmToolingLog;
> import org.eclipse.tptp.wsdm.tooling.validation.util.internal.ValidationUtils;
> 
> /**
>@@ -71,6 +74,8 @@
> 	
> 	private static final String EXT_PT = "codeGeneration";
> 	
>+	private static final String IN_BUILT_AXIS2_PLUGIN = "org.apache.axis2";
>+	
> 	private Button _overwriteButton;
> 
> 	private Combo _projectNameField;
>@@ -535,6 +540,26 @@
> 			return;
> 		}
> 		
>+		// If the selected container is Axis2, then verify the Preference Page setting
>+		if ("Axis2".equals(_containerCombo.getText()))
>+		{
>+			String errorMessage = null;
>+			try 
>+			{
>+				errorMessage = validateAxis2Location();
>+			}
>+			catch (Exception e) 
>+			{
>+				updateStatus(e.getMessage());
>+				return;
>+			}
>+			if(errorMessage!=null)
>+			{
>+				updateStatus(errorMessage);
>+				return;
>+			}								
>+		}
>+		
> 		updateStatus(null, DialogPage.NONE);
> 	}
> 
>@@ -652,10 +677,9 @@
> 		MemoryComboBox.save(_projectNameField, PROJECT_MEMORY_COMBO_ID, Preferences.userNodeForPackage(GenerationOptionsPage.class));
> 	}
> 	
>-	private String validateLocation()
>+	private String validateAxis2Location() throws Exception
> 	{
>-		String serverHome = getPreferenceServerLocation();
>-		
>+		String serverHome = getPreferenceServerLocation();		
> 		ISoapServerDependency axisValidators[] = ValidationUtils.getAllAxisValidators();
> 		for(int i = 0 ; i < axisValidators.length ; i++){
> 			
>@@ -676,16 +700,36 @@
> 	 */
> 	public TargetedFileList[] getAxis2FilesToCopy()
> 	{
>-		validateLocation();
>+		try 
>+		{
>+			validateAxis2Location();
>+		} catch (Exception e) 
>+		{
>+			WsdmToolingLog.logError(e.getMessage(), e);
>+		}
> 		return _filesToCopy;
> 	}
> 	
>-	protected String getPreferenceServerLocation() 
>+	protected String getPreferenceServerLocation() throws Exception
> 	{
> 		IPreferenceStore store = Activator.getPlugin().getPreferenceStore();
>+		boolean useBuiltInAxis2 = store.getBoolean(Axis2ServerLocationPreferencePage.USE_BUILT_IN_AXIS2_PREFERENCE_KEY);
>+		// If user prefer the In-Built Axis2, then return the location of "org.eclipse.axis2" plugin
>+		if(useBuiltInAxis2)
>+		{
>+			return getBuiltInAxis2Location();			
>+		}
>+		// Return the user specified Axis2 location
> 		String location = store.getString(Axis2ServerLocationPreferencePage.SERVER_LOCATION_PREFERENCE_KEY).trim();
> 		if(location != null && !location.equals(""))
> 			return location;
>-		return "";
>+		// User didn't specify any location and didn't want to use In-Built Axis2
>+		// Its not a proper choice, so we go with In-Built Axis2
>+		return getBuiltInAxis2Location();
>+	}
>+	
>+	private String getBuiltInAxis2Location() throws Exception
>+	{
>+		return EclipseUtils.getPluginResourceLocation(IN_BUILT_AXIS2_PLUGIN, null);
> 	}
> }
>Index: src/org/eclipse/tptp/wsdm/tooling/codegen/mrt/internal/NewProjectWizard.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.editor/src/org/eclipse/tptp/wsdm/tooling/codegen/mrt/internal/NewProjectWizard.java,v
>retrieving revision 1.3
>diff -u -r1.3 NewProjectWizard.java
>--- src/org/eclipse/tptp/wsdm/tooling/codegen/mrt/internal/NewProjectWizard.java	30 May 2007 19:21:26 -0000	1.3
>+++ src/org/eclipse/tptp/wsdm/tooling/codegen/mrt/internal/NewProjectWizard.java	30 May 2007 21:50:19 -0000
>@@ -86,17 +86,12 @@
> 
> 	private DescriptorHelper _helper;
> 
>-	private String _serverLocation;
>-
> 	private boolean _isAxis2Project;
>-	private boolean updatePreference;
>-
>+	
> 	private String _projectLocation;
> 
> 	private TargetedFileList[] _requiredAxis2Files;
> 
>-	private boolean _licenseAccepted = false;
>-
> 	/**
> 	 * Class that creates the Code Generation Wizard to create new Project
> 	 * 
>@@ -119,18 +114,7 @@
> 		ImageDescriptor imgDescrTP = ExtendedImageRegistry.INSTANCE.getImageDescriptor(imgTP);
> 		setDefaultPageImageDescriptor(imgDescrTP);
> 	}
>-
>-	private void popupAxis2LicenseDialog() {
>-		IPreferenceStore store = Activator.getPlugin().getPreferenceStore();
>-		String preferencesLocation = store.getString(Axis2ServerLocationPreferencePage.SERVER_LOCATION_PREFERENCE_KEY);
>-		if (!_serverLocation.equals(preferencesLocation)) {
>-			int result = new Axis2LicenseDialog().showWindow();
>-			_licenseAccepted = (result == Axis2LicenseDialog.AGREE);
>-		} else
>-			_licenseAccepted = true;
>-
>-	}
>-
>+	
> 	private void performFinish(IProgressMonitor monitor) throws InvocationTargetException {
> 		try {
> 			monitor.beginTask(Messages.CODE_GEN_START, 7);
>@@ -139,13 +123,6 @@
> 				try {
> 					// Step 1: Validate the server path
> 					monitor.subTask(Messages.CODE_GEN_VALIDATE_SLOCATION);
>-					// Step 2 : Update the Preferences, if needed
>-					if (updatePreference) {
>-						IPreferenceStore store = Activator.getPlugin().getPreferenceStore();
>-						store.setValue(Axis2ServerLocationPreferencePage.SERVER_LOCATION_PREFERENCE_KEY,
>-								_serverLocation);
>-						// Update the Lib and module location
>-					}
> 					_requiredAxis2Files = _generationOptionsPage.getAxis2FilesToCopy();
> 				} catch (Exception e) {
> 					throw new RuntimeException(e);
>@@ -208,10 +185,6 @@
> 		_projectName = _generationOptionsPage.getProjectName();
> 		_projectLocation = _generationOptionsPage.getProjectLocation();
> 
>-		if (_isAxis2Project) {
>-			_serverLocation = _generationOptionsPage.getPreferenceServerLocation();
>-		}
>-
> 		IRunnableWithProgress runnable = new IRunnableWithProgress() {
> 			public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
> 				performFinish(monitor);
>Index: src/org/eclipse/tptp/wsdm/tooling/nls/messages/capability/internal/messages.properties
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.editor/src/org/eclipse/tptp/wsdm/tooling/nls/messages/capability/internal/messages.properties,v
>retrieving revision 1.3
>diff -u -r1.3 messages.properties
>--- src/org/eclipse/tptp/wsdm/tooling/nls/messages/capability/internal/messages.properties	16 Mar 2007 18:16:59 -0000	1.3
>+++ src/org/eclipse/tptp/wsdm/tooling/nls/messages/capability/internal/messages.properties	30 May 2007 21:50:19 -0000
>@@ -148,3 +148,4 @@
> INVALID_RMD_XML_MESSAGE = IWAT0785E RMD file is not a valid xml
> PROP_SCHEMA_MISSING_MESSAGE = IWAT0786E One of the properties schema file for this capability is missing
> RMD_FILE_MISSING_MESSAGE = IWAT0787E RMD file for this capability is missing
>+UNRESOLVED_BUNDLE_ERROR_ = IWAT0885E Unresolved bundle : {0}
>Index: src/org/eclipse/tptp/wsdm/tooling/nls/messages/capability/internal/Messages.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.wsdm.editor/src/org/eclipse/tptp/wsdm/tooling/nls/messages/capability/internal/Messages.java,v
>retrieving revision 1.1
>diff -u -r1.1 Messages.java
>--- src/org/eclipse/tptp/wsdm/tooling/nls/messages/capability/internal/Messages.java	1 Feb 2007 05:04:45 -0000	1.1
>+++ src/org/eclipse/tptp/wsdm/tooling/nls/messages/capability/internal/Messages.java	30 May 2007 21:50:19 -0000
>@@ -157,6 +157,7 @@
> 	public static String INVALID_RMD_XML_MESSAGE;
> 	public static String PROP_SCHEMA_MISSING_MESSAGE;
> 	public static String RMD_FILE_MISSING_MESSAGE;
>+	public static String UNRESOLVED_BUNDLE_ERROR_;
> 
> 	static
> 	{

Actions: View | Diff

Attachments on bug 188895: 69406 | 69412