Attachment 35113 Details for Bug 119111 – apply to org.eclipse.jst.ws.axis.creation.ui

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

[patch] apply to org.eclipse.jst.ws.axis.creation.ui

patch119111_o.e.jst.ws.axis.creation.ui.txt (text/plain), 10.33 KB, created by Rupam Kuehner

on 2006-02-21 19:26:53 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Rupam Kuehner

Created: 2006-02-21 19:26:53 EST

Size: 10.33 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.ws.axis.creation.ui
>Index: src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidgetDefaultingCommand.java
>===================================================================
>RCS file: /cvsroot/webtools/jst/components/ws/plugins/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidgetDefaultingCommand.java,v
>retrieving revision 1.13
>diff -u -r1.13 SkeletonConfigWidgetDefaultingCommand.java
>--- src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidgetDefaultingCommand.java	6 Jan 2006 17:04:30 -0000	1.13
>+++ src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidgetDefaultingCommand.java	22 Feb 2006 00:23:44 -0000
>@@ -1,12 +1,15 @@
> /*******************************************************************************
>- * Copyright (c) 2004 IBM Corporation and others.
>+ * Copyright (c) 2004, 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:
>- *     IBM Corporation - initial API and implementation
>+ * IBM Corporation - initial API and implementation
>+ * yyyymmdd bug      Email and other contact information
>+ * -------- -------- -----------------------------------------------------------
>+ * 20060221   119111 rsinha@ca.ibm.com - Rupam Kuehner
>  *******************************************************************************/
> package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton;
> 
>@@ -51,8 +54,15 @@
> 		javaWSDLParam.setJavaOutput(javaOutput);
> 
> 
>-	
>-	String projectURL = ServerUtils.getEncodedWebComponentURL(serverProject, serviceServerTypeID_);
>+    String projectURL = null;
>+	if (serviceServerTypeID_ != null && serviceServerTypeID_.length()>0)
>+    {
>+	  projectURL = ServerUtils.getEncodedWebComponentURL(serverProject, serviceServerTypeID_);
>+    }
>+    else
>+    {
>+      projectURL = "http://tempuri.org/";
>+    }
> 	
> 	if (projectURL == null) {
> 	    status = StatusUtils.errorStatus(NLS.bind(AxisCreationUIMessages.MSG_ERROR_PROJECT_URL, new String[] { serverProject.toString()}));
>@@ -130,4 +140,4 @@
> public void setServiceServerTypeID(String serviceServerTypeID) {
> 	this.serviceServerTypeID_ = serviceServerTypeID;
> }
>-}
>\ No newline at end of file
>+}
>Index: src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java
>===================================================================
>RCS file: /cvsroot/webtools/jst/components/ws/plugins/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java,v
>retrieving revision 1.21
>diff -u -r1.21 Skeleton2WSDLCommand.java
>--- src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java	9 Jan 2006 21:25:13 -0000	1.21
>+++ src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java	22 Feb 2006 00:23:40 -0000
>@@ -1,12 +1,15 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2005 IBM Corporation and others.
>+ * Copyright (c) 2000, 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:
>- *     IBM Corporation - initial API and implementation
>+ * IBM Corporation - initial API and implementation
>+ * yyyymmdd bug      Email and other contact information
>+ * -------- -------- -----------------------------------------------------------
>+ * 20060221   119111 rsinha@ca.ibm.com - Rupam Kuehner
>  *******************************************************************************/
> package org.eclipse.jst.ws.internal.axis.creation.ui.task;
> 
>@@ -202,8 +205,17 @@
>     }
>     if (soapAddress != null)
>     {
>-//      String projectURL = ResourceUtils.getEncodedWebProjectURL(serverProject);
>-	  String projectURL = ServerUtils.getEncodedWebComponentURL(serverProject, serviceServerTypeID_);
>+      
>+      String projectURL = null;
>+      if (serviceServerTypeID_ != null && serviceServerTypeID_.length()>0)
>+      {
>+	    projectURL = ServerUtils.getEncodedWebComponentURL(serverProject, serviceServerTypeID_);
>+      }
>+      else
>+      {
>+        projectURL = "http://tempuri.org/";
>+      }
>+      
>       if (projectURL == null)
>         return StatusUtils.errorStatus( NLS.bind(AxisCreationUIMessages.MSG_ERROR_PROJECT_URL, new String[] {serverProject.toString()}));
>       StringBuffer serviceURL = new StringBuffer(projectURL);
>Index: src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java
>===================================================================
>RCS file: /cvsroot/webtools/jst/components/ws/plugins/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java,v
>retrieving revision 1.19
>diff -u -r1.19 UpdateAxisWSDDFileTask.java
>--- src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java	14 Nov 2005 22:38:54 -0000	1.19
>+++ src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java	22 Feb 2006 00:23:40 -0000
>@@ -1,12 +1,15 @@
> /*******************************************************************************
>- * Copyright (c) 2003, 2004 IBM Corporation and others.
>+ * Copyright (c) 2003, 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:
>- *     IBM Corporation - initial API and implementation
>+ * IBM Corporation - initial API and implementation
>+ * yyyymmdd bug      Email and other contact information
>+ * -------- -------- -----------------------------------------------------------
>+ * 20060221   119111 rsinha@ca.ibm.com - Rupam Kuehner
>  *******************************************************************************/
> package org.eclipse.jst.ws.internal.axis.creation.ui.task;
> 
>@@ -72,8 +75,17 @@
> 		}
> 
> 		IProject project = serviceProject_;
>-		//String projectURL = ResourceUtils.getEncodedWebProjectURL(project);
>-		String projectURL = ServerUtils.getEncodedWebComponentURL(project, serviceServerTypeID_);
>+        
>+        String projectURL = null;
>+        if (serviceServerTypeID_ != null && serviceServerTypeID_.length()>0)
>+        {
>+		  projectURL = ServerUtils.getEncodedWebComponentURL(project, serviceServerTypeID_);
>+        }
>+        else
>+        {
>+          projectURL = "http://tempuri.org/";          
>+        }
>+        
> 		if (projectURL == null) {
> 		    status = StatusUtils.errorStatus(NLS.bind(AxisCreationUIMessages.MSG_ERROR_PROJECT_URL,new String[] {project.toString()}));
> 		    environment.getStatusHandler().reportError(status);
>Index: src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java
>===================================================================
>RCS file: /cvsroot/webtools/jst/components/ws/plugins/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java,v
>retrieving revision 1.24
>diff -u -r1.24 DefaultsForServerJavaWSDLCommand.java
>--- src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java	8 Nov 2005 17:57:19 -0000	1.24
>+++ src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java	22 Feb 2006 00:23:40 -0000
>@@ -1,12 +1,15 @@
> /*******************************************************************************
>- * Copyright (c) 2001, 2004 IBM Corporation and others.
>+ * Copyright (c) 2001, 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:
>- *     IBM Corporation - initial API and implementation
>+ * IBM Corporation - initial API and implementation
>+ * yyyymmdd bug      Email and other contact information
>+ * -------- -------- -----------------------------------------------------------
>+ * 20060221   119111 rsinha@ca.ibm.com - Rupam Kuehner
>  *******************************************************************************/
> package org.eclipse.jst.ws.internal.axis.creation.ui.task;
> 
>@@ -170,7 +173,16 @@
> 		javaWSDLParam_.setStyle(JavaWSDLParameter.STYLE_WRAPPED);
> 		javaWSDLParam_.setUse(JavaWSDLParameter.USE_LITERAL);
> 
>-		String projectURL = ServerUtils.getEncodedWebComponentURL(serviceProject_, serviceServerTypeID_);
>+        String projectURL = null;
>+        if (serviceServerTypeID_ != null && serviceServerTypeID_.length()>0)
>+        {
>+		  projectURL = ServerUtils.getEncodedWebComponentURL(serviceProject_, serviceServerTypeID_);          
>+        }
>+        else
>+        {
>+          projectURL = "http://tempuri.org/";          
>+        }
>+        
> 		if (projectURL == null) {
> 			status = StatusUtils.errorStatus( AxisCreationUIMessages.MSG_ERROR_PROJECT_URL);
> 			environment.getStatusHandler().reportError(status);
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/webtools/jst/components/ws/plugins/org.eclipse.jst.ws.axis.creation.ui/plugin.xml,v
>retrieving revision 1.23
>diff -u -r1.23 plugin.xml
>--- plugin.xml	26 Nov 2005 05:42:37 -0000	1.23
>+++ plugin.xml	22 Feb 2006 00:23:40 -0000
>@@ -44,7 +44,8 @@
>     <extension point="org.eclipse.jst.ws.consumption.ui.runtimes">
>       <runtime
>         id="org.eclipse.jst.ws.axis.creation.axisWebServiceRT"
>-        label="%LABEL_RUNTIME_AXIS_11"/>
>+        label="%LABEL_RUNTIME_AXIS_11"
>+        serverRequired="false"/>
>     </extension>
> 
>

Actions: View | Diff

Attachments on bug 119111: 35109 | 35110 | 35111 | 35112 | 35113