Return-Path: 
 <scm-return-14059-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 56250 invoked from network); 10 Aug 2006 19:27:34 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 10 Aug 2006 19:27:34 -0000
Received: (qmail 10072 invoked by uid 500); 10 Aug 2006 19:27:33 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 9918 invoked by uid 500); 10 Aug 2006 19:27:33 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 9906 invoked by uid 99); 10 Aug 2006 19:27:33 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Aug 2006 12:27:33 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Aug 2006 12:27:32 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 2AAEB1A9820; Thu, 10 Aug 2006 12:27:06 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r430494 - in
 /geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core:
 plugin.xml
 src/org/apache/geronimo/st/core/GeronimoSourcePathComputerDelegate.java
Date: Thu, 10 Aug 2006 19:27:05 -0000
To: scm@geronimo.apache.org
From: sppatel@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060810192706.2AAEB1A9820@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: sppatel
Date: Thu Aug 10 12:27:04 2006
New Revision: 430494

URL: http://svn.apache.org/viewvc?rev=430494&view=rev
Log:
provide src path computer to allow geronimo runtime source to be resolved

Added:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoSourcePathComputerDelegate.java   (with props)
Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml?rev=430494&r1=430493&r2=430494&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml Thu Aug 10 12:27:04 2006
@@ -9,8 +9,16 @@
 	        delegate="org.apache.geronimo.st.core.GeronimoLaunchConfigurationDelegate"
 	        modes="run, debug, profile"
 	        sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
-	        sourcePathComputerId="org.eclipse.jst.server.generic.core.sourcePathComputer"/>
+	        sourcePathComputerId="org.apache.geronimo.st.core.sourcePathComputer"/>
 	</extension>
+	
+	<!--org.eclipse.jst.server.generic.core.sourcePathComputer-->
+	
+	<extension point="org.eclipse.debug.core.sourcePathComputers">
+    	<sourcePathComputer
+        	id="org.apache.geronimo.st.core.sourcePathComputer"
+        	class="org.apache.geronimo.st.core.GeronimoSourcePathComputerDelegate"/>
+  	</extension>
 	  
 	<extension point="org.eclipse.wst.server.core.launchableAdapters">
       	<launchableAdapter

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoSourcePathComputerDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoSourcePathComputerDelegate.java?rev=430494&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoSourcePathComputerDelegate.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoSourcePathComputerDelegate.java Thu Aug 10 12:27:04 2006
@@ -0,0 +1,96 @@
+/**
+ *  Copyright 2006 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.st.core;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.sourcelookup.ISourceContainer;
+import org.eclipse.debug.core.sourcelookup.ISourcePathComputerDelegate;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
+import org.eclipse.jdt.launching.JavaRuntime;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.ServerUtil;
+
+public class GeronimoSourcePathComputerDelegate implements ISourcePathComputerDelegate {
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.debug.core.sourcelookup.ISourcePathComputerDelegate#computeSourceContainers(org.eclipse.debug.core.ILaunchConfiguration,
+	 *      org.eclipse.core.runtime.IProgressMonitor)
+	 */
+	public ISourceContainer[] computeSourceContainers(ILaunchConfiguration configuration, IProgressMonitor monitor) throws CoreException {
+
+		IServer server = ServerUtil.getServer(configuration);
+		IModule[] modules = server.getModules();
+
+		List javaProjectList = new ArrayList();
+		// populate list of java projects and their source folders
+		processModules(modules, javaProjectList, server, monitor);
+
+		// create a ProjectRuntime classpath entry for each JavaProject
+		IRuntimeClasspathEntry[] projectEntries = new IRuntimeClasspathEntry[javaProjectList.size()];
+		for (int i = 0; i < javaProjectList.size(); i++) {
+			projectEntries[i] = JavaRuntime.newProjectRuntimeClasspathEntry((IJavaProject) javaProjectList.get(i));
+		}
+
+		// combine unresolved entries and project entries
+		IRuntimeClasspathEntry[] unresolvedEntries = JavaRuntime.computeUnresolvedSourceLookupPath(configuration);
+		IRuntimeClasspathEntry[] entries = new IRuntimeClasspathEntry[projectEntries.length + unresolvedEntries.length];
+		System.arraycopy(unresolvedEntries, 0, entries, 0, unresolvedEntries.length);
+		System.arraycopy(projectEntries, 0, entries, unresolvedEntries.length, projectEntries.length);
+
+		IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveSourceLookupPath(entries, configuration);
+		ISourceContainer[] javaSourceContainers = JavaRuntime.getSourceContainers(resolved);
+
+		// TODO support resolving from geronimo source distribution
+
+		return javaSourceContainers;
+	}
+
+	private void processModules(IModule[] modules, List javaProjectList, IServer server, IProgressMonitor monitor) {
+		for (int i = 0; i < modules.length; i++) {
+			IProject project = modules[i].getProject();
+
+			IModule[] childModules = server.getChildModules(new IModule[] { modules[i] }, monitor);
+			if (childModules != null && childModules.length > 0) {
+				processModules(childModules, javaProjectList, server, monitor);
+			}
+
+			if (project != null) {
+				try {
+					if (project.hasNature(JavaCore.NATURE_ID)) {
+						IJavaProject javaProject = (IJavaProject) project.getNature(JavaCore.NATURE_ID);
+						if (!javaProjectList.contains(javaProject)) {
+							javaProjectList.add(javaProject);
+						}
+					}
+				} catch (Exception e) {
+					// ignore
+				}
+			}
+		}
+	}
+
+}

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoSourcePathComputerDelegate.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoSourcePathComputerDelegate.java
------------------------------------------------------------------------------
    svn:keywords = Date Rev

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoSourcePathComputerDelegate.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain