Attachment #35113 for bug #119111

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

Lines 1-12 Link Here

(-)src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidgetDefaultingCommand.java (-6 / +16 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2004 IBM Corporation and others.	2	* Copyright (c) 2004, 2006 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html	6	* http://www.eclipse.org/legal/epl-v10.html
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* yyyymmdd bug Email and other contact information
		11	* -------- -------- -----------------------------------------------------------
		12	* 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
10	*******************************************************************************/	13	*******************************************************************************/
11	package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton;	14	package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton;
12		15
Lines 51-58 Link Here
51	javaWSDLParam.setJavaOutput(javaOutput);	54	javaWSDLParam.setJavaOutput(javaOutput);
52		55
53		56
54		57	String projectURL = null;
55	String projectURL = ServerUtils.getEncodedWebComponentURL(serverProject, serviceServerTypeID_);	58	if (serviceServerTypeID_ != null && serviceServerTypeID_.length()>0)
		59	{
		60	projectURL = ServerUtils.getEncodedWebComponentURL(serverProject, serviceServerTypeID_);
		61	}
		62	else
		63	{
		64	projectURL = "http://tempuri.org/";
		65	}
56		66
57	if (projectURL == null) {	67	if (projectURL == null) {
58	status = StatusUtils.errorStatus(NLS.bind(AxisCreationUIMessages.MSG_ERROR_PROJECT_URL, new String[] { serverProject.toString()}));	68	status = StatusUtils.errorStatus(NLS.bind(AxisCreationUIMessages.MSG_ERROR_PROJECT_URL, new String[] { serverProject.toString()}));
Lines 130-133 Link Here
130	public void setServiceServerTypeID(String serviceServerTypeID) {	140	public void setServiceServerTypeID(String serviceServerTypeID) {
131	this.serviceServerTypeID_ = serviceServerTypeID;	141	this.serviceServerTypeID_ = serviceServerTypeID;
132	}	142	}
133	}	143	}

Lines 1-12 Link Here

(-)src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java (-4 / +16 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2005 IBM Corporation and others.	2	* Copyright (c) 2000, 2006 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html	6	* http://www.eclipse.org/legal/epl-v10.html
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* yyyymmdd bug Email and other contact information
		11	* -------- -------- -----------------------------------------------------------
		12	* 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
10	*******************************************************************************/	13	*******************************************************************************/
11	package org.eclipse.jst.ws.internal.axis.creation.ui.task;	14	package org.eclipse.jst.ws.internal.axis.creation.ui.task;
12		15
Lines 202-209 Link Here
202	}	205	}
203	if (soapAddress != null)	206	if (soapAddress != null)
204	{	207	{
205	// String projectURL = ResourceUtils.getEncodedWebProjectURL(serverProject);	208
206	String projectURL = ServerUtils.getEncodedWebComponentURL(serverProject, serviceServerTypeID_);	209	String projectURL = null;
		210	if (serviceServerTypeID_ != null && serviceServerTypeID_.length()>0)
		211	{
		212	projectURL = ServerUtils.getEncodedWebComponentURL(serverProject, serviceServerTypeID_);
		213	}
		214	else
		215	{
		216	projectURL = "http://tempuri.org/";
		217	}
		218
207	if (projectURL == null)	219	if (projectURL == null)
208	return StatusUtils.errorStatus( NLS.bind(AxisCreationUIMessages.MSG_ERROR_PROJECT_URL, new String[] {serverProject.toString()}));	220	return StatusUtils.errorStatus( NLS.bind(AxisCreationUIMessages.MSG_ERROR_PROJECT_URL, new String[] {serverProject.toString()}));
209	StringBuffer serviceURL = new StringBuffer(projectURL);	221	StringBuffer serviceURL = new StringBuffer(projectURL);

Lines 1-12 Link Here

(-)src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java (-5 / +17 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2003, 2004 IBM Corporation and others.	2	* Copyright (c) 2003, 2006 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html	6	* http://www.eclipse.org/legal/epl-v10.html
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* yyyymmdd bug Email and other contact information
		11	* -------- -------- -----------------------------------------------------------
		12	* 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
10	*******************************************************************************/	13	*******************************************************************************/
11	package org.eclipse.jst.ws.internal.axis.creation.ui.task;	14	package org.eclipse.jst.ws.internal.axis.creation.ui.task;
12		15
Lines 72-79 Link Here
72	}	75	}
73		76
74	IProject project = serviceProject_;	77	IProject project = serviceProject_;
75	//String projectURL = ResourceUtils.getEncodedWebProjectURL(project);	78
76	String projectURL = ServerUtils.getEncodedWebComponentURL(project, serviceServerTypeID_);	79	String projectURL = null;
		80	if (serviceServerTypeID_ != null && serviceServerTypeID_.length()>0)
		81	{
		82	projectURL = ServerUtils.getEncodedWebComponentURL(project, serviceServerTypeID_);
		83	}
		84	else
		85	{
		86	projectURL = "http://tempuri.org/";
		87	}
		88
77	if (projectURL == null) {	89	if (projectURL == null) {
78	status = StatusUtils.errorStatus(NLS.bind(AxisCreationUIMessages.MSG_ERROR_PROJECT_URL,new String[] {project.toString()}));	90	status = StatusUtils.errorStatus(NLS.bind(AxisCreationUIMessages.MSG_ERROR_PROJECT_URL,new String[] {project.toString()}));
79	environment.getStatusHandler().reportError(status);	91	environment.getStatusHandler().reportError(status);

Lines 1-12 Link Here

(-)src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java (-4 / +16 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2001, 2004 IBM Corporation and others.	2	* Copyright (c) 2001, 2006 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html	6	* http://www.eclipse.org/legal/epl-v10.html
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* yyyymmdd bug Email and other contact information
		11	* -------- -------- -----------------------------------------------------------
		12	* 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
10	*******************************************************************************/	13	*******************************************************************************/
11	package org.eclipse.jst.ws.internal.axis.creation.ui.task;	14	package org.eclipse.jst.ws.internal.axis.creation.ui.task;
12		15
Lines 170-176 Link Here
170	javaWSDLParam_.setStyle(JavaWSDLParameter.STYLE_WRAPPED);	173	javaWSDLParam_.setStyle(JavaWSDLParameter.STYLE_WRAPPED);
171	javaWSDLParam_.setUse(JavaWSDLParameter.USE_LITERAL);	174	javaWSDLParam_.setUse(JavaWSDLParameter.USE_LITERAL);
172		175
173	String projectURL = ServerUtils.getEncodedWebComponentURL(serviceProject_, serviceServerTypeID_);	176	String projectURL = null;
		177	if (serviceServerTypeID_ != null && serviceServerTypeID_.length()>0)
		178	{
		179	projectURL = ServerUtils.getEncodedWebComponentURL(serviceProject_, serviceServerTypeID_);
		180	}
		181	else
		182	{
		183	projectURL = "http://tempuri.org/";
		184	}
		185
174	if (projectURL == null) {	186	if (projectURL == null) {
175	status = StatusUtils.errorStatus( AxisCreationUIMessages.MSG_ERROR_PROJECT_URL);	187	status = StatusUtils.errorStatus( AxisCreationUIMessages.MSG_ERROR_PROJECT_URL);
176	environment.getStatusHandler().reportError(status);	188	environment.getStatusHandler().reportError(status);

Lines 44-50 Link Here

(-)plugin.xml (-1 / +2 lines)
44	<extension point="org.eclipse.jst.ws.consumption.ui.runtimes">	44	<extension point="org.eclipse.jst.ws.consumption.ui.runtimes">
45	<runtime	45	<runtime
46	id="org.eclipse.jst.ws.axis.creation.axisWebServiceRT"	46	id="org.eclipse.jst.ws.axis.creation.axisWebServiceRT"
47	label="%LABEL_RUNTIME_AXIS_11"/>	47	label="%LABEL_RUNTIME_AXIS_11"
		48	serverRequired="false"/>
48	</extension>	49	</extension>
49		50
50	<!-- define support for Axis Java bean bottom up and top-down support in web projects -->	51	<!-- define support for Axis Java bean bottom up and top-down support in web projects -->

Return to bug 119111