Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 196954 | Differences between
and this patch

Collapse All | Expand All

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
Lines 2-8 Link Here
2
Bundle-ManifestVersion: 2
2
Bundle-ManifestVersion: 2
3
Bundle-Name: %PLUGIN_NAME
3
Bundle-Name: %PLUGIN_NAME
4
Bundle-SymbolicName: org.eclipse.jst.ws.axis2.consumption.core
4
Bundle-SymbolicName: org.eclipse.jst.ws.axis2.consumption.core
5
Bundle-Version: 1.0.104.qualifier
5
Bundle-Version: 1.0.105.qualifier
6
Bundle-Activator: org.eclipse.jst.ws.axis2.consumption.core.plugin.WebServiceAxis2ConsumptionCorePlugin
6
Bundle-Activator: org.eclipse.jst.ws.axis2.consumption.core.plugin.WebServiceAxis2ConsumptionCorePlugin
7
Bundle-Localization: plugin
7
Bundle-Localization: plugin
8
Require-Bundle: org.eclipse.ui,
8
Require-Bundle: org.eclipse.ui,
(-)src/org/eclipse/jst/ws/axis2/consumption/core/command/Axis2ClientCodegenCommand.java (-2 / +10 lines)
Lines 22-27 Link Here
22
 * 20080621   200069 samindaw@wso2.com - Saminda Wijeratne, saving the retrieved WSDL so no need to retrieve it again 
22
 * 20080621   200069 samindaw@wso2.com - Saminda Wijeratne, saving the retrieved WSDL so no need to retrieve it again 
23
 * 20080616   237363 samindaw@wso2.com - Saminda Wijeratne, get ResourceContext from environment instead of preference
23
 * 20080616   237363 samindaw@wso2.com - Saminda Wijeratne, get ResourceContext from environment instead of preference
24
 * 20080924   247929 samindaw@wso2.com - Saminda Wijeratne, source folder not correctly set
24
 * 20080924   247929 samindaw@wso2.com - Saminda Wijeratne, source folder not correctly set
25
 * 20090307   196954 samindaw@wso2.com - Saminda Wijeratne, Support XMLBeans data binding
25
 * 20091207   193996 samindaw@wso2.com - Saminda Wijeratne, selecting a specific service/portname
26
 * 20091207   193996 samindaw@wso2.com - Saminda Wijeratne, selecting a specific service/portname
26
*******************************************************************************/
27
*******************************************************************************/
27
package org.eclipse.jst.ws.axis2.consumption.core.command;
28
package org.eclipse.jst.ws.axis2.consumption.core.command;
Lines 32-37 Link Here
32
import java.util.Map;
33
import java.util.Map;
33
34
34
import org.eclipse.core.commands.ExecutionException;
35
import org.eclipse.core.commands.ExecutionException;
36
import org.eclipse.core.resources.IFolder;
37
import org.eclipse.core.resources.IProject;
35
import org.eclipse.core.resources.ResourcesPlugin;
38
import org.eclipse.core.resources.ResourcesPlugin;
36
import org.eclipse.core.runtime.IAdaptable;
39
import org.eclipse.core.runtime.IAdaptable;
37
import org.eclipse.core.runtime.IProgressMonitor;
40
import org.eclipse.core.runtime.IProgressMonitor;
Lines 225-231 Link Here
225
	    							currentDynamicWebProjectDir, 
228
	    							currentDynamicWebProjectDir, 
226
	    							monitor, 
229
	    							monitor, 
227
	    							statusHandler);
230
	    							statusHandler);
228
      
231
	    
232
	    IProject project = FacetContainerUtils.getProjectName(model.getWebProjectName());
233
	    IFolder folder = project.getFolder("resources");
234
	    if (folder.exists()){
235
	    	Axis2CoreUtils.addResourcesFolderAsClassPath(project);
236
	    }
229
	} catch (Exception e) {
237
	} catch (Exception e) {
230
		status = StatusUtils.errorStatus(NLS.bind(
238
		status = StatusUtils.errorStatus(NLS.bind(
231
											Axis2ConsumptionUIMessages.ERROR_CODEGEN_EXCEPTION,
239
											Axis2ConsumptionUIMessages.ERROR_CODEGEN_EXCEPTION,
Lines 245-249 Link Here
245
253
246
		return status;
254
		return status;
247
	}
255
	}
248
256
	
249
}
257
}
(-)META-INF/MANIFEST.MF (-1 / +1 lines)
Lines 2-8 Link Here
2
Bundle-ManifestVersion: 2
2
Bundle-ManifestVersion: 2
3
Bundle-Name: %PLUGIN_NAME
3
Bundle-Name: %PLUGIN_NAME
4
Bundle-SymbolicName: org.eclipse.jst.ws.axis2.consumption.ui;singleton:=true
4
Bundle-SymbolicName: org.eclipse.jst.ws.axis2.consumption.ui;singleton:=true
5
Bundle-Version: 1.0.102.qualifier
5
Bundle-Version: 1.0.103.qualifier
6
Bundle-Activator: org.eclipse.jst.ws.internal.axis2.consumption.ui.plugin.WebServiceAxis2ConsumptionUIPlugin
6
Bundle-Activator: org.eclipse.jst.ws.internal.axis2.consumption.ui.plugin.WebServiceAxis2ConsumptionUIPlugin
7
Bundle-Localization: plugin
7
Bundle-Localization: plugin
8
Require-Bundle: org.eclipse.ui,
8
Require-Bundle: org.eclipse.ui,
(-)src/org/eclipse/jst/ws/internal/axis2/consumption/ui/widgets/Axis2ProxyWidget.java (-2 / +7 lines)
Lines 20-25 Link Here
20
 * 20071030	  207618 zina@ca.ibm.com - Zina Mostafia, Page GUI sequence using tab is not correct ( violates Accessibility)
20
 * 20071030	  207618 zina@ca.ibm.com - Zina Mostafia, Page GUI sequence using tab is not correct ( violates Accessibility)
21
 * 20080319   207616 makandre@ca.ibm.com - Andrew Mak, Table in Axis2 Web Service Skeleton Java Bean Configuration Page not Accessible
21
 * 20080319   207616 makandre@ca.ibm.com - Andrew Mak, Table in Axis2 Web Service Skeleton Java Bean Configuration Page not Accessible
22
 * 20080621   200069 samindaw@wso2.com - Saminda Wijeratne, saving the retrieved WSDL so no need to retrieve it again
22
 * 20080621   200069 samindaw@wso2.com - Saminda Wijeratne, saving the retrieved WSDL so no need to retrieve it again
23
 * 20090307   196954 samindaw@wso2.com - Saminda Wijeratne, Support XMLBeans data binding
23
 * 20091207   193996 samindaw@wso2.com - Saminda Wijeratne, selecting a specific service/portname
24
 * 20091207   193996 samindaw@wso2.com - Saminda Wijeratne, selecting a specific service/portname
24
 *******************************************************************************/
25
 *******************************************************************************/
25
package org.eclipse.jst.ws.internal.axis2.consumption.ui.widgets;
26
package org.eclipse.jst.ws.internal.axis2.consumption.ui.widgets;
Lines 144-150 Link Here
144
		// Databinding
145
		// Databinding
145
		databindingTypeCombo = uiUtils.createCombo(topComp, Axis2ConsumptionUIMessages.LABEL_DATABINDING_CAPTION, null, null, SWT.READ_ONLY);
146
		databindingTypeCombo = uiUtils.createCombo(topComp, Axis2ConsumptionUIMessages.LABEL_DATABINDING_CAPTION, null, null, SWT.READ_ONLY);
146
		fillDatabinderCombo();
147
		fillDatabinderCombo();
147
		databindingTypeCombo.select(0);
148
		databindingTypeCombo.addSelectionListener(new SelectionListener() {
148
		databindingTypeCombo.addSelectionListener(new SelectionListener() {
149
			public void widgetSelected(SelectionEvent e) {
149
			public void widgetSelected(SelectionEvent e) {
150
				model.setDatabindingType(databindingTypeCombo.getText());
150
				model.setDatabindingType(databindingTypeCombo.getText());
Lines 397-404 Link Here
397
	 */
397
	 */
398
	private void fillDatabinderCombo() {
398
	private void fillDatabinderCombo() {
399
		databindingTypeCombo.add(Axis2Constants.DATA_BINDING_ADB);
399
		databindingTypeCombo.add(Axis2Constants.DATA_BINDING_ADB);
400
		databindingTypeCombo.add(Axis2Constants.DATA_BINDING_XMLBEANS);
400
		databindingTypeCombo.add(Axis2Constants.DATA_BINDING_NONE);
401
		databindingTypeCombo.add(Axis2Constants.DATA_BINDING_NONE);
401
		databindingTypeCombo.select(0);
402
		int selected = databindingTypeCombo.indexOf(context.getClientDatabinding().toUpperCase());
403
		if (selected==-1)
404
			databindingTypeCombo.select(0);
405
		else
406
			databindingTypeCombo.select(selected);
402
	}
407
	}
403
	
408
	
404
	private void populateModel() {
409
	private void populateModel() {
(-)src/org/eclipse/jst/ws/axis2/core/constant/Axis2Constants.java (+3 lines)
Lines 15-20 Link Here
15
 * 20080521   231098 sandakith@wso2.com - Lahiru Sandakith, Fix for Axis2 1.4 dependency chenge
15
 * 20080521   231098 sandakith@wso2.com - Lahiru Sandakith, Fix for Axis2 1.4 dependency chenge
16
 * 20080604   193371 samindaw@wso2.com - Saminda Wijeratne, creating a function to validate services.xml
16
 * 20080604   193371 samindaw@wso2.com - Saminda Wijeratne, creating a function to validate services.xml
17
 * 20091207   192005 samindaw@wso2.com - merge the web.xml to have axis2 welcome file defined
17
 * 20091207   192005 samindaw@wso2.com - merge the web.xml to have axis2 welcome file defined
18
 * 20090307   196954 samindaw@wso2.com - Saminda Wijeratne, Support XMLBeans data binding
18
 * 20100308	  282466 samindaw@wso2.com - Saminda Wijeratne, support for axis2 1.5
19
 * 20100308	  282466 samindaw@wso2.com - Saminda Wijeratne, support for axis2 1.5
19
 *******************************************************************************/
20
 *******************************************************************************/
20
package org.eclipse.jst.ws.axis2.core.constant;
21
package org.eclipse.jst.ws.axis2.core.constant;
Lines 63-68 Link Here
63
	public static final String AXIS2_PROJECT="org.eclipse.jst.ws.axis2";		//$NON-NLS-1$
64
	public static final String AXIS2_PROJECT="org.eclipse.jst.ws.axis2";		//$NON-NLS-1$
64
	public static final String CODEGEN_RESULTS="codegen";						//$NON-NLS-1$
65
	public static final String CODEGEN_RESULTS="codegen";						//$NON-NLS-1$
65
	public static final String DATA_BINDING_ADB="ADB";							//$NON-NLS-1$
66
	public static final String DATA_BINDING_ADB="ADB";							//$NON-NLS-1$
67
	public static final String DATA_BINDING_XMLBEANS="XMLBEANS";						//$NON-NLS-1$
66
	public static final String DATA_BINDING_NONE="NONE";						//$NON-NLS-1$
68
	public static final String DATA_BINDING_NONE="NONE";						//$NON-NLS-1$
67
	public static final String SKELETON_SUFFIX="Skeleton.java";					//$NON-NLS-1$
69
	public static final String SKELETON_SUFFIX="Skeleton.java";					//$NON-NLS-1$
68
	public static final String RESOURCE_FOLDER="resources";						//$NON-NLS-1$
70
	public static final String RESOURCE_FOLDER="resources";						//$NON-NLS-1$
Lines 95-100 Link Here
95
        "backport-util",
97
        "backport-util",
96
        "mex-impl",
98
        "mex-impl",
97
        "mail",
99
        "mail",
100
        "xmlbeans",
98
        "httpcore"
101
        "httpcore"
99
	};
102
	};
100
}	
103
}	
(-)src/org/eclipse/jst/ws/axis2/core/utils/Axis2CoreUtils.java (+28 lines)
Lines 16-21 Link Here
16
 * 20070824   200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
16
 * 20070824   200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
17
 * 20080625   210817 samindaw@wso2.com - Saminda Wijeratne, Setting the proxyBean and proxyEndPoint values - Refactoring
17
 * 20080625   210817 samindaw@wso2.com - Saminda Wijeratne, Setting the proxyBean and proxyEndPoint values - Refactoring
18
 * 20080924   247929 samindaw@wso2.com - Saminda Wijeratne, source folder not correctly set
18
 * 20080924   247929 samindaw@wso2.com - Saminda Wijeratne, source folder not correctly set
19
 * 20090307   196954 samindaw@wso2.com - Saminda Wijeratne, Support XMLBeans data binding
19
 *******************************************************************************/
20
 *******************************************************************************/
20
package org.eclipse.jst.ws.axis2.core.utils;
21
package org.eclipse.jst.ws.axis2.core.utils;
21
22
Lines 28-38 Link Here
28
import java.net.URL;
29
import java.net.URL;
29
import java.util.ArrayList;
30
import java.util.ArrayList;
30
import java.util.HashMap;
31
import java.util.HashMap;
32
import java.util.LinkedList;
33
import java.util.List;
31
34
32
import javax.xml.parsers.DocumentBuilder;
35
import javax.xml.parsers.DocumentBuilder;
33
import javax.xml.parsers.DocumentBuilderFactory;
36
import javax.xml.parsers.DocumentBuilderFactory;
34
import javax.xml.parsers.ParserConfigurationException;
37
import javax.xml.parsers.ParserConfigurationException;
35
38
39
import org.eclipse.core.resources.IFolder;
36
import org.eclipse.core.resources.IProject;
40
import org.eclipse.core.resources.IProject;
37
import org.eclipse.core.resources.ResourcesPlugin;
41
import org.eclipse.core.resources.ResourcesPlugin;
38
import org.eclipse.core.runtime.CoreException;
42
import org.eclipse.core.runtime.CoreException;
Lines 54-59 Link Here
54
	private static boolean alreadyComputedTempAxis2Directory = false;
58
	private static boolean alreadyComputedTempAxis2Directory = false;
55
	private static String tempAxis2Dir = null;
59
	private static String tempAxis2Dir = null;
56
	
60
	
61
	public static void addResourcesFolderAsClassPath(IProject project){
62
		try {
63
			IJavaProject javaProject = (IJavaProject)project.getNature(JavaCore.NATURE_ID);
64
			IClasspathEntry[] rawClasspath = javaProject.getRawClasspath();
65
			List list = new LinkedList(java.util.Arrays.asList(rawClasspath));
66
				String resourceName = "resources";
67
				IFolder resourcesFolder = project.getFolder(resourceName);
68
				boolean isAlreadyAdded=false;
69
				for(IClasspathEntry cpe:rawClasspath){
70
					isAlreadyAdded=cpe.getPath().toOSString().equals(resourcesFolder.getFullPath().toOSString());
71
					if (isAlreadyAdded) break;
72
				}
73
				if (!isAlreadyAdded){
74
					IClasspathEntry jarEntry = JavaCore.newLibraryEntry(resourcesFolder.getFullPath(),null,null);
75
					list.add(jarEntry);
76
				}
77
			IClasspathEntry[] newClasspath = (IClasspathEntry[])list.toArray(new IClasspathEntry[0]);
78
			javaProject.setRawClasspath(newClasspath,null);
79
		} catch (CoreException e) {
80
			e.printStackTrace();
81
		}
82
83
	}
84
57
	public static String tempAxis2Directory() {
85
	public static String tempAxis2Directory() {
58
		if (!alreadyComputedTempAxis2Directory){
86
		if (!alreadyComputedTempAxis2Directory){
59
			String[] nodes = {Axis2Constants.DIR_DOT_METADATA,
87
			String[] nodes = {Axis2Constants.DIR_DOT_METADATA,
(-)src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2WSDL2JavaCommand.java (-2 / +8 lines)
Lines 21-26 Link Here
21
 * 20080621   200069 samindaw@wso2.com - Saminda Wijeratne, saving the retrieved WSDL so no need to retrieve it again
21
 * 20080621   200069 samindaw@wso2.com - Saminda Wijeratne, saving the retrieved WSDL so no need to retrieve it again
22
 * 20080616   237363 samindaw@wso2.com - Saminda Wijeratne, get ResourceContext from environment instead of preference
22
 * 20080616   237363 samindaw@wso2.com - Saminda Wijeratne, get ResourceContext from environment instead of preference
23
 * 20080924   247929 samindaw@wso2.com - Saminda Wijeratne, source folder not correctly set
23
 * 20080924   247929 samindaw@wso2.com - Saminda Wijeratne, source folder not correctly set
24
 * 20090307   196954 samindaw@wso2.com - Saminda Wijeratne, Support XMLBeans data binding
24
 * 20091207   193996 samindaw@wso2.com - Saminda Wijeratne, selecting a specific service/portname
25
 * 20091207   193996 samindaw@wso2.com - Saminda Wijeratne, selecting a specific service/portname
25
 *******************************************************************************/
26
 *******************************************************************************/
26
package org.eclipse.jst.ws.axis2.creation.core.command;
27
package org.eclipse.jst.ws.axis2.creation.core.command;
Lines 31-36 Link Here
31
import java.util.Map;
32
import java.util.Map;
32
33
33
import org.eclipse.core.commands.ExecutionException;
34
import org.eclipse.core.commands.ExecutionException;
35
import org.eclipse.core.resources.IFolder;
36
import org.eclipse.core.resources.IProject;
34
import org.eclipse.core.runtime.IAdaptable;
37
import org.eclipse.core.runtime.IAdaptable;
35
import org.eclipse.core.runtime.IProgressMonitor;
38
import org.eclipse.core.runtime.IProgressMonitor;
36
import org.eclipse.core.runtime.IStatus;
39
import org.eclipse.core.runtime.IStatus;
Lines 210-216 Link Here
210
	    							monitor, 
213
	    							monitor, 
211
	    							statusHandler);
214
	    							statusHandler);
212
215
213
        
216
	    IProject project = FacetContainerUtils.getProjectName(model.getWebProjectName());
217
	    IFolder folder = project.getFolder("resources");
218
	    if (folder.exists()){
219
	    	Axis2CoreUtils.addResourcesFolderAsClassPath(project);
220
	    }
214
	} catch (Exception e) {
221
	} catch (Exception e) {
215
		status = StatusUtils.errorStatus(NLS.bind(
222
		status = StatusUtils.errorStatus(NLS.bind(
216
											Axis2CreationUIMessages.ERROR_CODEGEN_EXCEPTION,
223
											Axis2CreationUIMessages.ERROR_CODEGEN_EXCEPTION,
Lines 231-235 Link Here
231
		
238
		
232
		return status;
239
		return status;
233
	}
240
	}
234
235
}
241
}
(-)META-INF/MANIFEST.MF (-1 / +1 lines)
Lines 2-8 Link Here
2
Bundle-ManifestVersion: 2
2
Bundle-ManifestVersion: 2
3
Bundle-Name: %PLUGIN_NAME
3
Bundle-Name: %PLUGIN_NAME
4
Bundle-SymbolicName: org.eclipse.jst.ws.axis2.creation.ui;singleton:=true
4
Bundle-SymbolicName: org.eclipse.jst.ws.axis2.creation.ui;singleton:=true
5
Bundle-Version: 1.0.103.qualifier
5
Bundle-Version: 1.0.104.qualifier
6
Bundle-Activator: org.eclipse.jst.ws.internal.axis2.creation.ui.plugin.WebServiceAxis2CreationUIPlugin
6
Bundle-Activator: org.eclipse.jst.ws.internal.axis2.creation.ui.plugin.WebServiceAxis2CreationUIPlugin
7
Bundle-Localization: plugin
7
Bundle-Localization: plugin
8
Require-Bundle: org.eclipse.ui,
8
Require-Bundle: org.eclipse.ui,
(-)src/org/eclipse/jst/ws/internal/axis2/creation/ui/widgets/skeleton/WSDL2JAVASkelConfigWidget.java (-2 / +7 lines)
Lines 18-23 Link Here
18
 * 20070824   200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
18
 * 20070824   200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
19
 * 20080319   207616 makandre@ca.ibm.com - Andrew Mak, Table in Axis2 Web Service Skeleton Java Bean Configuration Page not Accessible
19
 * 20080319   207616 makandre@ca.ibm.com - Andrew Mak, Table in Axis2 Web Service Skeleton Java Bean Configuration Page not Accessible
20
 * 20080621   200069 samindaw@wso2.com - Saminda Wijeratne, saving the retrieved WSDL so no need to retrieve it again
20
 * 20080621   200069 samindaw@wso2.com - Saminda Wijeratne, saving the retrieved WSDL so no need to retrieve it again
21
 * 20090307   196954 samindaw@wso2.com - Saminda Wijeratne, Support XMLBeans data binding
21
 * 20091207   193996 samindaw@wso2.com - Saminda Wijeratne, selecting a specific service/portname
22
 * 20091207   193996 samindaw@wso2.com - Saminda Wijeratne, selecting a specific service/portname
22
 *******************************************************************************/
23
 *******************************************************************************/
23
package org.eclipse.jst.ws.internal.axis2.creation.ui.widgets.skeleton;
24
package org.eclipse.jst.ws.internal.axis2.creation.ui.widgets.skeleton;
Lines 156-162 Link Here
156
		databindingTypeCombo = new Combo(mainComp, SWT.DROP_DOWN | SWT.BORDER | SWT.READ_ONLY);
157
		databindingTypeCombo = new Combo(mainComp, SWT.DROP_DOWN | SWT.BORDER | SWT.READ_ONLY);
157
		databindingTypeCombo.setLayoutData(gd);
158
		databindingTypeCombo.setLayoutData(gd);
158
		fillDatabinderCombo();
159
		fillDatabinderCombo();
159
		databindingTypeCombo.select(0);
160
		databindingTypeCombo.addSelectionListener(new SelectionListener() {
160
		databindingTypeCombo.addSelectionListener(new SelectionListener() {
161
			public void widgetSelected(SelectionEvent e) {
161
			public void widgetSelected(SelectionEvent e) {
162
				model.setDatabindingType(databindingTypeCombo.getText());
162
				model.setDatabindingType(databindingTypeCombo.getText());
Lines 470-477 Link Here
470
	 */
470
	 */
471
	private void fillDatabinderCombo() {
471
	private void fillDatabinderCombo() {
472
		databindingTypeCombo.add(Axis2Constants.DATA_BINDING_ADB);
472
		databindingTypeCombo.add(Axis2Constants.DATA_BINDING_ADB);
473
		databindingTypeCombo.add(Axis2Constants.DATA_BINDING_XMLBEANS);
473
		databindingTypeCombo.add(Axis2Constants.DATA_BINDING_NONE);
474
		databindingTypeCombo.add(Axis2Constants.DATA_BINDING_NONE);
474
		databindingTypeCombo.select(0);
475
		int selected = databindingTypeCombo.indexOf(context.getServiceDatabinding().toUpperCase());
476
		if (selected==-1)
477
			databindingTypeCombo.select(0);
478
		else
479
			databindingTypeCombo.select(selected);
475
	}
480
	}
476
	
481
	
477
	
482
	
(-)META-INF/MANIFEST.MF (-1 / +1 lines)
Lines 2-8 Link Here
2
Bundle-ManifestVersion: 2
2
Bundle-ManifestVersion: 2
3
Bundle-Name: %PLUGIN_NAME
3
Bundle-Name: %PLUGIN_NAME
4
Bundle-SymbolicName: org.eclipse.jst.ws.axis2.ui;singleton:=true
4
Bundle-SymbolicName: org.eclipse.jst.ws.axis2.ui;singleton:=true
5
Bundle-Version: 1.0.302.qualifier
5
Bundle-Version: 1.0.303.qualifier
6
Bundle-Activator: org.eclipse.jst.ws.axis2.ui.plugin.WebServiceAxis2UIPlugin
6
Bundle-Activator: org.eclipse.jst.ws.axis2.ui.plugin.WebServiceAxis2UIPlugin
7
Bundle-Vendor: %PLUGIN_PROVIDER
7
Bundle-Vendor: %PLUGIN_PROVIDER
8
Bundle-Localization: plugin
8
Bundle-Localization: plugin
(-)src/org/eclipse/jst/ws/internal/axis2/consumption/ui/preferences/Axis2RuntimePreferencePage.java (-3 / +12 lines)
Lines 25-30 Link Here
25
 * 20070827   188732 sandakith@wso2.com - Lahiru Sandakith, Restore defaults for preferences
25
 * 20070827   188732 sandakith@wso2.com - Lahiru Sandakith, Restore defaults for preferences
26
 * 20071030	  207618 zina@ca.ibm.com - Zina Mostafia, Page GUI sequence using tab is not correct ( violates Accessibility)
26
 * 20071030	  207618 zina@ca.ibm.com - Zina Mostafia, Page GUI sequence using tab is not correct ( violates Accessibility)
27
 * 20080522   233154 samindaw@wso2.com - Saminda Wijeratne, UI rendering problem where textboxes used as labels had white background
27
 * 20080522   233154 samindaw@wso2.com - Saminda Wijeratne, UI rendering problem where textboxes used as labels had white background
28
 * 20090307   196954 samindaw@wso2.com - Saminda Wijeratne, Support XMLBeans data binding
28
 *******************************************************************************/
29
 *******************************************************************************/
29
package org.eclipse.jst.ws.internal.axis2.consumption.ui.preferences;
30
package org.eclipse.jst.ws.internal.axis2.consumption.ui.preferences;
30
31
Lines 284-294 Link Here
284
	{
285
	{
285
		Axis2EmitterContext context = WebServiceAxis2CorePlugin.getDefault().getAxisEmitterContext();
286
		Axis2EmitterContext context = WebServiceAxis2CorePlugin.getDefault().getAxisEmitterContext();
286
287
287
		String[] databindingItems = {context.getServiceDatabinding().toUpperCase()};
288
		String[] databindingItems = {Axis2Constants.DATA_BINDING_ADB,Axis2Constants.DATA_BINDING_XMLBEANS};
288
		serviceDatabindingCombo.setItems(databindingItems);
289
		serviceDatabindingCombo.setItems(databindingItems);
289
		serviceDatabindingCombo.select(0);
290
		int selected = serviceDatabindingCombo.indexOf(context.getServiceDatabinding().toUpperCase());
291
		if (selected==-1)
292
			serviceDatabindingCombo.select(0);
293
		else
294
			serviceDatabindingCombo.select(selected);
290
		clientDatabindingCombo.setItems(databindingItems);
295
		clientDatabindingCombo.setItems(databindingItems);
291
		clientDatabindingCombo.select(0);
296
		selected = clientDatabindingCombo.indexOf(context.getClientDatabinding().toUpperCase());
297
		if (selected==-1)
298
			clientDatabindingCombo.select(0);
299
		else
300
			clientDatabindingCombo.select(selected);
292
301
293
		generateServerSideInterfaceCheckBoxButton.setSelection( context.isServiceInterfaceSkeleton());
302
		generateServerSideInterfaceCheckBoxButton.setSelection( context.isServiceInterfaceSkeleton());
294
		generateAllCheckBoxButton.setSelection(context.isServiceGenerateAll());
303
		generateAllCheckBoxButton.setSelection(context.isServiceGenerateAll());

Return to bug 196954