svn commit: r1628443 - in /sling/trunk/tooling/support/slingstart-model/src/main/java/org/apache/sling/provisioning/model: Feature.java ModelConstants.java io/ModelReader.java

[cziegeler]

Author: cziegeler
Date: Tue Sep 30 14:00:19 2014
New Revision: 1628443

URL: http://svn.apache.org/r1628443
Log:
Rename some constants

Modified:
    
sling/trunk/tooling/support/slingstart-model/src/main/java/org/apache/sling/provisioning/model/Feature.java
    
sling/trunk/tooling/support/slingstart-model/src/main/java/org/apache/sling/provisioning/model/ModelConstants.java
    
sling/trunk/tooling/support/slingstart-model/src/main/java/org/apache/sling/provisioning/model/io/ModelReader.java

Modified: 
sling/trunk/tooling/support/slingstart-model/src/main/java/org/apache/sling/provisioning/model/Feature.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/support/slingstart-model/src/main/java/org/apache/sling/provisioning/model/Feature.java?rev=1628443&r1=1628442&r2=1628443&view=diff
==============================================================================
--- 
sling/trunk/tooling/support/slingstart-model/src/main/java/org/apache/sling/provisioning/model/Feature.java
 (original)
+++ 
sling/trunk/tooling/support/slingstart-model/src/main/java/org/apache/sling/provisioning/model/Feature.java
 Tue Sep 30 14:00:19 2014
@@ -87,6 +87,15 @@ public class Feature
     }
 
     /**
+     * Find the run mode if available
+     * @param runModes
+     * @return The feature or null.
+     */
+    public RunMode findRunMode(final String runMode) {
+        return this.findRunMode(new String[] {runMode});
+    }
+
+    /**
      * Get or create the run mode.
      * @param runModes The run modes.
      * @return The feature for the given run modes.

Modified: 
sling/trunk/tooling/support/slingstart-model/src/main/java/org/apache/sling/provisioning/model/ModelConstants.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/support/slingstart-model/src/main/java/org/apache/sling/provisioning/model/ModelConstants.java?rev=1628443&r1=1628442&r2=1628443&view=diff
==============================================================================
--- 
sling/trunk/tooling/support/slingstart-model/src/main/java/org/apache/sling/provisioning/model/ModelConstants.java
 (original)
+++ 
sling/trunk/tooling/support/slingstart-model/src/main/java/org/apache/sling/provisioning/model/ModelConstants.java
 Tue Sep 30 14:00:19 2014
@@ -16,13 +16,28 @@
  */
 package org.apache.sling.provisioning.model;
 
-
+/**
+ * Constants for the provisioning model.
+ */
 public abstract class ModelConstants {
 
-    /** Name of the configuration containing the web.xml. */
+    /** Name of Sling's launchpad feature. */
+    public static final String FEATURE_LAUNCHPAD = ":launchpad";
+
+    /** Name of the boot feature */
+    public static final String FEATURE_BOOT = ":boot";
+
+
+    /**
+     * Name of the configuration containing the web.xml. This configuration
+     * is used by the launchpad feature.
+     */
     public static final String CFG_WEB_XML = ":web.xml";
 
-    /** Name of the configuration for the bootstrap contents. */
+    /**
+     * Name of the configuration for the bootstrap contents. This
+     * configuration is used by the launchpad feature.
+     */
     public static final String CFG_BOOTSTRAP = ":bootstrap";
 
     /** Unprocessed configuration values. */
@@ -35,12 +50,6 @@ public abstract class ModelConstants {
 
     public static final String CFG_FORMAT_PROPERTIES = "properties";
 
-    /** Name of the base run mode for the Sling launchpad. */
-    public static final String RUN_MODE_BASE = ":base";
-
-    /** Name of the boot run mode. */
-    public static final String RUN_MODE_BOOT = ":boot";
-
     /** Name of the webapp run mode. */
     public static final String RUN_MODE_WEBAPP = ":webapp";
 

Modified: 
sling/trunk/tooling/support/slingstart-model/src/main/java/org/apache/sling/provisioning/model/io/ModelReader.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/support/slingstart-model/src/main/java/org/apache/sling/provisioning/model/io/ModelReader.java?rev=1628443&r1=1628442&r2=1628443&view=diff
==============================================================================
--- 
sling/trunk/tooling/support/slingstart-model/src/main/java/org/apache/sling/provisioning/model/io/ModelReader.java
 (original)
+++ 
sling/trunk/tooling/support/slingstart-model/src/main/java/org/apache/sling/provisioning/model/io/ModelReader.java
 Tue Sep 30 14:00:19 2014
@@ -195,7 +195,7 @@ public class ModelReader {
                                   if ( !parameters.isEmpty() ) {
                                       throw new IOException(exceptionPrefix + 
"Unknown global parameters in line " + this.lineNumberReader.getLineNumber() + 
": " + line);
                                   }
-                                  if ( this.feature.findRunMode(null) != null 
) {
+                                  if ( this.feature.findRunMode((String)null) 
!= null ) {
                                       throw new IOException(exceptionPrefix + 
"Duplicate global run mode in line " + this.lineNumberReader.getLineNumber() + 
": " + line);
                                   }
                                   this.runMode = 
this.feature.getOrCreateFeature(null);