geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r705560 - in /geronimo/gshell/trunk: gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/ gshell-support/gshell-spring/src/main/java/org/apache/geronimo...
Date Fri, 17 Oct 2008 11:15:37 GMT
Author: jdillon
Date: Fri Oct 17 04:15:36 2008
New Revision: 705560

URL: http://svn.apache.org/viewvc?rev=705560&view=rev
Log:
Strip out groups

Added:
    geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/Artifact.java
      - copied, changed from r705178, geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/ArtifactSupport.java
Removed:
    geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/DependencyGroup.java
    geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/PluginGroup.java
    geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/ArtifactGroup.java
    geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/ArtifactSupport.java
Modified:
    geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationModel.java
    geronimo/gshell/trunk/gshell-support/gshell-spring/src/main/java/org/apache/geronimo/gshell/spring/BeanContainerContextImpl.java
    geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationManagerImpl.java
    geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginManagerImpl.java

Modified: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationModel.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationModel.java?rev=705560&r1=705559&r2=705560&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationModel.java
(original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationModel.java
Fri Oct 17 04:15:36 2008
@@ -40,12 +40,8 @@
 
     private List<DependencyArtifact> dependencies;
 
-    private List<DependencyGroup> dependencyGroups;
-
     private List<PluginArtifact> plugins;
 
-    private List<PluginGroup> pluginGroups;
-
     private Branding branding;
 
     // LocalRepository
@@ -78,22 +74,6 @@
         getRemoteRepositories().add(repository);
     }
 
-    // DependencyGroup
-
-    public List<DependencyGroup> getDependencyGroups() {
-        if (dependencyGroups == null) {
-            dependencyGroups = new ArrayList<DependencyGroup>();
-        }
-
-        return dependencyGroups;
-    }
-
-    public void add(final DependencyGroup group) {
-        assert group != null;
-
-        getDependencyGroups().add(group);
-    }
-
     // DependencyArtifact
 
     public List<DependencyArtifact> getDependencies() {
@@ -108,44 +88,12 @@
         this.dependencies = dependencies;
     }
 
-    public List<DependencyArtifact> getDependencies(boolean includeGroups) {
-        if (!includeGroups) {
-            return getDependencies();
-        }
-
-        List<DependencyArtifact> list = new ArrayList<DependencyArtifact>();
-
-        list.addAll(getDependencies());
-
-        for (DependencyGroup group : getDependencyGroups()) {
-            list.addAll(group.getDependencies());
-        }
-
-        return list;
-    }
-
     public void add(final DependencyArtifact dependency) {
         assert dependency != null;
 
         getDependencies().add(dependency);
     }
 
-    // PluginGroup
-
-    public List<PluginGroup> getPluginGroups() {
-        if (pluginGroups == null) {
-            pluginGroups = new ArrayList<PluginGroup>();
-        }
-
-        return pluginGroups;
-    }
-
-    public void add(final PluginGroup group) {
-        assert group != null;
-
-        getPluginGroups().add(group);
-    }
-
     // PluginArtifact
 
     public List<PluginArtifact> getPlugins() {
@@ -160,22 +108,6 @@
         this.plugins = plugins;
     }
 
-    public List<PluginArtifact> getPlugins(boolean includeGroups) {
-        if (!includeGroups) {
-            return getPlugins();
-        }
-
-        List<PluginArtifact> list = new ArrayList<PluginArtifact>();
-
-        list.addAll(getPlugins());
-
-        for (PluginGroup group : getPluginGroups()) {
-            list.addAll(group.getPlugins());
-        }
-
-        return list;
-    }
-
     public void add(final PluginArtifact plugin) {
         assert plugin != null;
 

Copied: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/Artifact.java
(from r705178, geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/ArtifactSupport.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/Artifact.java?p2=geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/Artifact.java&p1=geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/ArtifactSupport.java&r1=705178&r2=705560&rev=705560&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/ArtifactSupport.java
(original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/Artifact.java
Fri Oct 17 04:15:36 2008
@@ -26,7 +26,7 @@
  *
  * @version $Rev$ $Date$
  */
-public abstract class ArtifactSupport
+public class Artifact
     extends Element
 {
     private String groupId;

Modified: geronimo/gshell/trunk/gshell-support/gshell-spring/src/main/java/org/apache/geronimo/gshell/spring/BeanContainerContextImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-spring/src/main/java/org/apache/geronimo/gshell/spring/BeanContainerContextImpl.java?rev=705560&r1=705559&r2=705560&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-spring/src/main/java/org/apache/geronimo/gshell/spring/BeanContainerContextImpl.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-spring/src/main/java/org/apache/geronimo/gshell/spring/BeanContainerContextImpl.java
Fri Oct 17 04:15:36 2008
@@ -26,14 +26,13 @@
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
-import org.apache.geronimo.gshell.chronos.StopWatch;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
 import java.util.Arrays;
 import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
 
 /**
  * {@link BeanContainerContext} implementation used by {@link BeanContainerImpl} instances.
@@ -59,8 +58,6 @@
     public void configure(final String[] locations) {
         assert locations != null;
 
-        StopWatch watch = new StopWatch(true);
-
         log.debug("Configuring with locations: {}", locations);
 
         for (String location : locations) {
@@ -81,7 +78,7 @@
             this.resources.addAll(Arrays.asList(resources));
         }
 
-        log.debug("Configured {} resources in: {}", resources.size(), watch);
+        log.debug("Configured {} resources", resources.size());
     }
 
     /**

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=705560&r1=705559&r2=705560&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
Fri Oct 17 04:15:36 2008
@@ -203,7 +203,7 @@
         request.setFilter(new ApplicationArtifactFilter());
 
         Set<Artifact> artifacts = new LinkedHashSet<Artifact>();
-        List<DependencyArtifact> dependencies = model.getDependencies(true); // include
groups
+        List<DependencyArtifact> dependencies = model.getDependencies();
 
         if (!dependencies.isEmpty()) {
             assert artifactManager != null;

Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginManagerImpl.java?rev=705560&r1=705559&r2=705560&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginManagerImpl.java
(original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginManagerImpl.java
Fri Oct 17 04:15:36 2008
@@ -111,7 +111,7 @@
 
         log.debug("Loading plugins for application: {}", application.getId());
 
-        List<PluginArtifact> artifacts = application.getModel().getPlugins(true);
+        List<PluginArtifact> artifacts = application.getModel().getPlugins();
 
         for (PluginArtifact artifact : artifacts) {
             try {



Mime
View raw message