activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject svn commit: r515989 - in /activemq/trunk/activemq-console/src/main: java/org/apache/activemq/console/Main.java resources/META-INF/DISCLAIMER.txt
Date Thu, 08 Mar 2007 09:38:13 GMT
Author: jstrachan
Date: Thu Mar  8 01:38:13 2007
New Revision: 515989

URL: http://svn.apache.org/viewvc?view=rev&rev=515989
Log:
added lib/web directory if folks are embedded web apps in the broker

Removed:
    activemq/trunk/activemq-console/src/main/resources/META-INF/DISCLAIMER.txt
Modified:
    activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/Main.java

Modified: activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/Main.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/Main.java?view=diff&rev=515989&r1=515988&r2=515989
==============================================================================
--- activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/Main.java (original)
+++ activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/Main.java Thu
Mar  8 01:38:13 2007
@@ -71,20 +71,27 @@
         // ${activemq.home}/lib/*
         // ${activemq.base}/lib/optional/* (only if activemq.base != activemq.home)
         // ${activemq.home}/lib/optional/*
+        // ${activemq.base}/lib/web/* (only if activemq.base != activemq.home)
+        // ${activemq.home}/lib/web/*
         //
         if(useDefExt && app.canUseExtdir()) {
 
             boolean baseIsHome = app.getActiveMQBase().equals(app.getActiveMQHome());
 
+            File baseLibDir = new File(app.getActiveMQBase(), "lib");
+            File homeLibDir = new File(app.getActiveMQHome(), "lib");
+
             if(!baseIsHome) {
-                app.addExtensionDirectory(new File(app.getActiveMQBase(), "lib"));
+                app.addExtensionDirectory(baseLibDir);
             }
-            app.addExtensionDirectory(new File(app.getActiveMQHome(), "lib"));
+            app.addExtensionDirectory(homeLibDir);
 
             if(!baseIsHome) {
-                app.addExtensionDirectory(new File(new File(app.getActiveMQBase(), "lib"),
"optional"));
+                app.addExtensionDirectory(new File(baseLibDir, "optional"));
+                app.addExtensionDirectory(new File(baseLibDir, "web"));
             }
-            app.addExtensionDirectory(new File(new File(app.getActiveMQHome(), "lib"), "optional"));
+            app.addExtensionDirectory(new File(homeLibDir, "optional"));
+            app.addExtensionDirectory(new File(homeLibDir, "web"));
 
         }
 



Mime
View raw message