geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r720786 - in /geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application: ApplicationArtifactFilter.java ApplicationManagerImpl.java
Date Wed, 26 Nov 2008 10:26:47 GMT
Author: jdillon
Date: Wed Nov 26 02:26:46 2008
New Revision: 720786

URL: http://svn.apache.org/viewvc?rev=720786&view=rev
Log:
Fix up the artifact filter

Modified:
    geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationArtifactFilter.java
    geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java

Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationArtifactFilter.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationArtifactFilter.java?rev=720786&r1=720785&r2=720786&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationArtifactFilter.java
(original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationArtifactFilter.java
Wed Nov 26 02:26:46 2008
@@ -38,15 +38,14 @@
         "gshell-artifact",
         "gshell-ansi",
         "gshell-api",
-        "gshell-artifact",
         "gshell-application",
+        "gshell-artifact",
+        "gshell-chronos",
         "gshell-cli",
         "gshell-clp",
-        "gshell-chronos",
         "gshell-event",
         "gshell-i18n",
         "gshell-io",
-        "gshell-model",
         "gshell-spring",
         "gshell-terminal",
         "gshell-wisdom-bootstrap",
@@ -69,6 +68,7 @@
 
         // gshell-artifact-maven
         "gshell-artifact-maven",
+        "gshell-plexus",
         "aspectjrt",
         "maven-artivact",
         "maven-model",

Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java?rev=720786&r1=720785&r2=720786&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java
(original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java
Wed Nov 26 02:26:46 2008
@@ -137,7 +137,9 @@
         assert model != null;
 
         // FIXME: Get basedir from application
-        ClassPathCache cache = new ClassPathCache(new File(new File(System.getProperty("gshell.home")),
"var/classpath.ser"));
+        Artifact artifact = model.getArtifact();
+        ClassPathCache cache = new ClassPathCache(new File(new File(System.getProperty("gshell.home")),
"var/" + artifact.getGroup() + "/" + artifact.getName() + "/classpath.ser"));
+                
         ClassPath classPath = cache.get();
 
         if (classPath == null) {
@@ -210,7 +212,7 @@
 
                 final SecurityManager prevSM = System.getSecurityManager();
                 System.setSecurityManager(sm);
-                
+
                 try {
                     return method.invoke(shell, args);
                 }



Mime
View raw message