geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r637768 - in /geronimo/gshell/trunk/gshell-model/src: main/java/org/apache/geronimo/gshell/model/application/ main/java/org/apache/geronimo/gshell/model/layout/ main/java/org/apache/geronimo/gshell/model/settings/ test/java/org/apache/geron...
Date Mon, 17 Mar 2008 07:35:40 GMT
Author: jdillon
Date: Mon Mar 17 00:35:39 2008
New Revision: 637768

URL: http://svn.apache.org/viewvc?rev=637768&view=rev
Log:
Hook up more bits

Added:
    geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Branding.java
      - copied, changed from r637731, 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/layout/
    geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/layout/Layout.java
  (with props)
    geronimo/gshell/trunk/gshell-model/src/test/java/org/apache/geronimo/gshell/model/layout/
    geronimo/gshell/trunk/gshell-model/src/test/resources/org/apache/geronimo/gshell/model/layout/
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/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=637768&r1=637767&r2=637768&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
Mon Mar 17 00:35:39 2008
@@ -24,6 +24,7 @@
 import org.apache.geronimo.gshell.model.common.Dependency;
 import org.apache.geronimo.gshell.model.common.DependencyGroup;
 import org.apache.geronimo.gshell.model.common.SourceRepository;
+import org.apache.geronimo.gshell.model.layout.Layout;
 
 import java.util.List;
 import java.util.ArrayList;
@@ -45,8 +46,8 @@
     private String description;
 
     private Properties properties;
-    
-    // Repository
+
+    private String repository;
 
     private List<SourceRepository> sourceRepositories;
 
@@ -54,9 +55,9 @@
 
     private List<DependencyGroup> dependencyGroups;
     
-    // Layout
+    private Branding branding;
 
-    // Branding
+    private Layout layout;
 
     // Paths
 
@@ -92,6 +93,14 @@
         this.properties = properties;
     }
 
+    public String getRepository() {
+        return repository;
+    }
+
+    public void setRepository(final String repository) {
+        this.repository = repository;
+    }
+
     public List<SourceRepository> sourceRepositories() {
         return sourceRepositories;
     }
@@ -132,5 +141,21 @@
         }
 
         dependencyGroups.add(group);
+    }
+
+    public Branding getBranding() {
+        return branding;
+    }
+
+    public void setBranding(final Branding branding) {
+        this.branding = branding;
+    }
+
+    public Layout getLayout() {
+        return layout;
+    }
+
+    public void setLayout(final Layout layout) {
+        this.layout = layout;
     }
 }

Copied: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Branding.java
(from r637731, 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/Branding.java?p2=geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Branding.java&p1=geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/Application.java&r1=637731&r2=637768&rev=637768&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/Branding.java
Mon Mar 17 00:35:39 2008
@@ -20,117 +20,16 @@
 package org.apache.geronimo.gshell.model.application;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
-import org.apache.geronimo.gshell.model.common.ModelRoot;
-import org.apache.geronimo.gshell.model.common.Dependency;
-import org.apache.geronimo.gshell.model.common.DependencyGroup;
-import org.apache.geronimo.gshell.model.common.SourceRepository;
-
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Properties;
+import org.apache.geronimo.gshell.model.common.ModelElement;
 
 /**
- * Application model root element.
+ * Branding configuration element.
  *
  * @version $Rev$ $Date$
  */
-@XStreamAlias("application")
-public class Application
-    extends ModelRoot
+@XStreamAlias("branding")
+public class Branding
+    extends ModelElement
 {
-    private String id;
-
-    private String name;
-
-    private String description;
-
-    private Properties properties;
-    
-    // Repository
-
-    private List<SourceRepository> sourceRepositories;
-
-    private List<Dependency> dependencies;
-
-    private List<DependencyGroup> dependencyGroups;
-    
-    // Layout
-
-    // Branding
-
-    // Paths
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(final String id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(final String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(final String description) {
-        this.description = description;
-    }
-
-    public Properties getProperties() {
-        return properties;
-    }
-
-    public void setProperties(final Properties properties) {
-        this.properties = properties;
-    }
-
-    public List<SourceRepository> sourceRepositories() {
-        return sourceRepositories;
-    }
-
-    public void add(final SourceRepository repository) {
-        assert repository != null;
-
-        if (sourceRepositories == null) {
-            sourceRepositories = new ArrayList<SourceRepository>();
-        }
-
-        sourceRepositories.add(repository);
-    }
-
-    public List<Dependency> dependencies() {
-        return dependencies;
-    }
-
-    public void add(final Dependency dependency) {
-        assert dependency != null;
-
-        if (dependencies == null) {
-            dependencies = new ArrayList<Dependency>();
-        }
-
-        dependencies.add(dependency);
-    }
-
-    public List<DependencyGroup> dependencyGroups() {
-        return dependencyGroups;
-    }
-
-    public void add(final DependencyGroup group) {
-        assert group != null;
-
-        if (dependencyGroups == null) {
-            dependencyGroups = new ArrayList<DependencyGroup>();
-        }
-
-        dependencyGroups.add(group);
-    }
+    // ???
 }

Added: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/layout/Layout.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/layout/Layout.java?rev=637768&view=auto
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/layout/Layout.java
(added)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/layout/Layout.java
Mon Mar 17 00:35:39 2008
@@ -0,0 +1,35 @@
+/*
+ * 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.layout;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import org.apache.geronimo.gshell.model.common.ModelElement;
+
+/**
+ * Layout configuration element.
+ *
+ * @version $Rev$ $Date$
+ */
+@XStreamAlias("layout")
+public class Layout
+    extends ModelElement
+{
+    // ???
+}
\ No newline at end of file

Propchange: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/layout/Layout.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/layout/Layout.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/layout/Layout.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

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=637768&r1=637767&r2=637768&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
Mon Mar 17 00:35:39 2008
@@ -21,6 +21,11 @@
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import org.apache.geronimo.gshell.model.common.ModelRoot;
+import org.apache.geronimo.gshell.model.common.SourceRepository;
+
+import java.util.Properties;
+import java.util.List;
+import java.util.ArrayList;
 
 /**
  * User settings model root element.
@@ -31,13 +36,35 @@
 public class Settings
     extends ModelRoot
 {
-    // Properties
+    private Properties properties;
 
     // Proxies
-    
-    // Repository
 
-    // Source Repositories
+    private List<SourceRepository> sourceRepositories;
+
+    // Repository
 
     // Paths
+
+    public Properties getProperties() {
+        return properties;
+    }
+
+    public void setProperties(final Properties properties) {
+        this.properties = properties;
+    }
+
+    public List<SourceRepository> sourceRepositories() {
+        return sourceRepositories;
+    }
+
+    public void add(final SourceRepository repository) {
+        assert repository != null;
+
+        if (sourceRepositories == null) {
+            sourceRepositories = new ArrayList<SourceRepository>();
+        }
+
+        sourceRepositories.add(repository);
+    }
 }



Mime
View raw message