Attachment 143874 Details for Bug 285722 – Patch to add a webResource attribute to element Resources of server.xml

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

[patch] Patch to add a webResource attribute to element Resources of server.xml

org.eclipse.jst.server.tomcat.core (text/plain), 3.92 KB, created by Matteo TURRA

on 2009-08-10 05:09:15 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Matteo TURRA

Created: 2009-08-10 05:09:15 EDT

Size: 3.92 KB

patch

obsolete

>Index: tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server40/Resources.java
>===================================================================
>RCS file: /cvsroot/webtools/servertools/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server40/Resources.java,v
>retrieving revision 1.1
>diff -u -r1.1 Resources.java
>--- tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server40/Resources.java	27 Mar 2007 03:11:22 -0000	1.1
>+++ tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server40/Resources.java	10 Aug 2009 09:07:20 -0000
>@@ -48,4 +48,12 @@
> 	public void setVirtualClasspath(String virtualClasspath) {
> 		setAttributeValue("virtualClasspath", virtualClasspath);
> 	}
>+	
>+	/**
>+	 * Set webResourcesFolders attribute.
>+	 * @param webResourcesFolders value to set
>+	 */
>+	public void setWebResources(String webResourcesFolders) {
>+		setAttributeValue("webResources", webResourcesFolders);
>+	}
> }
>Index: tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server40/Loader.java
>===================================================================
>RCS file: /cvsroot/webtools/servertools/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server40/Loader.java,v
>retrieving revision 1.1
>diff -u -r1.1 Loader.java
>--- tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server40/Loader.java	27 Mar 2007 03:11:22 -0000	1.1
>+++ tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/server40/Loader.java	10 Aug 2009 09:07:20 -0000
>@@ -50,6 +50,14 @@
>     }
> 
>     /**
>+     * Set WTP virtualClasspath attribute.
>+     * @param virtualClasspath value to set
>+     */
>+    public void setWebResources(String virtualClasspath) {
>+        setAttributeValue("webResources", virtualClasspath);
>+    }
>+
>+    /**
>      * Get useSystemClassLoaderAsParent attribute
>      * @return useSystemClassLoaderAsParent value
>      */
>Index: tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatPublishModuleVisitor.java
>===================================================================
>RCS file: /cvsroot/webtools/servertools/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatPublishModuleVisitor.java,v
>retrieving revision 1.3
>diff -u -r1.3 TomcatPublishModuleVisitor.java
>--- tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatPublishModuleVisitor.java	22 Jan 2008 23:22:25 -0000	1.3
>+++ tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatPublishModuleVisitor.java	10 Aug 2009 09:07:20 -0000
>@@ -19,6 +19,7 @@
> import java.util.Map;
> import java.util.Set;
> 
>+import org.eclipse.core.resources.IResource;
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.core.runtime.IPath;
> import org.eclipse.core.runtime.IStatus;
>@@ -67,7 +68,12 @@
>      */
>     protected Set virtualClassClasspathElements = new LinkedHashSet();
>     protected Set virtualJarClasspathElements = new LinkedHashSet();
>-
>+    
>+    /**
>+     * Contains wb-resorces of components
>+     */
>+    protected Set virtualWebResourcesElements = new LinkedHashSet();
>+    
>     /**
>      * Instantiate a new TomcatPublishModuleVisitor
>      * 
>@@ -259,6 +265,15 @@
>             loader.setVirtualClasspath(vcp);
>             context.getResources().setVirtualClasspath(vcp);
>         }
>+        
>+        StringBuffer buffer2 = new StringBuffer();
>+        IResource[] underlyingRes = component.getRootFolder().getUnderlyingResources();
>+        for (int i=1; i<underlyingRes.length; i++  ) {
>+        	buffer2.append(underlyingRes[i].getLocation().toOSString()).append(";");
>+        }
>+        loader.setWebResources(buffer2.toString());
>+        context.getResources().setWebResources(buffer2.toString());
>+        
> 
>         if (dirty) {
>         	//TODO If writing to separate context XML files, save "dirty" status for later use

Actions: View | Diff

Attachments on bug 285722: 143872 | 143874 | 143875 | 143876 | 143877