Attachment 144869 Details for Bug 286859 – removed spaces change

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

removed spaces change

286859.txt (text/plain), 3.76 KB, created by Zina Mostafia

on 2009-08-18 15:25:07 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Zina Mostafia

Created: 2009-08-18 15:25:07 EDT

Size: 3.76 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.ws.consumption
>Index: src/org/eclipse/jst/ws/internal/consumption/common/FacetUtils.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetUtils.java,v
>retrieving revision 1.25
>diff -u -r1.25 FacetUtils.java
>--- src/org/eclipse/jst/ws/internal/consumption/common/FacetUtils.java	14 May 2008 03:21:28 -0000	1.25
>+++ src/org/eclipse/jst/ws/internal/consumption/common/FacetUtils.java	18 Aug 2009 19:25:51 -0000
>@@ -30,10 +30,13 @@
> import org.eclipse.core.resources.IProject;
> import org.eclipse.core.resources.ResourcesPlugin;
> import org.eclipse.core.runtime.CoreException;
>+import org.eclipse.core.runtime.IPath;
> import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.core.runtime.IStatus;
>+import org.eclipse.core.runtime.Path;
> import org.eclipse.core.runtime.Platform;
> import org.eclipse.core.runtime.Status;
>+import org.eclipse.jdt.core.IClasspathEntry;
> import org.eclipse.jdt.core.IJavaProject;
> import org.eclipse.jdt.core.JavaCore;
> import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
>@@ -776,6 +779,7 @@
>         try
>         {
>           fproject.modify(actions, shellMonitor);
>+		  fixEJBClassPath(fproject);
>         } catch (CoreException e)
>         {
>           status[0] = getErrorStatusForAddingFacets(fproject.getProject().getName(), projectFacetVersions, e);
>@@ -802,6 +806,7 @@
> 		try
>         {
>           fproject.modify(actions, null);
>+		  fixEJBClassPath(fproject);
>         } catch (CoreException e)
>         {
>           status[0] = getErrorStatusForAddingFacets(fproject.getProject().getName(), projectFacetVersions, e);
>@@ -811,7 +816,35 @@
>     return status[0];
>   }
>   
>-  /**
>+  protected static void fixEJBClassPath(IFacetedProject project) {
>+			if (!J2EEUtils.isEJBComponent(project.getProject())) return;
>+			IProject ejbProject = project.getProject();
>+			IJavaProject javaProject = JavaCore.create(ejbProject);
>+			Path projectRoot = new Path(Path.ROOT.append(new Path(ejbProject.getName())).toString());
>+			IPath ejbModulePath = projectRoot.append("ejbModule");
>+			try {
>+				IClasspathEntry[] originalSet = javaProject.getRawClasspath();
>+				boolean foundEJBModulEntry = false;
>+				for (int i = 0; i < originalSet.length ; i++) {
>+					if (originalSet[i].equals(ejbModulePath))
>+						foundEJBModulEntry = true;
>+				}
>+				if (!foundEJBModulEntry) {
>+					IClasspathEntry[] newSet = new IClasspathEntry[originalSet.length + 1];
>+					for (int i = 0; i < originalSet.length ; i++) {
>+						newSet[i] = originalSet[i];
>+					}
>+					newSet[originalSet.length] = JavaCore.newSourceEntry(ejbModulePath);
>+					javaProject.setRawClasspath(newSet,null);
>+				}
>+			}
>+			catch (Exception e) {
>+				// TODO: handle exception
>+			}  		
>+
>+		}
>+
>+/**
>    * Returns an error status indicating that the facet versions could not be
>    * added to the faceted project
>    * 
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF,v
>retrieving revision 1.45.2.7
>diff -u -r1.45.2.7 MANIFEST.MF
>--- META-INF/MANIFEST.MF	19 May 2009 10:56:43 -0000	1.45.2.7
>+++ META-INF/MANIFEST.MF	18 Aug 2009 19:25:51 -0000
>@@ -2,7 +2,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %PLUGIN_NAME
> Bundle-SymbolicName: org.eclipse.jst.ws.consumption; singleton:=true
>-Bundle-Version: 1.0.308.qualifier
>+Bundle-Version: 1.0.309.qualifier
> Bundle-ClassPath: wsc.jar,
>  webserviceutils.jar
> Bundle-Activator: org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin

Actions: View

Attachments on bug 286859: 144720 | 144723 | 144732 | 144862 | 144863 | 144869 | 144875