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/06/01 10:44:03 UTC
svn commit: r662177 - in
/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model:
./ application/ command/ common/ interpolate/ layout/ marshal/ settings/
Author: jdillon
Date: Sun Jun 1 01:44:02 2008
New Revision: 662177
URL: http://svn.apache.org/viewvc?rev=662177&view=rev
Log:
Update some naming
Added:
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/Element.java (contents, props changed)
- copied, changed from r662151, geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/ModelElement.java
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/Model.java (contents, props changed)
- copied, changed from r662152, geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/ModelRoot.java
Removed:
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/ModelElement.java
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/ModelRoot.java
Modified:
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Branding.java
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/command/Command.java
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/command/CommandSet.java
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/command/Parameter.java
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/command/Requirement.java
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/DependencySupport.java
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/DescriptorSupport.java
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/LocalRepository.java
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/RemoteRepository.java
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/interpolate/Interpolator.java
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/interpolate/InterpolatorSupport.java
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/layout/Node.java
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/marshal/Marshaller.java
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/marshal/MarshallerSupport.java
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/settings/Settings.java
Copied: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/Element.java (from r662151, geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/ModelElement.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/Element.java?p2=geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/Element.java&p1=geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/ModelElement.java&r1=662151&r2=662177&rev=662177&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/ModelElement.java (original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/Element.java Sun Jun 1 01:44:02 2008
@@ -27,7 +27,7 @@
*
* @version $Rev$ $Date$
*/
-public abstract class ModelElement
+public abstract class Element
{
@Override
public String toString() {
Propchange: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/Element.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/Element.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/Element.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/Model.java (from r662152, geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/ModelRoot.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/Model.java?p2=geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/Model.java&p1=geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/ModelRoot.java&r1=662152&r2=662177&rev=662177&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/ModelRoot.java (original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/Model.java Sun Jun 1 01:44:02 2008
@@ -28,8 +28,8 @@
*
* @version $Rev$ $Date$
*/
-public abstract class ModelRoot
- extends ModelElement
+public abstract class Model
+ extends Element
{
private transient Marshaller marshaller;
Propchange: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/Model.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/Model.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/Model.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Branding.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Branding.java?rev=662177&r1=662176&r2=662177&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Branding.java (original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Branding.java Sun Jun 1 01:44:02 2008
@@ -21,7 +21,7 @@
import com.thoughtworks.xstream.annotations.XStreamAlias;
-import org.apache.geronimo.gshell.model.ModelElement;
+import org.apache.geronimo.gshell.model.Element;
import org.codehaus.plexus.util.StringUtils;
import java.util.Properties;
@@ -34,7 +34,7 @@
*/
@XStreamAlias("branding")
public class Branding
- extends ModelElement
+ extends Element
{
private transient Application parent;
Modified: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/command/Command.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/command/Command.java?rev=662177&r1=662176&r2=662177&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/command/Command.java (original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/command/Command.java Sun Jun 1 01:44:02 2008
@@ -21,7 +21,7 @@
import com.thoughtworks.xstream.annotations.XStreamAlias;
-import org.apache.geronimo.gshell.model.ModelElement;
+import org.apache.geronimo.gshell.model.Element;
import java.net.URI;
import java.util.ArrayList;
@@ -34,7 +34,7 @@
*/
@XStreamAlias("command")
public class Command
- extends ModelElement
+ extends Element
{
private URI source;
Modified: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/command/CommandSet.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/command/CommandSet.java?rev=662177&r1=662176&r2=662177&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/command/CommandSet.java (original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/command/CommandSet.java Sun Jun 1 01:44:02 2008
@@ -22,7 +22,7 @@
import com.thoughtworks.xstream.annotations.XStreamAlias;
import org.apache.geronimo.gshell.common.tostring.ReflectionToStringBuilder;
import org.apache.geronimo.gshell.common.tostring.ToStringStyle;
-import org.apache.geronimo.gshell.model.ModelRoot;
+import org.apache.geronimo.gshell.model.Model;
import java.util.ArrayList;
import java.util.List;
@@ -35,7 +35,7 @@
// FIXME: Use consistent case for XML tags
@XStreamAlias("command-set")
public class CommandSet
- extends ModelRoot
+ extends Model
{
private String id;
Modified: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/command/Parameter.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/command/Parameter.java?rev=662177&r1=662176&r2=662177&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/command/Parameter.java (original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/command/Parameter.java Sun Jun 1 01:44:02 2008
@@ -21,7 +21,7 @@
import com.thoughtworks.xstream.annotations.XStreamAlias;
-import org.apache.geronimo.gshell.model.ModelElement;
+import org.apache.geronimo.gshell.model.Element;
/**
* Describes a comand parameter.
@@ -30,7 +30,7 @@
*/
@XStreamAlias("parameter")
public class Parameter
- extends ModelElement
+ extends Element
{
private String name;
Modified: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/command/Requirement.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/command/Requirement.java?rev=662177&r1=662176&r2=662177&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/command/Requirement.java (original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/command/Requirement.java Sun Jun 1 01:44:02 2008
@@ -21,7 +21,7 @@
import com.thoughtworks.xstream.annotations.XStreamAlias;
-import org.apache.geronimo.gshell.model.ModelElement;
+import org.apache.geronimo.gshell.model.Element;
/**
* Describes a required component of a command.
@@ -30,7 +30,7 @@
*/
@XStreamAlias("requirement")
public class Requirement
- extends ModelElement
+ extends Element
{
private String name;
Modified: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/DependencySupport.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/DependencySupport.java?rev=662177&r1=662176&r2=662177&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/DependencySupport.java (original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/DependencySupport.java Sun Jun 1 01:44:02 2008
@@ -19,7 +19,7 @@
package org.apache.geronimo.gshell.model.common;
-import org.apache.geronimo.gshell.model.ModelElement;
+import org.apache.geronimo.gshell.model.Element;
/**
* Support for {@link Dependency} and {@link DependencyGroup} elements.
@@ -27,7 +27,7 @@
* @version $Rev$ $Date$
*/
public abstract class DependencySupport
- extends ModelElement
+ extends Element
{
private String groupId;
Modified: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/DescriptorSupport.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/DescriptorSupport.java?rev=662177&r1=662176&r2=662177&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/DescriptorSupport.java (original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/DescriptorSupport.java Sun Jun 1 01:44:02 2008
@@ -21,7 +21,7 @@
import java.util.Properties;
-import org.apache.geronimo.gshell.model.ModelRoot;
+import org.apache.geronimo.gshell.model.Model;
/**
* Support for descriptor models.
@@ -29,7 +29,7 @@
* @version $Rev$ $Date$
*/
public class DescriptorSupport
- extends ModelRoot
+ extends Model
{
private String groupId;
Modified: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/LocalRepository.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/LocalRepository.java?rev=662177&r1=662176&r2=662177&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/LocalRepository.java (original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/LocalRepository.java Sun Jun 1 01:44:02 2008
@@ -23,7 +23,7 @@
import java.io.File;
-import org.apache.geronimo.gshell.model.ModelElement;
+import org.apache.geronimo.gshell.model.Element;
/**
* Local repository configuration.
@@ -32,7 +32,7 @@
*/
@XStreamAlias("localRepository")
public class LocalRepository
- extends ModelElement
+ extends Element
{
private String directory;
Modified: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/RemoteRepository.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/RemoteRepository.java?rev=662177&r1=662176&r2=662177&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/RemoteRepository.java (original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/RemoteRepository.java Sun Jun 1 01:44:02 2008
@@ -24,7 +24,7 @@
import java.net.URI;
import java.net.URISyntaxException;
-import org.apache.geronimo.gshell.model.ModelElement;
+import org.apache.geronimo.gshell.model.Element;
/**
* Remote repository configuration.
@@ -33,7 +33,7 @@
*/
@XStreamAlias("remoteRepository")
public class RemoteRepository
- extends ModelElement
+ extends Element
{
private String id;
Modified: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/interpolate/Interpolator.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/interpolate/Interpolator.java?rev=662177&r1=662176&r2=662177&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/interpolate/Interpolator.java (original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/interpolate/Interpolator.java Sun Jun 1 01:44:02 2008
@@ -19,7 +19,7 @@
package org.apache.geronimo.gshell.model.interpolate;
-import org.apache.geronimo.gshell.model.ModelRoot;
+import org.apache.geronimo.gshell.model.Model;
import org.codehaus.plexus.interpolation.InterpolationException;
import org.codehaus.plexus.interpolation.RecursionInterceptor;
import org.codehaus.plexus.interpolation.ValueSource;
@@ -29,7 +29,7 @@
*
* @version $Rev$ $Date$
*/
-public interface Interpolator<T extends ModelRoot>
+public interface Interpolator<T extends Model>
{
void setPrefixPattern(String pattern);
Modified: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/interpolate/InterpolatorSupport.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/interpolate/InterpolatorSupport.java?rev=662177&r1=662176&r2=662177&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/interpolate/InterpolatorSupport.java (original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/interpolate/InterpolatorSupport.java Sun Jun 1 01:44:02 2008
@@ -19,7 +19,7 @@
package org.apache.geronimo.gshell.model.interpolate;
-import org.apache.geronimo.gshell.model.ModelRoot;
+import org.apache.geronimo.gshell.model.Model;
import org.apache.geronimo.gshell.model.marshal.Marshaller;
import org.codehaus.plexus.interpolation.InterpolationException;
import org.codehaus.plexus.interpolation.RecursionInterceptor;
@@ -33,7 +33,7 @@
*
* @version $Rev$ $Date$
*/
-public class InterpolatorSupport<T extends ModelRoot>
+public class InterpolatorSupport<T extends Model>
implements Interpolator<T>
{
private final Logger log = LoggerFactory.getLogger(getClass());
Modified: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/layout/Node.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/layout/Node.java?rev=662177&r1=662176&r2=662177&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/layout/Node.java (original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/layout/Node.java Sun Jun 1 01:44:02 2008
@@ -19,7 +19,7 @@
package org.apache.geronimo.gshell.model.layout;
-import org.apache.geronimo.gshell.model.ModelElement;
+import org.apache.geronimo.gshell.model.Element;
/**
* The rudimentary element of a layout.
@@ -27,7 +27,7 @@
* @version $Rev$ $Date$
*/
public abstract class Node
- extends ModelElement
+ extends Element
{
public static final String SEPARATOR = "/";
Modified: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/marshal/Marshaller.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/marshal/Marshaller.java?rev=662177&r1=662176&r2=662177&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/marshal/Marshaller.java (original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/marshal/Marshaller.java Sun Jun 1 01:44:02 2008
@@ -19,7 +19,7 @@
package org.apache.geronimo.gshell.model.marshal;
-import org.apache.geronimo.gshell.model.ModelRoot;
+import org.apache.geronimo.gshell.model.Model;
import java.io.InputStream;
import java.io.Reader;
@@ -31,7 +31,7 @@
*
* @version $Rev$ $Date$
*/
-public interface Marshaller<T extends ModelRoot>
+public interface Marshaller<T extends Model>
{
void marshal(T root, OutputStream output);
Modified: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/marshal/MarshallerSupport.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/marshal/MarshallerSupport.java?rev=662177&r1=662176&r2=662177&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/marshal/MarshallerSupport.java (original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/marshal/MarshallerSupport.java Sun Jun 1 01:44:02 2008
@@ -31,7 +31,7 @@
import java.io.Writer;
import java.net.URL;
-import org.apache.geronimo.gshell.model.ModelRoot;
+import org.apache.geronimo.gshell.model.Model;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,7 +40,7 @@
*
* @version $Rev$ $Date$
*/
-public class MarshallerSupport<T extends ModelRoot>
+public class MarshallerSupport<T extends Model>
implements Marshaller<T>
{
private final Logger log = LoggerFactory.getLogger(getClass());
Modified: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/settings/Settings.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/settings/Settings.java?rev=662177&r1=662176&r2=662177&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/settings/Settings.java (original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/settings/Settings.java Sun Jun 1 01:44:02 2008
@@ -21,7 +21,7 @@
import com.thoughtworks.xstream.annotations.XStreamAlias;
-import org.apache.geronimo.gshell.model.ModelRoot;
+import org.apache.geronimo.gshell.model.Model;
import org.apache.geronimo.gshell.model.common.RemoteRepository;
import java.util.Properties;
@@ -35,7 +35,7 @@
*/
@XStreamAlias("settings")
public class Settings
- extends ModelRoot
+ extends Model
{
private Properties properties;