Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 25243 invoked from network); 14 Dec 2008 16:28:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 14 Dec 2008 16:28:12 -0000 Received: (qmail 25101 invoked by uid 500); 14 Dec 2008 16:28:24 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 25059 invoked by uid 500); 14 Dec 2008 16:28:24 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 25050 invoked by uid 99); 14 Dec 2008 16:28:24 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Dec 2008 08:28:24 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Dec 2008 16:28:11 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1ECE12388886; Sun, 14 Dec 2008 08:27:51 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r726486 - in /geronimo/gshell/trunk/gshell-application/src/main/java/org/apache/geronimo/gshell/application/model: ApplicationModel.java Branding.java Date: Sun, 14 Dec 2008 16:27:50 -0000 To: scm@geronimo.apache.org From: jdillon@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081214162751.1ECE12388886@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jdillon Date: Sun Dec 14 08:27:50 2008 New Revision: 726486 URL: http://svn.apache.org/viewvc?rev=726486&view=rev Log: Trim off unused properties Modified: 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 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=726486&r1=726485&r2=726486&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 Sun Dec 14 08:27:50 2008 @@ -24,7 +24,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Properties; /** * Application model root element. @@ -33,6 +32,10 @@ */ public class ApplicationModel { + // + // FIXME: Merge with Application + // + private String groupId; private String artifactId; @@ -43,8 +46,6 @@ private String description; - private Properties properties; - private List dependencies; private List plugins; @@ -109,19 +110,7 @@ this.description = description; } - public Properties getProperties() { - if (properties == null) { - properties = new Properties(); - } - - return properties; - } - - public void setProperties(final Properties properties) { - this.properties = properties; - } - - // DependencyArtifact + // Dependencies public List getDependencies() { if (dependencies == null) { @@ -141,7 +130,7 @@ getDependencies().add(dependency); } - // PluginArtifact + // Plugins public List getPlugins() { if (plugins == null) { 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=726486&r1=726485&r2=726486&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 Sun Dec 14 08:27:50 2008 @@ -22,7 +22,6 @@ import org.apache.geronimo.gshell.yarn.Yarn; import java.io.File; -import java.util.Properties; /** * Branding configuration element. @@ -31,14 +30,12 @@ */ public class Branding { - private transient ApplicationModel parent; - - private Properties properties; - // - // FIXME: Probably need to move some of these up to the Application descriptor? + // FIXME: Merge with Application // + private transient ApplicationModel parent; + private String name; private String displayName; @@ -230,16 +227,4 @@ public void setPrompt(final String prompt) { this.prompt = prompt; } - - public Properties getProperties() { - if (properties == null) { - properties = new Properties(); - } - - return properties; - } - - public void setProperties(final Properties properties) { - this.properties = properties; - } } \ No newline at end of file