Author: jdillon
Date: Wed Oct 22 08:26:18 2008
New Revision: 707101
URL: http://svn.apache.org/viewvc?rev=707101&view=rev
Log:
Bring gshell-artifact back as the API to the artifact muck
Added:
geronimo/gshell/trunk/gshell-support/gshell-artifact/
geronimo/gshell/trunk/gshell-support/gshell-artifact/pom.xml (with props)
geronimo/gshell/trunk/gshell-support/gshell-artifact/src/
geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/
geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/
geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/
geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/
geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/
geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/
geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/
geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/Artifact.java
(contents, props changed)
- copied, changed from r707066, geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/model/Artifact.java
Removed:
geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/model/Artifact.java
Modified:
geronimo/gshell/trunk/gshell-application/pom.xml
geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ClassPath.java
geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/model/ApplicationModel.java
geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/plugin/Plugin.java
geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/plugin/PluginManager.java
geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml
geronimo/gshell/trunk/gshell-commands/gshell-admin/pom.xml
geronimo/gshell/trunk/gshell-commands/gshell-admin/src/main/java/org/apache/geronimo/gshell/commands/admin/InstallPluginAction.java
geronimo/gshell/trunk/gshell-support/pom.xml
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/pom.xml
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
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ClassPathImpl.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginArtifactFilter.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginImpl.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginLoadedEvent.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginManagerImpl.java
geronimo/gshell/trunk/pom.xml
Modified: geronimo/gshell/trunk/gshell-application/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-application/pom.xml?rev=707101&r1=707100&r2=707101&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-application/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-application/pom.xml Wed Oct 22 08:26:18 2008
@@ -39,6 +39,11 @@
<dependencies>
<dependency>
+ <groupId>org.apache.geronimo.gshell.support</groupId>
+ <artifactId>gshell-artifact</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.geronimo.gshell</groupId>
<artifactId>gshell-api</artifactId>
</dependency>
Modified: geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ClassPath.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ClassPath.java?rev=707101&r1=707100&r2=707101&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ClassPath.java
(original)
+++ geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ClassPath.java
Wed Oct 22 08:26:18 2008
@@ -19,7 +19,7 @@
package org.apache.geronimo.gshell.application;
-import org.apache.geronimo.gshell.application.model.Artifact;
+import org.apache.geronimo.gshell.artifact.Artifact;
import java.util.Collection;
import java.net.URL;
Modified: geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/model/ApplicationModel.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/model/ApplicationModel.java?rev=707101&r1=707100&r2=707101&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/model/ApplicationModel.java
(original)
+++ geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/model/ApplicationModel.java
Wed Oct 22 08:26:18 2008
@@ -20,6 +20,7 @@
package org.apache.geronimo.gshell.application.model;
import org.apache.geronimo.gshell.yarn.Yarn;
+import org.apache.geronimo.gshell.artifact.Artifact;
import java.util.ArrayList;
import java.util.List;
Modified: geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/plugin/Plugin.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/plugin/Plugin.java?rev=707101&r1=707100&r2=707101&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/plugin/Plugin.java
(original)
+++ geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/plugin/Plugin.java
Wed Oct 22 08:26:18 2008
@@ -23,7 +23,7 @@
import org.apache.geronimo.gshell.application.plugin.bundle.Bundle;
import org.apache.geronimo.gshell.application.plugin.bundle.NoSuchBundleException;
import org.apache.geronimo.gshell.application.plugin.activation.ActivationRule;
-import org.apache.geronimo.gshell.application.model.Artifact;
+import org.apache.geronimo.gshell.artifact.Artifact;
import java.util.Collection;
import java.util.List;
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=707101&r1=707100&r2=707101&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 Oct 22 08:26:18 2008
@@ -19,7 +19,7 @@
package org.apache.geronimo.gshell.application.plugin;
-import org.apache.geronimo.gshell.application.model.Artifact;
+import org.apache.geronimo.gshell.artifact.Artifact;
import java.util.Set;
Modified: geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml?rev=707101&r1=707100&r2=707101&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml (original)
+++ geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml Wed Oct 22
08:26:18 2008
@@ -40,9 +40,9 @@
<property name="dependencies">
<list>
- <bean class="org.apache.geronimo.gshell.application.model.Artifact">
- <property name="groupId" value="org.apache.geronimo.gshell.wisdom"/>
- <property name="artifactId" value="gshell-wisdom-core"/>
+ <bean class="org.apache.geronimo.gshell.artifact.Artifact">
+ <property name="group" value="org.apache.geronimo.gshell.wisdom"/>
+ <property name="artifact" value="gshell-wisdom-core"/>
<property name="version" value="1.0-alpha-2-SNAPSHOT"/>
</bean>
@@ -58,9 +58,9 @@
<property name="plugins">
<list>
- <bean class="org.apache.geronimo.gshell.application.model.Artifact">
- <property name="groupId" value="org.apache.geronimo.gshell.commands"/>
- <property name="artifactId" value="gshell-builtins"/>
+ <bean class="org.apache.geronimo.gshell.artifact.Artifact">
+ <property name="group" value="org.apache.geronimo.gshell.commands"/>
+ <property name="artifact" value="gshell-builtins"/>
<property name="version" value="1.0-alpha-2-SNAPSHOT"/>
</bean>
Modified: geronimo/gshell/trunk/gshell-commands/gshell-admin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-admin/pom.xml?rev=707101&r1=707100&r2=707101&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-admin/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-admin/pom.xml Wed Oct 22 08:26:18 2008
@@ -44,6 +44,11 @@
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.gshell.support</groupId>
+ <artifactId>gshell-artifact</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.geronimo.gshell</groupId>
<artifactId>gshell-application</artifactId>
</dependency>
Modified: geronimo/gshell/trunk/gshell-commands/gshell-admin/src/main/java/org/apache/geronimo/gshell/commands/admin/InstallPluginAction.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-admin/src/main/java/org/apache/geronimo/gshell/commands/admin/InstallPluginAction.java?rev=707101&r1=707100&r2=707101&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-admin/src/main/java/org/apache/geronimo/gshell/commands/admin/InstallPluginAction.java
(original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-admin/src/main/java/org/apache/geronimo/gshell/commands/admin/InstallPluginAction.java
Wed Oct 22 08:26:18 2008
@@ -19,7 +19,7 @@
package org.apache.geronimo.gshell.commands.admin;
-import org.apache.geronimo.gshell.application.model.Artifact;
+import org.apache.geronimo.gshell.artifact.Artifact;
import org.apache.geronimo.gshell.application.plugin.PluginManager;
import org.apache.geronimo.gshell.clp.Option;
import org.apache.geronimo.gshell.command.CommandAction;
@@ -59,8 +59,8 @@
IO io = context.getIo();
Artifact artifact = new Artifact();
- artifact.setGroupId(groupId);
- artifact.setArtifactId(artifactId);
+ artifact.setGroup(groupId);
+ artifact.setArtifact(artifactId);
artifact.setVersion(version);
io.info("Loading plugin: {}", artifact.getId());
Added: geronimo/gshell/trunk/gshell-support/gshell-artifact/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact/pom.xml?rev=707101&view=auto
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact/pom.xml (added)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact/pom.xml Wed Oct 22 08:26:18 2008
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.gshell.support</groupId>
+ <artifactId>gshell-support</artifactId>
+ <version>1.0-alpha-2-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>gshell-artifact</artifactId>
+ <name>GShell Support :: Artifact</name>
+
+ <description>
+ Remote artifact resolution support.
+ </description>
+
+</project>
\ No newline at end of file
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Copied: geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/Artifact.java
(from r707066, geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/model/Artifact.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/Artifact.java?p2=geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/Artifact.java&p1=geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/model/Artifact.java&r1=707066&r2=707101&rev=707101&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/model/Artifact.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/Artifact.java
Wed Oct 22 08:26:18 2008
@@ -17,9 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.gshell.application.model;
-
-import org.apache.geronimo.gshell.yarn.Yarn;
+package org.apache.geronimo.gshell.artifact;
import java.io.File;
import java.io.Serializable;
@@ -36,9 +34,9 @@
public static final String DEFAULT_TYPE = "jar";
- private String groupId;
+ private String group;
- private String artifactId;
+ private String artifact;
private String classifier;
@@ -49,23 +47,23 @@
private File file;
public String toString() {
- return Yarn.render(this);
+ return getId();
}
- public String getGroupId() {
- return groupId;
+ public String getGroup() {
+ return group;
}
- public void setGroupId(final String groupId) {
- this.groupId = groupId;
+ public void setGroup(final String group) {
+ this.group = group;
}
- public String getArtifactId() {
- return artifactId;
+ public String getArtifact() {
+ return artifact;
}
- public void setArtifactId(final String artifactId) {
- this.artifactId = artifactId;
+ public void setArtifact(final String artifact) {
+ this.artifact = artifact;
}
public String getClassifier() {
@@ -104,6 +102,6 @@
}
public String getId() {
- return getGroupId() + ":" + getArtifactId() + ":" + getVersion() + ":" + getType();
+ return getGroup() + ":" + getArtifact() + ":" + getVersion() + ":" + getType();
}
-}
\ No newline at end of file
+}
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/Artifact.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/Artifact.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/Artifact.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/Artifact.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/gshell/trunk/gshell-support/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/pom.xml?rev=707101&r1=707100&r2=707101&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-support/pom.xml Wed Oct 22 08:26:18 2008
@@ -55,6 +55,7 @@
<module>gshell-vfs-meta</module>
<module>gshell-vfs-truezip</module>
<module>gshell-security</module>
+ <module>gshell-artifact</module>
<module>gshell-ivy</module>
<module>gshell-marshal</module>
<module>gshell-xstore</module>
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/pom.xml?rev=707101&r1=707100&r2=707101&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/pom.xml Wed Oct 22 08:26:18
2008
@@ -50,6 +50,11 @@
<dependency>
<groupId>org.apache.geronimo.gshell.support</groupId>
+ <artifactId>gshell-artifact</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.gshell.support</groupId>
<artifactId>gshell-ivy</artifactId>
</dependency>
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=707101&r1=707100&r2=707101&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 Oct 22 08:26:18 2008
@@ -35,6 +35,7 @@
implements Filter
{
private static final String[] EXCLUDES = {
+ "gshell-artifact",
"gshell-ansi",
"gshell-api",
"gshell-artifact",
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=707101&r1=707100&r2=707101&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 Oct 22 08:26:18 2008
@@ -25,7 +25,7 @@
import org.apache.geronimo.gshell.wisdom.application.ApplicationSecurityManager;
import org.apache.geronimo.gshell.application.ClassPath;
import org.apache.geronimo.gshell.application.model.ApplicationModel;
-import org.apache.geronimo.gshell.application.model.Artifact;
+import org.apache.geronimo.gshell.artifact.Artifact;
import org.apache.geronimo.gshell.application.plugin.PluginManager;
import org.apache.geronimo.gshell.chronos.StopWatch;
import org.apache.geronimo.gshell.event.EventPublisher;
@@ -200,8 +200,8 @@
ModuleRevisionId id = downloadedArtifact.getModuleRevisionId();
Artifact resolved = new Artifact();
- resolved.setGroupId(id.getOrganisation());
- resolved.setArtifactId(id.getName());
+ resolved.setGroup(id.getOrganisation());
+ resolved.setArtifact(id.getName());
resolved.setVersion(id.getRevision());
resolved.setType(downloadedArtifact.getType());
resolved.setFile(downloadReport.getLocalFile());
@@ -222,7 +222,7 @@
md.setLastModified(System.currentTimeMillis());
for (Artifact dep : model.getDependencies()) {
- ModuleRevisionId depId = ModuleRevisionId.newInstance(dep.getGroupId(), dep.getArtifactId(),
dep.getVersion());
+ ModuleRevisionId depId = ModuleRevisionId.newInstance(dep.getGroup(), dep.getArtifact(),
dep.getVersion());
DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(md, depId, /*
force */ false, /* changing*/ false, /* transitive */ true);
dd.addDependencyConfiguration("default", "default");
md.addDependency(dd);
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ClassPathImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ClassPathImpl.java?rev=707101&r1=707100&r2=707101&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ClassPathImpl.java
(original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ClassPathImpl.java
Wed Oct 22 08:26:18 2008
@@ -20,7 +20,7 @@
package org.apache.geronimo.gshell.wisdom.application;
import org.apache.geronimo.gshell.application.ClassPath;
-import org.apache.geronimo.gshell.application.model.Artifact;
+import org.apache.geronimo.gshell.artifact.Artifact;
import java.io.File;
import java.io.Serializable;
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginArtifactFilter.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginArtifactFilter.java?rev=707101&r1=707100&r2=707101&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginArtifactFilter.java
(original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginArtifactFilter.java
Wed Oct 22 08:26:18 2008
@@ -40,8 +40,8 @@
assert application != null;
// Filter out application artifacts, need to use gid:aid to make sure we don't clober
anything which has the same artifactId, but different groupId
- for (org.apache.geronimo.gshell.application.model.Artifact artifact : application.getClassPath().getArtifacts())
{
- String id = artifact.getGroupId() + ":" + artifact.getArtifactId();
+ for (org.apache.geronimo.gshell.artifact.Artifact artifact : application.getClassPath().getArtifacts())
{
+ String id = artifact.getGroup() + ":" + artifact.getArtifact();
excludes.add(id);
}
}
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginImpl.java?rev=707101&r1=707100&r2=707101&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginImpl.java
(original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginImpl.java
Wed Oct 22 08:26:18 2008
@@ -20,7 +20,7 @@
package org.apache.geronimo.gshell.wisdom.plugin;
import org.apache.geronimo.gshell.application.ClassPath;
-import org.apache.geronimo.gshell.application.model.Artifact;
+import org.apache.geronimo.gshell.artifact.Artifact;
import org.apache.geronimo.gshell.application.plugin.Plugin;
import org.apache.geronimo.gshell.application.plugin.bundle.Bundle;
import org.apache.geronimo.gshell.spring.BeanContainer;
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginLoadedEvent.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginLoadedEvent.java?rev=707101&r1=707100&r2=707101&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginLoadedEvent.java
(original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/plugin/PluginLoadedEvent.java
Wed Oct 22 08:26:18 2008
@@ -19,7 +19,7 @@
package org.apache.geronimo.gshell.wisdom.plugin;
-import org.apache.geronimo.gshell.application.model.Artifact;
+import org.apache.geronimo.gshell.artifact.Artifact;
import org.apache.geronimo.gshell.application.plugin.Plugin;
import org.apache.geronimo.gshell.event.Event;
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=707101&r1=707100&r2=707101&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 Oct 22 08:26:18 2008
@@ -22,7 +22,7 @@
import org.apache.geronimo.gshell.application.Application;
import org.apache.geronimo.gshell.application.ApplicationManager;
import org.apache.geronimo.gshell.application.ClassPath;
-import org.apache.geronimo.gshell.application.model.Artifact;
+import org.apache.geronimo.gshell.artifact.Artifact;
import org.apache.geronimo.gshell.application.plugin.Plugin;
import org.apache.geronimo.gshell.application.plugin.PluginManager;
import org.apache.geronimo.gshell.chronos.StopWatch;
@@ -160,7 +160,7 @@
assert artifact != null;
// FIXME: Get basedir from application
- ClassPathCache cache = new ClassPathCache(new File(new File(System.getProperty("gshell.home")),
"var/" + artifact.getGroupId() + "/" + artifact.getArtifactId() + "/classpath.ser"));
+ ClassPathCache cache = new ClassPathCache(new File(new File(System.getProperty("gshell.home")),
"var/" + artifact.getGroup() + "/" + artifact.getArtifact() + "/classpath.ser"));
ClassPath classPath = cache.get();
if (classPath == null) {
@@ -223,8 +223,8 @@
ModuleRevisionId id = downloadedArtifact.getModuleRevisionId();
Artifact resolved = new Artifact();
- resolved.setGroupId(id.getOrganisation());
- resolved.setArtifactId(id.getName());
+ resolved.setGroup(id.getOrganisation());
+ resolved.setArtifact(id.getName());
resolved.setVersion(id.getRevision());
resolved.setType(downloadedArtifact.getType());
resolved.setFile(downloadReport.getLocalFile());
@@ -239,12 +239,12 @@
private ModuleDescriptor createPluginModuleDescriptor(final Artifact artifact) {
assert artifact != null;
- ModuleRevisionId pluginId = ModuleRevisionId.newInstance("gshell.plugin-" + artifact.getGroupId(),
artifact.getArtifactId(), artifact.getVersion());
+ ModuleRevisionId pluginId = ModuleRevisionId.newInstance("gshell.plugin-" + artifact.getGroup(),
artifact.getArtifact(), artifact.getVersion());
DefaultModuleDescriptor md = new DefaultModuleDescriptor(pluginId, "integration",
null, true);
md.addConfiguration(new Configuration("default"));
md.setLastModified(System.currentTimeMillis());
- ModuleRevisionId depId = ModuleRevisionId.newInstance(artifact.getGroupId(), artifact.getArtifactId(),
artifact.getVersion());
+ ModuleRevisionId depId = ModuleRevisionId.newInstance(artifact.getGroup(), artifact.getArtifact(),
artifact.getVersion());
DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(md, depId, /* force
*/ false, /* changing*/ false, /* transitive */ true);
dd.addDependencyConfiguration("default", "default");
md.addDependency(dd);
Modified: geronimo/gshell/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/pom.xml?rev=707101&r1=707100&r2=707101&view=diff
==============================================================================
--- geronimo/gshell/trunk/pom.xml (original)
+++ geronimo/gshell/trunk/pom.xml Wed Oct 22 08:26:18 2008
@@ -210,6 +210,12 @@
<dependency>
<groupId>org.apache.geronimo.gshell.support</groupId>
+ <artifactId>gshell-artifact</artifactId>
+ <version>1.0-alpha-2-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.gshell.support</groupId>
<artifactId>gshell-ivy</artifactId>
<version>1.0-alpha-2-SNAPSHOT</version>
</dependency>
|