You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/03/27 11:29:02 UTC

svn commit: r641768 - in /geronimo/gshell/trunk: gshell-cli/src/main/resources/META-INF/plexus/ gshell-core/src/main/java/org/apache/geronimo/gshell/ gshell-core/src/main/java/org/apache/geronimo/gshell/loader/ gshell-core/src/main/java/org/apache/gero...

Author: jdillon
Date: Thu Mar 27 03:28:54 2008
New Revision: 641768

URL: http://svn.apache.org/viewvc?rev=641768&view=rev
Log:
Re-arrange some bits into packages

Added:
    geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/loader/
    geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/loader/GShellLoader.java   (contents, props changed)
      - copied, changed from r641356, geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/GShellLoader.java
    geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/logging/
    geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/logging/LoggingVisitor.java   (contents, props changed)
      - copied, changed from r640764, geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/LoggingVisitor.java
    geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/logging/Slf4jLoggingManager.java   (contents, props changed)
      - copied, changed from r640764, geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/Slf4jLoggingManager.java
    geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/security/
    geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/security/ShellSecurityManager.java   (contents, props changed)
      - copied, changed from r640764, geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/ShellSecurityManager.java
Removed:
    geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/GShellLoader.java
    geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/LoggingVisitor.java
    geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/ShellSecurityManager.java
    geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/Slf4jLoggingManager.java
Modified:
    geronimo/gshell/trunk/gshell-cli/src/main/resources/META-INF/plexus/plexus.xml
    geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/DefaultCommandLineBuilder.java
    geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/GShell.java

Modified: geronimo/gshell/trunk/gshell-cli/src/main/resources/META-INF/plexus/plexus.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-cli/src/main/resources/META-INF/plexus/plexus.xml?rev=641768&r1=641767&r2=641768&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-cli/src/main/resources/META-INF/plexus/plexus.xml (original)
+++ geronimo/gshell/trunk/gshell-cli/src/main/resources/META-INF/plexus/plexus.xml Thu Mar 27 03:28:54 2008
@@ -28,7 +28,7 @@
         <component>
             <role>org.codehaus.plexus.logging.LoggerManager</role>
             <role-hint>default</role-hint>
-            <implementation>org.apache.geronimo.gshell.Slf4jLoggingManager</implementation>
+            <implementation>org.apache.geronimo.gshell.logging.Slf4jLoggingManager</implementation>
         </component>
 
         <!--

Modified: geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/DefaultCommandLineBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/DefaultCommandLineBuilder.java?rev=641768&r1=641767&r2=641768&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/DefaultCommandLineBuilder.java (original)
+++ geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/DefaultCommandLineBuilder.java Thu Mar 27 03:28:54 2008
@@ -27,6 +27,7 @@
 import org.apache.geronimo.gshell.parser.CommandLineParser;
 import org.apache.geronimo.gshell.parser.ParseException;
 import org.apache.geronimo.gshell.shell.Environment;
+import org.apache.geronimo.gshell.logging.LoggingVisitor;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;

Modified: geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/GShell.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/GShell.java?rev=641768&r1=641767&r2=641768&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/GShell.java (original)
+++ geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/GShell.java Thu Mar 27 03:28:54 2008
@@ -28,6 +28,7 @@
 import org.apache.geronimo.gshell.shell.ShellInfo;
 import org.apache.geronimo.gshell.plugin.CommandDiscoverer;
 import org.apache.geronimo.gshell.plugin.CommandDiscoveryListener;
+import org.apache.geronimo.gshell.security.ShellSecurityManager;
 import org.codehaus.plexus.ContainerConfiguration;
 import org.codehaus.plexus.DefaultContainerConfiguration;
 import org.codehaus.plexus.DefaultPlexusContainer;

Copied: geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/loader/GShellLoader.java (from r641356, geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/GShellLoader.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/loader/GShellLoader.java?p2=geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/loader/GShellLoader.java&p1=geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/GShellLoader.java&r1=641356&r2=641768&rev=641768&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/GShellLoader.java (original)
+++ geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/loader/GShellLoader.java Thu Mar 27 03:28:54 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.geronimo.gshell;
+package org.apache.geronimo.gshell.loader;
 
 import org.apache.geronimo.gshell.model.application.Application;
 import org.apache.geronimo.gshell.model.settings.Settings;
@@ -26,9 +26,11 @@
 import org.apache.geronimo.gshell.lookup.EnvironmentLookup;
 import org.apache.geronimo.gshell.shell.Environment;
 import org.apache.geronimo.gshell.shell.InteractiveShell;
+import org.apache.geronimo.gshell.DefaultEnvironment;
+import org.apache.geronimo.gshell.security.ShellSecurityManager;
+import org.apache.geronimo.gshell.GShell;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
-import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
 import org.apache.maven.artifact.repository.DefaultArtifactRepository;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
 import org.slf4j.Logger;
@@ -41,7 +43,7 @@
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 
 /**
- * Loads {@link GShell} instances.
+ * Loads {@link org.apache.geronimo.gshell.GShell} instances.
  *
  * @version $Rev$ $Date$
  */

Propchange: geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/loader/GShellLoader.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/loader/GShellLoader.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/loader/GShellLoader.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/logging/LoggingVisitor.java (from r640764, geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/LoggingVisitor.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/logging/LoggingVisitor.java?p2=geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/logging/LoggingVisitor.java&p1=geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/LoggingVisitor.java&r1=640764&r2=641768&rev=641768&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/LoggingVisitor.java (original)
+++ geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/logging/LoggingVisitor.java Thu Mar 27 03:28:54 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.geronimo.gshell;
+package org.apache.geronimo.gshell.logging;
 
 import org.apache.geronimo.gshell.parser.ASTCommandLine;
 import org.apache.geronimo.gshell.parser.ASTExpression;

Propchange: geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/logging/LoggingVisitor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/logging/LoggingVisitor.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/logging/LoggingVisitor.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/logging/Slf4jLoggingManager.java (from r640764, geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/Slf4jLoggingManager.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/logging/Slf4jLoggingManager.java?p2=geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/logging/Slf4jLoggingManager.java&p1=geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/Slf4jLoggingManager.java&r1=640764&r2=641768&rev=641768&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/Slf4jLoggingManager.java (original)
+++ geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/logging/Slf4jLoggingManager.java Thu Mar 27 03:28:54 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.geronimo.gshell;
+package org.apache.geronimo.gshell.logging;
 
 import org.codehaus.plexus.logging.AbstractLogger;
 import org.codehaus.plexus.logging.BaseLoggerManager;

Propchange: geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/logging/Slf4jLoggingManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/logging/Slf4jLoggingManager.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/logging/Slf4jLoggingManager.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/security/ShellSecurityManager.java (from r640764, geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/ShellSecurityManager.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/security/ShellSecurityManager.java?p2=geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/security/ShellSecurityManager.java&p1=geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/ShellSecurityManager.java&r1=640764&r2=641768&rev=641768&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/ShellSecurityManager.java (original)
+++ geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/security/ShellSecurityManager.java Thu Mar 27 03:28:54 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.geronimo.gshell;
+package org.apache.geronimo.gshell.security;
 
 import java.security.Permission;
 

Propchange: geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/security/ShellSecurityManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/security/ShellSecurityManager.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/security/ShellSecurityManager.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain