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/10/17 19:26:35 UTC
svn commit: r705678 - in /geronimo/gshell/trunk: ./ gshell-application/
gshell-application/src/main/java/org/apache/geronimo/gshell/application/
gshell-application/src/main/java/org/apache/geronimo/gshell/application/model/
gshell-application/src/main/...
Author: jdillon
Date: Fri Oct 17 10:26:34 2008
New Revision: 705678
URL: http://svn.apache.org/viewvc?rev=705678&view=rev
Log:
Move contents of gshell-model into gshell-application, drop gshell-model
Clean up some tests
Added:
geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/model/
- copied from r705651, geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/
geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/model/Artifact.java
- copied, changed from r705671, geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/Artifact.java
geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/data/
geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/data/MetaDataRegistryImplTest.java (contents, props changed)
- copied, changed from r705651, geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryImplTest.java
geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/data/support/
geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/data/support/MetaDataRegistryConfigurerTest.java (contents, props changed)
- copied, changed from r705651, geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryConfigurerTest.java
geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/data/
geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/data/MetaDataRegistryImplTest-context.xml (props changed)
- copied unchanged from r705651, geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryImplTest-context.xml
geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/data/support/
geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/data/support/MetaDataRegistryConfigurerTest-context.xml (props changed)
- copied unchanged from r705651, geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryConfigurerTest-context.xml
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/test/resources/ivysettings.xml (with props)
Removed:
geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/model/Element.java
geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/model/Model.java
geronimo/gshell/trunk/gshell-model/
geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryConfigurerTest.java
geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryImplTest.java
geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryConfigurerTest-context.xml
geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryImplTest-context.xml
Modified:
geronimo/gshell/trunk/gshell-application/pom.xml
geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/Application.java
geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationConfiguration.java
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/model/Branding.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-assembly/src/main/underlay/etc/log4j.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-commands/gshell-builtins/pom.xml
geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/AboutAction.java
geronimo/gshell/trunk/gshell-support/gshell-ivy/src/main/resources/META-INF/spring/components.xml
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationImpl.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-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/branding/GShellBranding.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/builder/ShellBuilderImpl.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/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ShellImpl.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/test/resources/org/apache/geronimo/gshell/wisdom/registry/CommandResolverImplTest-context.xml
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=705678&r1=705677&r2=705678&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-application/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-application/pom.xml Fri Oct 17 10:26:34 2008
@@ -42,11 +42,6 @@
<groupId>org.apache.geronimo.gshell</groupId>
<artifactId>gshell-api</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.gshell</groupId>
- <artifactId>gshell-model</artifactId>
- </dependency>
</dependencies>
</project>
Modified: geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/Application.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/Application.java?rev=705678&r1=705677&r2=705678&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/Application.java (original)
+++ geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/Application.java Fri Oct 17 10:26:34 2008
@@ -21,7 +21,7 @@
import org.apache.geronimo.gshell.command.Variables;
import org.apache.geronimo.gshell.io.IO;
-import org.apache.geronimo.gshell.model.ApplicationModel;
+import org.apache.geronimo.gshell.application.model.ApplicationModel;
import java.io.File;
import java.net.InetAddress;
Modified: geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationConfiguration.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationConfiguration.java?rev=705678&r1=705677&r2=705678&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationConfiguration.java (original)
+++ geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/ApplicationConfiguration.java Fri Oct 17 10:26:34 2008
@@ -21,7 +21,7 @@
import org.apache.geronimo.gshell.command.Variables;
import org.apache.geronimo.gshell.io.IO;
-import org.apache.geronimo.gshell.model.ApplicationModel;
+import org.apache.geronimo.gshell.application.model.ApplicationModel;
import org.apache.geronimo.gshell.yarn.Yarn;
/**
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=705678&r1=705677&r2=705678&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 Fri Oct 17 10:26:34 2008
@@ -19,7 +19,7 @@
package org.apache.geronimo.gshell.application;
-import org.apache.geronimo.gshell.model.Artifact;
+import org.apache.geronimo.gshell.application.model.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=705678&r1=705651&r2=705678&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 Fri Oct 17 10:26:34 2008
@@ -17,7 +17,9 @@
* under the License.
*/
-package org.apache.geronimo.gshell.model;
+package org.apache.geronimo.gshell.application.model;
+
+import org.apache.geronimo.gshell.yarn.Yarn;
import java.util.ArrayList;
import java.util.List;
@@ -29,7 +31,6 @@
* @version $Rev$ $Date$
*/
public class ApplicationModel
- extends Model
{
private String groupId;
@@ -49,6 +50,10 @@
private Branding branding;
+ public String toString() {
+ return Yarn.render(this);
+ }
+
public String getGroupId() {
return groupId;
}
@@ -161,16 +166,4 @@
// HACK: Hookup parent
branding.setParent(this);
}
-
- /**
- * Link children to their parent when deserializing.
- */
- @SuppressWarnings({"UnusedDeclaration"})
- private Object readResolve() {
- if (branding != null) {
- branding.setParent(this);
- }
-
- return this;
- }
}
\ No newline at end of file
Copied: geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/model/Artifact.java (from r705671, geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/Artifact.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/model/Artifact.java?p2=geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/model/Artifact.java&p1=geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/Artifact.java&r1=705671&r2=705678&rev=705678&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/Artifact.java (original)
+++ geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/model/Artifact.java Fri Oct 17 10:26:34 2008
@@ -17,7 +17,9 @@
* under the License.
*/
-package org.apache.geronimo.gshell.model;
+package org.apache.geronimo.gshell.application.model;
+
+import org.apache.geronimo.gshell.yarn.Yarn;
import java.io.File;
import java.io.Serializable;
@@ -28,9 +30,10 @@
* @version $Rev$ $Date$
*/
public class Artifact
- extends Element
implements Serializable
{
+ private static final long serialVersionUID = 1;
+
public static final String DEFAULT_TYPE = "jar";
private String groupId;
@@ -45,6 +48,10 @@
private File file;
+ public String toString() {
+ return Yarn.render(this);
+ }
+
public String getGroupId() {
return groupId;
}
Modified: geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/model/Branding.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/model/Branding.java?rev=705678&r1=705651&r2=705678&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/model/Branding.java (original)
+++ geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/model/Branding.java Fri Oct 17 10:26:34 2008
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.geronimo.gshell.model;
+package org.apache.geronimo.gshell.application.model;
-import org.apache.geronimo.gshell.model.Element;
+import org.apache.geronimo.gshell.yarn.Yarn;
import java.io.File;
import java.util.Properties;
@@ -30,7 +30,6 @@
* @version $Rev$ $Date$
*/
public class Branding
- extends Element
{
private transient ApplicationModel parent;
@@ -64,6 +63,10 @@
private String goodbyeMessage;
+ public String toString() {
+ return Yarn.render(this);
+ }
+
public ApplicationModel getParent() {
if (parent == null) {
throw new IllegalStateException("Not attached to parent");
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=705678&r1=705677&r2=705678&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 Fri Oct 17 10:26:34 2008
@@ -20,7 +20,7 @@
package org.apache.geronimo.gshell.application.plugin;
import org.apache.geronimo.gshell.application.ClassPath;
-import org.apache.geronimo.gshell.model.Artifact;
+import org.apache.geronimo.gshell.application.model.Artifact;
/**
* Plugin.
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=705678&r1=705677&r2=705678&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 Fri Oct 17 10:26:34 2008
@@ -19,7 +19,7 @@
package org.apache.geronimo.gshell.application.plugin;
-import org.apache.geronimo.gshell.model.Artifact;
+import org.apache.geronimo.gshell.application.model.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=705678&r1=705677&r2=705678&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 Fri Oct 17 10:26:34 2008
@@ -27,7 +27,7 @@
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
- <bean class="org.apache.geronimo.gshell.model.ApplicationModel">
+ <bean class="org.apache.geronimo.gshell.application.model.ApplicationModel">
<property name="groupId" value="org.apache.geronimo.gshell"/>
<property name="artifactId" value="gshell"/>
<property name="name" value="GShell"/>
@@ -39,20 +39,20 @@
<property name="dependencies">
<list>
- <bean class="org.apache.geronimo.gshell.model.Artifact">
+ <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"/>
<property name="version" value="1.0-alpha-2-SNAPSHOT"/>
</bean>
- <bean class="org.apache.geronimo.gshell.model.Artifact">
+ <bean class="org.apache.geronimo.gshell.application.model.Artifact">
<property name="groupId" value="org.apache.geronimo.gshell.support"/>
<property name="artifactId" value="gshell-vfs-local"/>
<property name="version" value="1.0-alpha-2-SNAPSHOT"/>
</bean>
<!--
- <bean class="org.apache.geronimo.gshell.model.Artifact">
+ <bean class="org.apache.geronimo.gshell.application.model.Artifact">
<property name="groupId" value="org.apache.geronimo.gshell.support"/>
<property name="artifactId" value="gshell-vfs-truezip"/>
<property name="version" value="1.0-alpha-2-SNAPSHOT"/>
@@ -63,13 +63,13 @@
<property name="plugins">
<list>
- <bean class="org.apache.geronimo.gshell.model.Artifact">
+ <bean class="org.apache.geronimo.gshell.application.model.Artifact">
<property name="groupId" value="org.apache.geronimo.gshell.commands"/>
<property name="artifactId" value="gshell-builtins"/>
<property name="version" value="1.0-alpha-2-SNAPSHOT"/>
</bean>
- <bean class="org.apache.geronimo.gshell.model.Artifact">
+ <bean class="org.apache.geronimo.gshell.application.model.Artifact">
<property name="groupId" value="org.apache.geronimo.gshell.commands"/>
<property name="artifactId" value="gshell-vfs"/>
<property name="version" value="1.0-alpha-2-SNAPSHOT"/>
Modified: geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/log4j.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/log4j.xml?rev=705678&r1=705677&r2=705678&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/log4j.xml (original)
+++ geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/log4j.xml Fri Oct 17 10:26:34 2008
@@ -57,7 +57,7 @@
<level value="DEBUG"/>
</logger>
- <logger name="org.apache.geronimo.gshell.model.interpolate.InterpolatorSupport">
+ <logger name="org.apache.geronimo.gshell.application.model.interpolate.InterpolatorSupport">
<level value="DEBUG"/>
</logger>
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=705678&r1=705677&r2=705678&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-admin/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-admin/pom.xml Fri Oct 17 10:26:34 2008
@@ -45,11 +45,6 @@
<dependency>
<groupId>org.apache.geronimo.gshell</groupId>
- <artifactId>gshell-model</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.gshell</groupId>
<artifactId>gshell-application</artifactId>
</dependency>
</dependencies>
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=705678&r1=705677&r2=705678&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 Fri Oct 17 10:26:34 2008
@@ -24,7 +24,7 @@
import org.apache.geronimo.gshell.command.CommandAction;
import org.apache.geronimo.gshell.command.CommandContext;
import org.apache.geronimo.gshell.io.IO;
-import org.apache.geronimo.gshell.model.Artifact;
+import org.apache.geronimo.gshell.application.model.Artifact;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/pom.xml?rev=705678&r1=705677&r2=705678&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/pom.xml Fri Oct 17 10:26:34 2008
@@ -47,11 +47,6 @@
<groupId>org.apache.geronimo.gshell.support</groupId>
<artifactId>gshell-vfs</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.gshell</groupId>
- <artifactId>gshell-model</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.geronimo.gshell</groupId>
Modified: geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/AboutAction.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/AboutAction.java?rev=705678&r1=705677&r2=705678&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/AboutAction.java (original)
+++ geronimo/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/AboutAction.java Fri Oct 17 10:26:34 2008
@@ -24,8 +24,8 @@
import org.apache.geronimo.gshell.command.CommandAction;
import org.apache.geronimo.gshell.command.CommandContext;
import org.apache.geronimo.gshell.io.IO;
-import org.apache.geronimo.gshell.model.ApplicationModel;
-import org.apache.geronimo.gshell.model.Branding;
+import org.apache.geronimo.gshell.application.model.ApplicationModel;
+import org.apache.geronimo.gshell.application.model.Branding;
import org.springframework.beans.factory.annotation.Autowired;
/**
Modified: geronimo/gshell/trunk/gshell-support/gshell-ivy/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-ivy/src/main/resources/META-INF/spring/components.xml?rev=705678&r1=705677&r2=705678&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-ivy/src/main/resources/META-INF/spring/components.xml (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-ivy/src/main/resources/META-INF/spring/components.xml Fri Oct 17 10:26:34 2008
@@ -27,7 +27,7 @@
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
- <bean class="org.apache.geronimo.gshell.ivy.IvyFactoryBean">
+ <bean id="ivy" class="org.apache.geronimo.gshell.ivy.IvyFactoryBean">
<property name="settingsUrl" value="file:${gshell.home}/etc/ivysettings.xml"/>
</bean>
Copied: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/data/MetaDataRegistryImplTest.java (from r705651, geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryImplTest.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/data/MetaDataRegistryImplTest.java?p2=geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/data/MetaDataRegistryImplTest.java&p1=geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryImplTest.java&r1=705651&r2=705678&rev=705678&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryImplTest.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/data/MetaDataRegistryImplTest.java Fri Oct 17 10:26:34 2008
@@ -17,18 +17,16 @@
* under the License.
*/
-package org.apache.geronimo.gshell.vfs.provider.meta;
+package org.apache.geronimo.gshell.vfs.provider.meta.data;
-import org.apache.geronimo.gshell.spring.SpringTestSupport;
-import org.apache.geronimo.gshell.vfs.provider.meta.data.MetaData;
import org.apache.commons.vfs.FileName;
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.DomDriver;
+import org.apache.geronimo.gshell.spring.SpringTestSupport;
+import org.apache.geronimo.gshell.vfs.provider.meta.AccessibleMetaDataRegistry;
import java.util.Map;
/**
- * Unit tests for the {@link org.apache.geronimo.gshell.vfs.provider.meta.data.MetaDataRegistryImpl} class.
+ * Unit tests for the {@link MetaDataRegistryImpl} class.
*
* @version $Rev$ $Date$
*/
@@ -48,9 +46,5 @@
Map<FileName, MetaData> nodes = registry.getNodes();
assertNotNull(nodes);
assertEquals(1, nodes.size());
-
- XStream xs = new XStream(new DomDriver());
- String xml = xs.toXML(registry);
- System.out.println(xml);
}
}
\ No newline at end of file
Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/data/MetaDataRegistryImplTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/data/MetaDataRegistryImplTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/data/MetaDataRegistryImplTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/data/support/MetaDataRegistryConfigurerTest.java (from r705651, geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryConfigurerTest.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/data/support/MetaDataRegistryConfigurerTest.java?p2=geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/data/support/MetaDataRegistryConfigurerTest.java&p1=geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryConfigurerTest.java&r1=705651&r2=705678&rev=705678&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/MetaDataRegistryConfigurerTest.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/data/support/MetaDataRegistryConfigurerTest.java Fri Oct 17 10:26:34 2008
@@ -17,19 +17,17 @@
* under the License.
*/
-package org.apache.geronimo.gshell.vfs.provider.meta;
+package org.apache.geronimo.gshell.vfs.provider.meta.data.support;
+import org.apache.commons.vfs.FileName;
import org.apache.geronimo.gshell.spring.SpringTestSupport;
+import org.apache.geronimo.gshell.vfs.provider.meta.AccessibleMetaDataRegistry;
import org.apache.geronimo.gshell.vfs.provider.meta.data.MetaData;
-import org.apache.geronimo.gshell.vfs.provider.meta.data.support.MetaDataRegistryConfigurer;
-import org.apache.commons.vfs.FileName;
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.DomDriver;
import java.util.Map;
/**
- * Unit tests for the {@link org.apache.geronimo.gshell.vfs.provider.meta.data.support.MetaDataRegistryConfigurer} class.
+ * Unit tests for the {@link MetaDataRegistryConfigurer} class.
*
* @version $Rev$ $Date$
*/
@@ -86,9 +84,5 @@
Map<FileName, MetaData> nodes = registry.getNodes();
assertNotNull(nodes);
assertEquals(4, nodes.size());
-
- XStream xs = new XStream(new DomDriver());
- String xml = xs.toXML(registry);
- System.out.println(xml);
}
}
\ No newline at end of file
Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/data/support/MetaDataRegistryConfigurerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/data/support/MetaDataRegistryConfigurerTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/java/org/apache/geronimo/gshell/vfs/provider/meta/data/support/MetaDataRegistryConfigurerTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/data/MetaDataRegistryImplTest-context.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/data/MetaDataRegistryImplTest-context.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/data/MetaDataRegistryImplTest-context.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/data/support/MetaDataRegistryConfigurerTest-context.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/data/support/MetaDataRegistryConfigurerTest-context.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-support/gshell-vfs-meta/src/test/resources/org/apache/geronimo/gshell/vfs/provider/meta/data/support/MetaDataRegistryConfigurerTest-context.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationImpl.java?rev=705678&r1=705677&r2=705678&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationImpl.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/application/ApplicationImpl.java Fri Oct 17 10:26:34 2008
@@ -24,7 +24,7 @@
import org.apache.geronimo.gshell.application.ClassPath;
import org.apache.geronimo.gshell.command.Variables;
import org.apache.geronimo.gshell.io.IO;
-import org.apache.geronimo.gshell.model.ApplicationModel;
+import org.apache.geronimo.gshell.application.model.ApplicationModel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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=705678&r1=705677&r2=705678&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 10:26:34 2008
@@ -28,8 +28,8 @@
import org.apache.geronimo.gshell.chronos.StopWatch;
import org.apache.geronimo.gshell.event.EventPublisher;
import org.apache.geronimo.gshell.io.Closer;
-import org.apache.geronimo.gshell.model.ApplicationModel;
-import org.apache.geronimo.gshell.model.Artifact;
+import org.apache.geronimo.gshell.application.model.ApplicationModel;
+import org.apache.geronimo.gshell.application.model.Artifact;
import org.apache.geronimo.gshell.shell.Shell;
import org.apache.geronimo.gshell.spring.BeanContainer;
import org.apache.geronimo.gshell.spring.BeanContainerAware;
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=705678&r1=705677&r2=705678&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 Fri Oct 17 10:26:34 2008
@@ -20,7 +20,7 @@
package org.apache.geronimo.gshell.wisdom.application;
import org.apache.geronimo.gshell.application.ClassPath;
-import org.apache.geronimo.gshell.model.Artifact;
+import org.apache.geronimo.gshell.application.model.Artifact;
import java.io.File;
import java.io.Serializable;
@@ -38,7 +38,9 @@
*/
public class ClassPathImpl
implements ClassPath, Serializable
-{
+{
+ private static final long serialVersionUID = 1;
+
private Collection<Artifact> artifacts;
private transient Collection<URL> urls;
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/branding/GShellBranding.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/branding/GShellBranding.java?rev=705678&r1=705677&r2=705678&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/branding/GShellBranding.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/branding/GShellBranding.java Fri Oct 17 10:26:34 2008
@@ -22,7 +22,7 @@
import org.apache.geronimo.gshell.ansi.Buffer;
import org.apache.geronimo.gshell.ansi.Code;
import org.apache.geronimo.gshell.ansi.RenderWriter;
-import org.apache.geronimo.gshell.model.Branding;
+import org.apache.geronimo.gshell.application.model.Branding;
import java.io.PrintWriter;
import java.io.StringWriter;
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/builder/ShellBuilderImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/builder/ShellBuilderImpl.java?rev=705678&r1=705677&r2=705678&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/builder/ShellBuilderImpl.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/builder/ShellBuilderImpl.java Fri Oct 17 10:26:34 2008
@@ -25,7 +25,7 @@
import org.apache.geronimo.gshell.command.Variables;
import org.apache.geronimo.gshell.io.IO;
import org.apache.geronimo.gshell.io.SystemOutputHijacker;
-import org.apache.geronimo.gshell.model.ApplicationModel;
+import org.apache.geronimo.gshell.application.model.ApplicationModel;
import org.apache.geronimo.gshell.shell.Shell;
import org.apache.geronimo.gshell.spring.BeanContainer;
import org.apache.geronimo.gshell.spring.BeanContainerImpl;
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=705678&r1=705677&r2=705678&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 Fri Oct 17 10:26:34 2008
@@ -40,7 +40,7 @@
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.model.Artifact artifact : application.getClassPath().getArtifacts()) {
+ for (org.apache.geronimo.gshell.application.model.Artifact artifact : application.getClassPath().getArtifacts()) {
String id = artifact.getGroupId() + ":" + artifact.getArtifactId();
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=705678&r1=705677&r2=705678&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 Fri Oct 17 10:26:34 2008
@@ -21,7 +21,7 @@
import org.apache.geronimo.gshell.application.plugin.Plugin;
import org.apache.geronimo.gshell.application.ClassPath;
-import org.apache.geronimo.gshell.model.Artifact;
+import org.apache.geronimo.gshell.application.model.Artifact;
import org.apache.geronimo.gshell.spring.BeanContainer;
import org.apache.geronimo.gshell.spring.BeanContainerAware;
import org.apache.geronimo.gshell.wisdom.plugin.activation.ActivationContext;
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=705678&r1=705677&r2=705678&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 Fri Oct 17 10:26:34 2008
@@ -21,7 +21,7 @@
import org.apache.geronimo.gshell.application.plugin.Plugin;
import org.apache.geronimo.gshell.event.Event;
-import org.apache.geronimo.gshell.model.Artifact;
+import org.apache.geronimo.gshell.application.model.Artifact;
/**
* Event fired once a plugin has been loaded.
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=705678&r1=705677&r2=705678&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 10:26:34 2008
@@ -29,7 +29,7 @@
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.Artifact;
+import org.apache.geronimo.gshell.application.model.Artifact;
import org.apache.geronimo.gshell.spring.BeanContainer;
import org.apache.geronimo.gshell.spring.BeanContainerAware;
import org.apache.geronimo.gshell.wisdom.application.ApplicationConfiguredEvent;
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ShellImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ShellImpl.java?rev=705678&r1=705677&r2=705678&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ShellImpl.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ShellImpl.java Fri Oct 17 10:26:34 2008
@@ -31,7 +31,7 @@
import org.apache.geronimo.gshell.console.completer.AggregateCompleter;
import org.apache.geronimo.gshell.io.IO;
import org.apache.geronimo.gshell.io.Closer;
-import org.apache.geronimo.gshell.model.Branding;
+import org.apache.geronimo.gshell.application.model.Branding;
import org.apache.geronimo.gshell.notification.ExitNotification;
import org.apache.geronimo.gshell.shell.Shell;
import org.apache.geronimo.gshell.shell.ShellContext;
Added: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/test/resources/ivysettings.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/test/resources/ivysettings.xml?rev=705678&view=auto
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/test/resources/ivysettings.xml (added)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/test/resources/ivysettings.xml Fri Oct 17 10:26:34 2008
@@ -0,0 +1,42 @@
+<?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$ -->
+
+<ivysettings>
+ <settings defaultResolver="default"/>
+
+ <property name="ivy.m2local.default.root" value="${user.home}/.m2/repository" override="false"/>
+ <property name="ivy.m2local.default.ivy.pattern" value="[organisation]/[module]/[revision]/[module]-[revision].pom" override="false"/>
+ <property name="ivy.m2local.default.artifact.pattern" value="[organisation]/[module]/[revision]/[module]-[revision].[ext]" override="false"/>
+
+ <resolvers>
+ <chain name="default"> <!-- returnFirst="true" checkmodified="true"> -->
+ <filesystem name="m2local" m2compatible="true">
+ <ivy pattern="${ivy.m2local.default.root}/${ivy.m2local.default.ivy.pattern}"/>
+ <artifact pattern="${ivy.m2local.default.root}/${ivy.m2local.default.artifact.pattern}"/>
+ </filesystem>
+
+ <!--
+ <ibiblio name="ibiblio" m2compatible="true"/>
+ -->
+ </chain>
+ </resolvers>
+</ivysettings>
\ No newline at end of file
Propchange: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/test/resources/ivysettings.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/test/resources/ivysettings.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/test/resources/ivysettings.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/test/resources/org/apache/geronimo/gshell/wisdom/registry/CommandResolverImplTest-context.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/test/resources/org/apache/geronimo/gshell/wisdom/registry/CommandResolverImplTest-context.xml?rev=705678&r1=705677&r2=705678&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/test/resources/org/apache/geronimo/gshell/wisdom/registry/CommandResolverImplTest-context.xml (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-core/src/test/resources/org/apache/geronimo/gshell/wisdom/registry/CommandResolverImplTest-context.xml Fri Oct 17 10:26:34 2008
@@ -33,6 +33,10 @@
<property name="rootUri" value="file:${basedir}/target/xstore"/>
</bean>
+ <bean id="ivy" class="org.apache.geronimo.gshell.ivy.IvyFactoryBean">
+ <property name="settingsUrl" value="file:${basedir}/target/test-classes/ivysettings.xml"/>
+ </bean>
+
<gshell:plugin name="test-plugin">
<gshell:command-bundle name="default">
<gshell:command name="test1">
Modified: geronimo/gshell/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/pom.xml?rev=705678&r1=705677&r2=705678&view=diff
==============================================================================
--- geronimo/gshell/trunk/pom.xml (original)
+++ geronimo/gshell/trunk/pom.xml Fri Oct 17 10:26:34 2008
@@ -261,12 +261,6 @@
<artifactId>gshell-parser</artifactId>
<version>1.0-alpha-2-SNAPSHOT</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.gshell</groupId>
- <artifactId>gshell-model</artifactId>
- <version>1.0-alpha-2-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.apache.geronimo.gshell</groupId>
@@ -385,7 +379,6 @@
<module>gshell-api</module>
<module>gshell-support</module>
<module>gshell-bootstrap</module>
- <module>gshell-model</module>
<module>gshell-application</module>
<module>gshell-parser</module>
<module>gshell-wisdom</module>