[jboss-svn-commits] JBL Code SVN: r25497 - in labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse: src/main/java/org/drools/eclipse/preferences and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: KrisVerlaenen
Date: 2009-03-04 19:39:09 -0500 (Wed, 04 Mar 2009)
New Revision: 25497

Added:
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/util/SOAPlatformStandalone4RuntimeRecognizer.java
Modified:
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/plugin.xml
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/preferences/DroolsRuntimesBlock.java
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/util/DroolsRuntimeManager.java
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/util/SOAPlatform4RuntimeRecognizer.java
Log:
 - added support for SOA-P standalone + default

Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/plugin.xml
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/plugin.xml	2009-03-04 22:51:04 UTC (rev 25496)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/plugin.xml	2009-03-05 00:39:09 UTC (rev 25497)
@@ -565,6 +565,12 @@
    <extension
          point="org.drools.eclipse.runtimeRecognizer">
       <recognizer
+            class="org.drools.eclipse.util.SOAPlatformStandalone4RuntimeRecognizer">
+      </recognizer>
+   </extension>
+   <extension
+         point="org.drools.eclipse.runtimeRecognizer">
+      <recognizer
             class="org.drools.eclipse.util.SOAPlatform4RuntimeRecognizer">
       </recognizer>
    </extension>

Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/preferences/DroolsRuntimesBlock.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/preferences/DroolsRuntimesBlock.java	2009-03-04 22:51:04 UTC (rev 25496)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/preferences/DroolsRuntimesBlock.java	2009-03-05 00:39:09 UTC (rev 25497)
@@ -4,11 +4,8 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.drools.eclipse.util.DefaultDroolsRuntimeRecognizer;
 import org.drools.eclipse.util.DroolsRuntime;
 import org.drools.eclipse.util.DroolsRuntimeManager;
-import org.drools.eclipse.util.DroolsRuntimeRecognizer;
-import org.drools.eclipse.util.SOAPlatform4RuntimeRecognizer;
 import org.eclipse.core.runtime.ListenerList;
 import org.eclipse.jdt.internal.debug.ui.SWTFactory;
 import org.eclipse.jface.viewers.CheckStateChangedEvent;

Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/util/DroolsRuntimeManager.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/util/DroolsRuntimeManager.java	2009-03-04 22:51:04 UTC (rev 25496)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/util/DroolsRuntimeManager.java	2009-03-05 00:39:09 UTC (rev 25497)
@@ -210,12 +210,6 @@
 				System.out.println(ex.getMessage());
 			}
 
-			DroolsRuntimeRecognizer recognizer = new SOAPlatform4RuntimeRecognizer();
-			String[] jars = recognizer.recognizeJars(path);
-			if (jars != null && jars.length > 0) {
-				runtime.setJars(jars);
-				return;
-			}
 			runtime.setJars(new DefaultDroolsRuntimeRecognizer().recognizeJars(path));
 		}
 	}

Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/util/SOAPlatform4RuntimeRecognizer.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/util/SOAPlatform4RuntimeRecognizer.java	2009-03-04 22:51:04 UTC (rev 25496)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/util/SOAPlatform4RuntimeRecognizer.java	2009-03-05 00:39:09 UTC (rev 25497)
@@ -12,7 +12,7 @@
 public class SOAPlatform4RuntimeRecognizer implements DroolsRuntimeRecognizer {
 
 	public String[] recognizeJars(String path) {
-        IPath jbossrulesesbPath = new Path(path).append("jboss-esb/server/default/deploy/jbrules.esb");
+        IPath jbossrulesesbPath = new Path(path).append("jboss-as/server/default/deploy/jbrules.esb");
         File jbossrulesesb = jbossrulesesbPath.toFile();
         if (jbossrulesesb.isDirectory()) {
         	List<String> list = new ArrayList<String>();
@@ -33,7 +33,7 @@
         	for (int i = 0; i < files.length; i++) {
 				list.add(files[i].getAbsolutePath());
 			}
-        	IPath jbossesbsarPath = new Path(path).append("jboss-esb/server/default/deploy/jbossesb.sar/lib");
+        	IPath jbossesbsarPath = new Path(path).append("jboss-as/server/default/deploy/jbossesb.sar/lib");
 	        File jbossesbsar=jbossesbsarPath.toFile();
 	        if (jbossesbsar.isDirectory()) {
 	        	files = jbossesbsar.listFiles(new FilenameFilter() {

Copied: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/util/SOAPlatformStandalone4RuntimeRecognizer.java (from rev 25440, labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/util/SOAPlatform4RuntimeRecognizer.java)
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/util/SOAPlatformStandalone4RuntimeRecognizer.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/util/SOAPlatformStandalone4RuntimeRecognizer.java	2009-03-05 00:39:09 UTC (rev 25497)
@@ -0,0 +1,64 @@
+package org.drools.eclipse.util;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+
+public class SOAPlatformStandalone4RuntimeRecognizer implements DroolsRuntimeRecognizer {
+
+	public String[] recognizeJars(String path) {
+        IPath jbossrulesesbPath = new Path(path).append("jboss-esb/server/default/deploy/jbrules.esb");
+        File jbossrulesesb = jbossrulesesbPath.toFile();
+        if (jbossrulesesb.isDirectory()) {
+        	List<String> list = new ArrayList<String>();
+        	// the SOA platform
+        	File[] files = jbossrulesesb.listFiles(new FilenameFilter() {
+
+				public boolean accept(File dir, String name) {
+					if (!name.endsWith(".jar")) {
+						return false;
+					}
+					if (name.startsWith("jbossesb")) {
+						return false;
+					}
+					return true;
+				}
+        		
+        	});
+        	for (int i = 0; i < files.length; i++) {
+				list.add(files[i].getAbsolutePath());
+			}
+        	IPath jbossesbsarPath = new Path(path).append("jboss-esb/server/default/deploy/jbossesb.sar/lib");
+	        File jbossesbsar=jbossesbsarPath.toFile();
+	        if (jbossesbsar.isDirectory()) {
+	        	files = jbossesbsar.listFiles(new FilenameFilter() {
+
+					public boolean accept(File dir, String name) {
+						if (!name.endsWith(".jar")) {
+							return false;
+						}
+						if (name.startsWith("mvel")) {
+							return true;
+						}
+						if (name.startsWith("xstream")) {
+							return true;
+						}
+						return false;
+					}
+	        		
+	        	});
+	        	for (int i = 0; i < files.length; i++) {
+					list.add(files[i].getAbsolutePath());
+				}
+	        }
+	        return list.toArray(new String[list.size()]);
+        }
+        return null;
+	}
+
+}


Property changes on: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/util/SOAPlatformStandalone4RuntimeRecognizer.java
___________________________________________________________________
Name: svn:mergeinfo
   +