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/09/17 13:39:46 UTC
svn commit: r696259 - in /geronimo/gshell/trunk:
gshell-application/src/main/java/org/apache/geronimo/gshell/application/plugin/
gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/
gshell-model/src/test/java/org/apache/geronimo/gsh...
Author: jdillon
Date: Wed Sep 17 04:39:46 2008
New Revision: 696259
URL: http://svn.apache.org/viewvc?rev=696259&view=rev
Log:
Rename Plugin & Dependency model elements to avoid name collisions with application components
Added:
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/DependencyArtifact.java (contents, props changed)
- copied, changed from r696224, geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Dependency.java
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/PluginArtifact.java (contents, props changed)
- copied, changed from r696224, geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Plugin.java
Removed:
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Dependency.java
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Plugin.java
Modified:
geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/plugin/PluginManager.java
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationModel.java
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/test/java/org/apache/geronimo/gshell/model/application/ApplicationMarshallerTest.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-application/src/main/java/org/apache/geronimo/gshell/application/plugin/PluginManager.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/plugin/PluginManager.java?rev=696259&r1=696258&r2=696259&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/plugin/PluginManager.java (original)
+++ geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/plugin/PluginManager.java Wed Sep 17 04:39:46 2008
@@ -19,6 +19,8 @@
package org.apache.geronimo.gshell.application.plugin;
+import org.apache.geronimo.gshell.model.application.PluginArtifact;
+
import java.util.Set;
/**
@@ -30,5 +32,5 @@
{
Set<Plugin> getPlugins();
- void loadPlugin(final org.apache.geronimo.gshell.model.application.Plugin artifact) throws Exception;
+ void loadPlugin(final PluginArtifact artifact) throws Exception;
}
\ No newline at end of file
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=696259&r1=696258&r2=696259&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 Wed Sep 17 04:39:46 2008
@@ -20,7 +20,7 @@
package org.apache.geronimo.gshell.model.application;
import com.thoughtworks.xstream.annotations.XStreamAlias;
-import org.apache.geronimo.gshell.model.application.Dependency;
+import org.apache.geronimo.gshell.model.application.DependencyArtifact;
import org.apache.geronimo.gshell.model.application.DependencyGroup;
import org.apache.geronimo.gshell.model.common.DescriptorSupport;
import org.apache.geronimo.gshell.model.common.LocalRepository;
@@ -42,11 +42,11 @@
private List<RemoteRepository> remoteRepositories;
- private List<Dependency> dependencies;
+ private List<DependencyArtifact> dependencies;
private List<DependencyGroup> dependencyGroups;
- private List<Plugin> plugins;
+ private List<PluginArtifact> plugins;
private List<PluginGroup> pluginGroups;
@@ -94,22 +94,22 @@
getDependencyGroups().add(group);
}
- // Dependency
+ // DependencyArtifact
- public List<Dependency> getDependencies() {
+ public List<DependencyArtifact> getDependencies() {
if (dependencies == null) {
- dependencies = new ArrayList<Dependency>();
+ dependencies = new ArrayList<DependencyArtifact>();
}
return dependencies;
}
- public List<Dependency> getDependencies(boolean includeGroups) {
+ public List<DependencyArtifact> getDependencies(boolean includeGroups) {
if (!includeGroups) {
return getDependencies();
}
- List<Dependency> list = new ArrayList<Dependency>();
+ List<DependencyArtifact> list = new ArrayList<DependencyArtifact>();
list.addAll(getDependencies());
@@ -120,7 +120,7 @@
return list;
}
- public void add(final Dependency dependency) {
+ public void add(final DependencyArtifact dependency) {
assert dependency != null;
getDependencies().add(dependency);
@@ -142,22 +142,22 @@
getPluginGroups().add(group);
}
- // Plugin
+ // PluginArtifact
- public List<Plugin> getPlugins() {
+ public List<PluginArtifact> getPlugins() {
if (plugins == null) {
- plugins = new ArrayList<Plugin>();
+ plugins = new ArrayList<PluginArtifact>();
}
return plugins;
}
- public List<Plugin> getPlugins(boolean includeGroups) {
+ public List<PluginArtifact> getPlugins(boolean includeGroups) {
if (!includeGroups) {
return getPlugins();
}
- List<Plugin> list = new ArrayList<Plugin>();
+ List<PluginArtifact> list = new ArrayList<PluginArtifact>();
list.addAll(getPlugins());
@@ -168,7 +168,7 @@
return list;
}
- public void add(final Plugin plugin) {
+ public void add(final PluginArtifact plugin) {
assert plugin != null;
getPlugins().add(plugin);
Copied: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/DependencyArtifact.java (from r696224, geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Dependency.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/DependencyArtifact.java?p2=geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/DependencyArtifact.java&p1=geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Dependency.java&r1=696224&r2=696259&rev=696259&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Dependency.java (original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/DependencyArtifact.java Wed Sep 17 04:39:46 2008
@@ -28,7 +28,7 @@
* @version $Rev$ $Date$
*/
@XStreamAlias("dependency")
-public class Dependency
+public class DependencyArtifact
extends Artifact
{
public static final String DEFAULT_TYPE = "jar";
Propchange: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/DependencyArtifact.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/DependencyArtifact.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/DependencyArtifact.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/DependencyGroup.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/DependencyGroup.java?rev=696259&r1=696258&r2=696259&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/DependencyGroup.java (original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/DependencyGroup.java Wed Sep 17 04:39:46 2008
@@ -28,26 +28,26 @@
import org.apache.geronimo.gshell.model.common.ArtifactGroup;
/**
- * Groups {@link Dependency} elements to allow artifact configuration to be shared.
+ * Groups {@link DependencyArtifact} elements to allow artifact configuration to be shared.
*
* @version $Rev$ $Date$
*/
@XStreamAlias("dependencyGroup")
public class DependencyGroup
- extends ArtifactGroup<Dependency>
+ extends ArtifactGroup<DependencyArtifact>
{
@XStreamImplicit
- private List<Dependency> dependencies;
+ private List<DependencyArtifact> dependencies;
- public List<Dependency> getArtifacts() {
+ public List<DependencyArtifact> getArtifacts() {
if (dependencies == null) {
- dependencies = new ArrayList<Dependency>();
+ dependencies = new ArrayList<DependencyArtifact>();
}
return dependencies;
}
- public List<Dependency> getDependencies() {
+ public List<DependencyArtifact> getDependencies() {
return getArtifacts();
}
}
\ No newline at end of file
Copied: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/PluginArtifact.java (from r696224, geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Plugin.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/PluginArtifact.java?p2=geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/PluginArtifact.java&p1=geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Plugin.java&r1=696224&r2=696259&rev=696259&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Plugin.java (original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/PluginArtifact.java Wed Sep 17 04:39:46 2008
@@ -28,7 +28,7 @@
* @version $Rev$ $Date$
*/
@XStreamAlias("plugin")
-public class Plugin
+public class PluginArtifact
extends Artifact
{
public static final String DEFAULT_TYPE = "jar";
Propchange: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/PluginArtifact.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/PluginArtifact.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/PluginArtifact.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/PluginArtifact.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/PluginGroup.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/PluginGroup.java?rev=696259&r1=696258&r2=696259&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/PluginGroup.java (original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/PluginGroup.java Wed Sep 17 04:39:46 2008
@@ -27,26 +27,26 @@
import java.util.List;
/**
- * Groups {@link Plugin} elements to allow artifact configuration to be shared.
+ * Groups {@link PluginArtifact} elements to allow artifact configuration to be shared.
*
* @version $Rev$ $Date$
*/
@XStreamAlias("pluginGroup")
public class PluginGroup
- extends ArtifactGroup<Plugin>
+ extends ArtifactGroup<PluginArtifact>
{
@XStreamImplicit
- private List<Plugin> plugins;
+ private List<PluginArtifact> plugins;
- public List<Plugin> getArtifacts() {
+ public List<PluginArtifact> getArtifacts() {
if (plugins == null) {
- plugins = new ArrayList<Plugin>();
+ plugins = new ArrayList<PluginArtifact>();
}
return plugins;
}
- public List<Plugin> getPlugins() {
+ public List<PluginArtifact> getPlugins() {
return getArtifacts();
}
}
\ No newline at end of file
Modified: geronimo/gshell/trunk/gshell-model/src/test/java/org/apache/geronimo/gshell/model/application/ApplicationMarshallerTest.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/test/java/org/apache/geronimo/gshell/model/application/ApplicationMarshallerTest.java?rev=696259&r1=696258&r2=696259&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/test/java/org/apache/geronimo/gshell/model/application/ApplicationMarshallerTest.java (original)
+++ geronimo/gshell/trunk/gshell-model/src/test/java/org/apache/geronimo/gshell/model/application/ApplicationMarshallerTest.java Wed Sep 17 04:39:46 2008
@@ -20,7 +20,7 @@
package org.apache.geronimo.gshell.model.application;
import junit.framework.TestCase;
-import org.apache.geronimo.gshell.model.application.Dependency;
+import org.apache.geronimo.gshell.model.application.DependencyArtifact;
import org.apache.geronimo.gshell.model.application.DependencyGroup;
import org.apache.geronimo.gshell.model.common.RemoteRepository;
@@ -55,7 +55,7 @@
sr1.setLocation("foo:bar");
root.add(sr1);
- Dependency d1 = new Dependency();
+ DependencyArtifact d1 = new DependencyArtifact();
d1.setGroupId("a");
d1.setArtifactId("b");
d1.setVersion("c");
@@ -66,11 +66,11 @@
g1.setVersion("e");
root.add(g1);
- Dependency d2 = new Dependency();
+ DependencyArtifact d2 = new DependencyArtifact();
d2.setArtifactId("f");
g1.add(d2);
- Dependency d3 = new Dependency();
+ DependencyArtifact d3 = new DependencyArtifact();
d3.setArtifactId("g");
d3.setClassifier("h");
g1.add(d3);
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=696259&r1=696258&r2=696259&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 Sep 17 04:39:46 2008
@@ -29,7 +29,7 @@
import org.apache.geronimo.gshell.event.EventPublisher;
import org.apache.geronimo.gshell.io.IO;
import org.apache.geronimo.gshell.model.application.ApplicationModel;
-import org.apache.geronimo.gshell.model.application.Dependency;
+import org.apache.geronimo.gshell.model.application.DependencyArtifact;
import org.apache.geronimo.gshell.model.common.LocalRepository;
import org.apache.geronimo.gshell.model.common.RemoteRepository;
import org.apache.geronimo.gshell.model.interpolate.Interpolator;
@@ -269,15 +269,15 @@
request.setFilter(filter);
Set<Artifact> artifacts = new LinkedHashSet<Artifact>();
- List<Dependency> dependencies = model.getDependencies(true); // include groups
+ List<DependencyArtifact> dependencies = model.getDependencies(true); // include groups
if (!dependencies.isEmpty()) {
ArtifactFactory factory = artifactManager.getArtifactFactory();
log.debug("Application dependencies:");
- for (Dependency dep : dependencies) {
- Artifact artifact = factory.createArtifact(dep.getGroupId(), dep.getArtifactId(), dep.getVersion(), null, dep.getType());
+ for (DependencyArtifact dep : dependencies) {
+ Artifact artifact = factory.createArtifact(dep.getGroupId(), dep.getArtifactId(), dep.getVersion(), /*scope*/null, dep.getType());
assert artifact != null;
log.debug(" + {}", artifact);
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=696259&r1=696258&r2=696259&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 Wed Sep 17 04:39:46 2008
@@ -21,12 +21,13 @@
import org.apache.geronimo.gshell.application.Application;
import org.apache.geronimo.gshell.application.plugin.PluginManager;
+import org.apache.geronimo.gshell.application.plugin.Plugin;
import org.apache.geronimo.gshell.artifact.ArtifactManager;
import org.apache.geronimo.gshell.event.Event;
import org.apache.geronimo.gshell.event.EventListener;
import org.apache.geronimo.gshell.event.EventManager;
import org.apache.geronimo.gshell.event.EventPublisher;
-import org.apache.geronimo.gshell.model.application.Plugin;
+import org.apache.geronimo.gshell.model.application.PluginArtifact;
import org.apache.geronimo.gshell.spring.BeanContainer;
import org.apache.geronimo.gshell.spring.BeanContainerAware;
import org.apache.geronimo.gshell.wisdom.application.ApplicationConfiguredEvent;
@@ -70,7 +71,7 @@
private BeanContainer container;
- private Set<org.apache.geronimo.gshell.application.plugin.Plugin> plugins = new LinkedHashSet<org.apache.geronimo.gshell.application.plugin.Plugin>();
+ private Set<Plugin> plugins = new LinkedHashSet<Plugin>();
public void setBeanContainer(final BeanContainer container) {
assert container != null;
@@ -78,6 +79,7 @@
this.container = container;
}
+ @SuppressWarnings({"UnusedDeclaration"})
@PostConstruct
private void init() {
assert eventManager != null;
@@ -94,7 +96,7 @@
});
}
- public Set<org.apache.geronimo.gshell.application.plugin.Plugin> getPlugins() {
+ public Set<Plugin> getPlugins() {
return plugins;
}
@@ -103,9 +105,9 @@
log.debug("Loading plugins for application: {}", application.getId());
- List<Plugin> artifacts = application.getModel().getPlugins(true);
+ List<PluginArtifact> artifacts = application.getModel().getPlugins(true);
- for (Plugin artifact : artifacts) {
+ for (PluginArtifact artifact : artifacts) {
try {
loadPlugin(artifact);
}
@@ -115,7 +117,7 @@
}
}
- public void loadPlugin(final Plugin artifact) throws Exception {
+ public void loadPlugin(final PluginArtifact artifact) throws Exception {
assert artifact != null;
log.debug("Loading plugin: {}", artifact.getId());
@@ -125,10 +127,8 @@
BeanContainer pluginContainer = container.createChild("gshell.plugin[" + artifact.getId() + "]", classPath);
log.debug("Created plugin container: {}", pluginContainer);
-
- // TODO: Refactor to avoid needing this FQCN
- org.apache.geronimo.gshell.application.plugin.Plugin plugin = pluginContainer.getBean(org.apache.geronimo.gshell.application.plugin.Plugin.class);
+ Plugin plugin = pluginContainer.getBean(Plugin.class);
plugins.add(plugin);
@@ -139,8 +139,8 @@
eventPublisher.publish(new PluginLoadedEvent(plugin, artifact));
}
- private List<URL> createClassPath(final Plugin plugin) throws Exception {
- assert plugin != null;
+ private List<URL> createClassPath(final PluginArtifact artifact) throws Exception {
+ assert artifact != null;
ArtifactResolutionRequest request = new ArtifactResolutionRequest();
@@ -178,7 +178,7 @@
Set<Artifact> artifacts = new LinkedHashSet<Artifact>();
ArtifactFactory factory = artifactManager.getArtifactFactory();
- Artifact pluginArtifact = factory.createArtifact(plugin.getGroupId(), plugin.getArtifactId(), plugin.getVersion(), null, plugin.getType());
+ Artifact pluginArtifact = factory.createArtifact(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), /*scope*/null, artifact.getType());
assert pluginArtifact != null;
log.debug("Plugin artifact: {}", pluginArtifact);
@@ -195,8 +195,8 @@
if (resolvedArtifacts != null && !resolvedArtifacts.isEmpty()) {
log.debug("Plugin classpath:");
- for (Artifact artifact : resolvedArtifacts) {
- File file = artifact.getFile();
+ for (Artifact a : resolvedArtifacts) {
+ File file = a.getFile();
assert file != null;
URL url = file.toURI().toURL();