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/03/16 09:19:20 UTC
svn commit: r637561 - in
/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model:
application/ common/ plugin/ settings/
Author: jdillon
Date: Sun Mar 16 01:19:19 2008
New Revision: 637561
URL: http://svn.apache.org/viewvc?rev=637561&view=rev
Log:
Add marshallers and some comments on elements to be added
Added:
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/plugin/PluginMarshaller.java
- copied, changed from r637549, geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationMarshaller.java
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/settings/SettingsMarshaller.java (with props)
Modified:
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Application.java
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/Dependency.java
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/DependencyGroup.java
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/plugin/Plugin.java
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/settings/Settings.java
Modified: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Application.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Application.java?rev=637561&r1=637560&r2=637561&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Application.java (original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Application.java Sun Mar 16 01:19:19 2008
@@ -36,7 +36,25 @@
public class Application
extends ModelRoot
{
+ // ID
+
+ // Name
+
+ // Description
+
+ // Properties
+
+ // Repository
+
+ // Source Repositories
+
private List<Dependency> dependencies = new ArrayList<Dependency>();
private List<DependencyGroup> dependencyGroups = new ArrayList<DependencyGroup>();
+
+ // Layout
+
+ // Branding
+
+ // Paths
}
Modified: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/Dependency.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/Dependency.java?rev=637561&r1=637560&r2=637561&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/Dependency.java (original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/Dependency.java Sun Mar 16 01:19:19 2008
@@ -22,7 +22,7 @@
import com.thoughtworks.xstream.annotations.XStreamAlias;
/**
- * Dependency element.
+ * Dependency artifact configuration.
*
* @version $Rev$ $Date$
*/
@@ -30,5 +30,13 @@
public class Dependency
extends DependencySupport
{
- // ???
+ private transient DependencyGroup dependencyGroup;
+
+ public DependencyGroup getDependencyGroup() {
+ return dependencyGroup;
+ }
+
+ public void setDependencyGroup(final DependencyGroup dependencyGroup) {
+ this.dependencyGroup = dependencyGroup;
+ }
}
Modified: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/DependencyGroup.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/DependencyGroup.java?rev=637561&r1=637560&r2=637561&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/DependencyGroup.java (original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/DependencyGroup.java Sun Mar 16 01:19:19 2008
@@ -25,7 +25,7 @@
import java.util.ArrayList;
/**
- * Groups dependency elements.
+ * Groups dependency elements to allow artifact configuration to be shared.
*
* @version $Rev$ $Date$
*/
Modified: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/plugin/Plugin.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/plugin/Plugin.java?rev=637561&r1=637560&r2=637561&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/plugin/Plugin.java (original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/plugin/Plugin.java Sun Mar 16 01:19:19 2008
@@ -21,9 +21,14 @@
import com.thoughtworks.xstream.annotations.XStreamAlias;
import org.apache.geronimo.gshell.model.common.ModelRoot;
+import org.apache.geronimo.gshell.model.common.DependencyGroup;
+import org.apache.geronimo.gshell.model.common.Dependency;
+
+import java.util.List;
+import java.util.ArrayList;
/**
- * ???
+ * Plugin model root element.
*
* @version $Rev$ $Date$
*/
@@ -31,5 +36,19 @@
public class Plugin
extends ModelRoot
{
- // ???
+ // ID
+
+ // Name
+
+ // Description
+
+ // Properties
+
+ private List<Dependency> dependencies = new ArrayList<Dependency>();
+
+ private List<DependencyGroup> dependencyGroups = new ArrayList<DependencyGroup>();
+
+ // Commands
+
+ // Layout
}
Copied: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/plugin/PluginMarshaller.java (from r637549, geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationMarshaller.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/plugin/PluginMarshaller.java?p2=geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/plugin/PluginMarshaller.java&p1=geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationMarshaller.java&r1=637549&r2=637561&rev=637561&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationMarshaller.java (original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/plugin/PluginMarshaller.java Sun Mar 16 01:19:19 2008
@@ -17,17 +17,17 @@
* under the License.
*/
-package org.apache.geronimo.gshell.model.application;
+package org.apache.geronimo.gshell.model.plugin;
import org.apache.geronimo.gshell.model.marshal.MarshallerSupport;
/**
- * Marshaller for {@link Application} models.
+ * Marshaller for {@link Plugin} models.
*
* @version $Rev$ $Date$
*/
-public class ApplicationMarshaller
- extends MarshallerSupport<Application>
+public class PluginMarshaller
+ extends MarshallerSupport<Plugin>
{
// ???
}
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=637561&r1=637560&r2=637561&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 Mar 16 01:19:19 2008
@@ -23,7 +23,7 @@
import org.apache.geronimo.gshell.model.common.ModelRoot;
/**
- * ???
+ * User settings model root element.
*
* @version $Rev$ $Date$
*/
@@ -31,5 +31,13 @@
public class Settings
extends ModelRoot
{
- // ???
+ // Properties
+
+ // Proxies
+
+ // Repository
+
+ // Source Repositories
+
+ // Paths
}
Added: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/settings/SettingsMarshaller.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/settings/SettingsMarshaller.java?rev=637561&view=auto
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/settings/SettingsMarshaller.java (added)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/settings/SettingsMarshaller.java Sun Mar 16 01:19:19 2008
@@ -0,0 +1,33 @@
+/*
+ * 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.
+ */
+
+package org.apache.geronimo.gshell.model.settings;
+
+import org.apache.geronimo.gshell.model.marshal.MarshallerSupport;
+
+/**
+ * Marshaller for {@link Settings} models.
+ *
+ * @version $Rev$ $Date$
+ */
+public class SettingsMarshaller
+ extends MarshallerSupport<Settings>
+{
+ // ???
+}
\ No newline at end of file
Propchange: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/settings/SettingsMarshaller.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/settings/SettingsMarshaller.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/settings/SettingsMarshaller.java
------------------------------------------------------------------------------
svn:mime-type = text/plain