Author: cziegeler
Date: Tue Sep 30 14:27:11 2014
New Revision: 1628455
URL: http://svn.apache.org/r1628455
Log:
Cleanup methods and 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=1628455&r1=1628454&r2=1628455&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:27:11 2014
@@ -58,6 +58,13 @@ public class Feature
}
/**
+ * Special feature?
+ */
+ public boolean isSpecial() {
+ return this.name.startsWith(":");
+ }
+
+ /**
* Get all variables
* @return The set of variables
*/
@@ -74,7 +81,7 @@ public class Feature
* @param runModes
* @return The feature or null.
*/
- public RunMode findRunMode(final String[] runModes) {
+ public RunMode getRunMode(final String[] runModes) {
final String[] sortedRunModes =
RunMode.getSortedRunModesArray(runModes);
RunMode result = null;
for(final RunMode current : this.runModes) {
@@ -87,21 +94,12 @@ 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.
*/
public RunMode getOrCreateFeature(final String[] runModes) {
- RunMode result = findRunMode(runModes);
+ RunMode result = getRunMode(runModes);
if ( result == null ) {
result = new RunMode(runModes);
this.runModes.add(result);
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=1628455&r1=1628454&r2=1628455&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:27:11 2014
@@ -32,13 +32,13 @@ public abstract class ModelConstants {
* 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";
+ public static final String CFG_LAUNCHPAD_WEB_XML = ":web.xml";
/**
* Name of the configuration for the bootstrap contents. This
* configuration is used by the launchpad feature.
*/
- public static final String CFG_BOOTSTRAP = ":bootstrap";
+ public static final String CFG_LAUNCHPAD_BOOTSTRAP = ":bootstrap";
/** Unprocessed configuration values. */
public static final String CFG_UNPROCESSED = ":rawconfig";
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=1628455&r1=1628454&r2=1628455&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:27:11 2014
@@ -184,7 +184,7 @@ public class ModelReader {
throw new IOException(exceptionPrefix
+ "Unknown run mode parameters in line " +
this.lineNumberReader.getLineNumber() + ": " + line);
}
final String[] rm = names.split(",");
- if ( this.feature.findRunMode(rm) != null
) {
+ if ( this.feature.getRunMode(rm) != null )
{
throw new IOException(exceptionPrefix
+ "Duplicate run mode in line " + this.lineNumberReader.getLineNumber() + ": "
+ line);
}
this.runMode =
this.feature.getOrCreateFeature(rm);
@@ -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((String)null)
!= null ) {
+ if ( this.feature.getRunMode(null) != null )
{
throw new IOException(exceptionPrefix +
"Duplicate global run mode in line " + this.lineNumberReader.getLineNumber() +
": " + line);
}
this.runMode =
this.feature.getOrCreateFeature(null);
