svn commit: r1241422 - in /openejb/trunk/openejb/server/openejb-common-cli/src/main: java/org/apache/openejb/server/cli/CliRunnable.java resources/branding.properties

[rm...@apache.org]

Author: rmannibucau
Date: Tue Feb  7 10:57:44 2012
New Revision: 1241422

URL: http://svn.apache.org/viewvc?rev=1241422&view=rev
Log:
trying to optimize a bit the scanning of commands

Modified:
    openejb/trunk/openejb/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/CliRunnable.java
    openejb/trunk/openejb/server/openejb-common-cli/src/main/resources/branding.properties

Modified: openejb/trunk/openejb/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/CliRunnable.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/CliRunnable.java?rev=1241422&r1=1241421&r2=1241422&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/CliRunnable.java (original)
+++ openejb/trunk/openejb/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/CliRunnable.java Tue Feb  7 10:57:44 2012
@@ -19,11 +19,13 @@ package org.apache.openejb.server.cli;
 import jline.ConsoleReader;
 import jline.FileNameCompletor;
 import jline.SimpleCompletor;
+import org.apache.openejb.config.NewLoaderLogic;
 import org.apache.openejb.server.cli.command.AbstractCommand;
 import org.apache.openejb.server.cli.command.Command;
 import org.apache.openejb.util.OpenEjbVersion;
 import org.apache.xbean.finder.Annotated;
 import org.apache.xbean.finder.ClassFinder;
+import org.apache.xbean.finder.UrlSet;
 import org.apache.xbean.recipe.ObjectRecipe;
 import org.apache.xbean.recipe.Option;
 
@@ -74,7 +76,13 @@ public class CliRunnable implements Runn
         }
 
         try {
-            final ClassFinder finder = new ClassFinder(CliRunnable.class.getClassLoader());
+            final UrlSet forceCommonCli = new UrlSet(CliRunnable.class.getClassLoader()).matching(".*openejb-common-cli.*");
+            UrlSet urls = new UrlSet(CliRunnable.class.getClassLoader());
+            urls = NewLoaderLogic.applyBuiltinExcludes(urls);
+            urls = urls.exclude(".*openejb.*");
+            urls = urls.include(forceCommonCli);
+
+            final ClassFinder finder = new ClassFinder(CliRunnable.class.getClassLoader(), urls.getUrls());
             for (Annotated<Class<?>> cmd : finder.findMetaAnnotatedClasses(Command.class)) {
                 try {
                     final Command annotation = cmd.getAnnotation(Command.class);

Modified: openejb/trunk/openejb/server/openejb-common-cli/src/main/resources/branding.properties
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-common-cli/src/main/resources/branding.properties?rev=1241422&r1=1241421&r2=1241422&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-common-cli/src/main/resources/branding.properties (original)
+++ openejb/trunk/openejb/server/openejb-common-cli/src/main/resources/branding.properties Tue Feb  7 10:57:44 2012
@@ -22,7 +22,7 @@ welcome_openejb = \ \ ___               
 \ \\___/| .__/\\___|_||_|___\\__/|___/\r\n\
 \ \ \ \ \ \ |_|
 
-welcome_tomee = \ \ _____          ___ ___\r\n\
+welcome_tomee = \ _____          ___ ___\r\n\
 |_   _|__ _ __ | __| __|\r\n\
 \ \ | |/ _ \\ '  \\| _|| _|\r\n\
 \ \ |_|\\___/_|_|_|___|___|\r\n\