geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r240070 - in /geronimo/trunk/sandbox/eclipse-plugin/org.apache.geronimo.core: .options META-INF/MANIFEST.MF plugin.xml src/org/apache/geronimo/core/internal/GeronimoUtils.java src/org/apache/geronimo/core/internal/Trace.java
Date Thu, 25 Aug 2005 13:14:18 GMT
Author: geirm
Date: Thu Aug 25 06:14:13 2005
New Revision: 240070

URL: http://svn.apache.org/viewcvs?rev=240070&view=rev
Log:
GERONIMO-884 : applied patch2.txt.  Ignored the removal of .cvsignore in 
patch as I had removed as part of other JIRA 


Modified:
    geronimo/trunk/sandbox/eclipse-plugin/org.apache.geronimo.core/.options
    geronimo/trunk/sandbox/eclipse-plugin/org.apache.geronimo.core/META-INF/MANIFEST.MF
    geronimo/trunk/sandbox/eclipse-plugin/org.apache.geronimo.core/plugin.xml
    geronimo/trunk/sandbox/eclipse-plugin/org.apache.geronimo.core/src/org/apache/geronimo/core/internal/GeronimoUtils.java
    geronimo/trunk/sandbox/eclipse-plugin/org.apache.geronimo.core/src/org/apache/geronimo/core/internal/Trace.java

Modified: geronimo/trunk/sandbox/eclipse-plugin/org.apache.geronimo.core/.options
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/eclipse-plugin/org.apache.geronimo.core/.options?rev=240070&r1=240069&r2=240070&view=diff
==============================================================================
--- geronimo/trunk/sandbox/eclipse-plugin/org.apache.geronimo.core/.options (original)
+++ geronimo/trunk/sandbox/eclipse-plugin/org.apache.geronimo.core/.options Thu Aug 25 06:14:13
2005
@@ -1,4 +1 @@
-# Debugging options for the org.eclipse.jst.server.geronimo.core plugin
-
-# Turn on general debugging
-org.eclipse.jst.server.geronimo.core/debug=true
+org.apache.geronimo.core/debug=true

Modified: geronimo/trunk/sandbox/eclipse-plugin/org.apache.geronimo.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/eclipse-plugin/org.apache.geronimo.core/META-INF/MANIFEST.MF?rev=240070&r1=240069&r2=240070&view=diff
==============================================================================
--- geronimo/trunk/sandbox/eclipse-plugin/org.apache.geronimo.core/META-INF/MANIFEST.MF (original)
+++ geronimo/trunk/sandbox/eclipse-plugin/org.apache.geronimo.core/META-INF/MANIFEST.MF Thu
Aug 25 06:14:13 2005
@@ -25,6 +25,7 @@
  org.apache.geronimo.runtime.v1,
  org.eclipse.wst.common.frameworks,
  org.eclipse.core.commands,
- org.apache.geronimo.deployment.model
+ org.apache.geronimo.deployment.model,
+ org.eclipse.jem.util
 Eclipse-AutoStart: true
 Export-Package: org.apache.geronimo.core.internal;x-friends:="org.apache.geronimo.ui"

Modified: geronimo/trunk/sandbox/eclipse-plugin/org.apache.geronimo.core/plugin.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/eclipse-plugin/org.apache.geronimo.core/plugin.xml?rev=240070&r1=240069&r2=240070&view=diff
==============================================================================
--- geronimo/trunk/sandbox/eclipse-plugin/org.apache.geronimo.core/plugin.xml (original)
+++ geronimo/trunk/sandbox/eclipse-plugin/org.apache.geronimo.core/plugin.xml Thu Aug 25 06:14:13
2005
@@ -31,6 +31,8 @@
            class="org.apache.geronimo.core.internal.GeronimoServer"
            initialState="stopped"
            supportsRemoteHosts="false"
+           startTimeout="75000"
+	       stopTimeout="30000"
            startBeforePublish="true"
            runtimeTypeId="org.eclipse.jst.server.runtime.geronimo.10"
            launchConfigId="org.eclipse.jst.server.generic.core.launchConfigurationType"

Modified: geronimo/trunk/sandbox/eclipse-plugin/org.apache.geronimo.core/src/org/apache/geronimo/core/internal/GeronimoUtils.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/eclipse-plugin/org.apache.geronimo.core/src/org/apache/geronimo/core/internal/GeronimoUtils.java?rev=240070&r1=240069&r2=240070&view=diff
==============================================================================
--- geronimo/trunk/sandbox/eclipse-plugin/org.apache.geronimo.core/src/org/apache/geronimo/core/internal/GeronimoUtils.java
(original)
+++ geronimo/trunk/sandbox/eclipse-plugin/org.apache.geronimo.core/src/org/apache/geronimo/core/internal/GeronimoUtils.java
Thu Aug 25 06:14:13 2005
@@ -40,6 +40,7 @@
 import org.eclipse.wst.common.componentcore.resources.IFlexibleProject;
 import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
 import org.eclipse.wst.server.core.IModule;
+import org.openejb.xml.ns.openejb.jar.OpenejbJarType;
 
 public class GeronimoUtils {
 
@@ -185,6 +186,16 @@
             Resource resource = load(dpFile);
             if (resource != null) {
                 return ((DocumentRoot) resource.getContents().get(0)).getWebApp();
+            }
+        } 
+        return null;
+    }
+    
+    public static OpenejbJarType getOpenEjbDeploymentPlan(IFile dpFile) {       
+        if (dpFile.exists()) {
+            Resource resource = load(dpFile);
+            if (resource != null) {
+                return ((org.openejb.xml.ns.openejb.jar.DocumentRoot) resource.getContents().get(0)).getOpenejbJar();
             }
         } 
         return null;

Modified: geronimo/trunk/sandbox/eclipse-plugin/org.apache.geronimo.core/src/org/apache/geronimo/core/internal/Trace.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/eclipse-plugin/org.apache.geronimo.core/src/org/apache/geronimo/core/internal/Trace.java?rev=240070&r1=240069&r2=240070&view=diff
==============================================================================
--- geronimo/trunk/sandbox/eclipse-plugin/org.apache.geronimo.core/src/org/apache/geronimo/core/internal/Trace.java
(original)
+++ geronimo/trunk/sandbox/eclipse-plugin/org.apache.geronimo.core/src/org/apache/geronimo/core/internal/Trace.java
Thu Aug 25 06:14:13 2005
@@ -18,30 +18,22 @@
  * Helper class to route trace output.
  */
 public class Trace {
-	/**
-	 * Config trace event.
-	 */
-	public static byte CONFIG = 0;
-
-	/**
-	 * Warning trace event.
-	 */
-	public static byte WARNING = 1;
-
-	/**
-	 * Severe trace event.
-	 */
-	public static byte SEVERE = 2;
 
 	/**
 	 * Finest trace event.
 	 */
-	public static byte FINEST = 3;
+	public static byte INFO = 0;
+    
+    /**
+     * Warning trace event.
+     */
+    public static byte WARNING = 1;
+    
+    /**
+     * Severe trace event.
+     */
+    public static byte SEVERE = 2;
 
-	/**
-	 * Parsing trace event.
-	 */
-	public static byte PARSING = 4;
 
 	/**
 	 * Trace constructor comment.
@@ -71,7 +63,7 @@
 		if (!GeronimoPlugin.getInstance().isDebugging())
 			return;
 
-		System.out.println(GeronimoPlugin.PLUGIN_ID + " " + s);
+		System.out.println(GeronimoPlugin.PLUGIN_ID + ":  " + s);
 		if (t != null)
 			t.printStackTrace();
 	}



Mime
View raw message