You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by mi...@apache.org on 2006/03/02 20:15:33 UTC
svn commit: r382474 - in /lenya/trunk/tools/configure:
build/org/apache/lenya/config/ src/org/apache/lenya/config/
Author: michi
Date: Thu Mar 2 11:15:31 2006
New Revision: 382474
URL: http://svn.apache.org/viewcvs?rev=382474&view=rev
Log:
differentiate between local and default
Added:
lenya/trunk/tools/configure/build/org/apache/lenya/config/BuildPropertiesConfiguration.class (with props)
lenya/trunk/tools/configure/src/org/apache/lenya/config/BuildPropertiesConfiguration.java
Modified:
lenya/trunk/tools/configure/build/org/apache/lenya/config/Configuration.class
lenya/trunk/tools/configure/build/org/apache/lenya/config/ConfigureCommandLine.class
lenya/trunk/tools/configure/build/org/apache/lenya/config/Parameter.class
lenya/trunk/tools/configure/build/org/apache/lenya/config/PropertiesConfiguration.class
lenya/trunk/tools/configure/src/org/apache/lenya/config/Configuration.java
lenya/trunk/tools/configure/src/org/apache/lenya/config/ConfigureCommandLine.java
lenya/trunk/tools/configure/src/org/apache/lenya/config/Parameter.java
lenya/trunk/tools/configure/src/org/apache/lenya/config/PropertiesConfiguration.java
Added: lenya/trunk/tools/configure/build/org/apache/lenya/config/BuildPropertiesConfiguration.class
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/configure/build/org/apache/lenya/config/BuildPropertiesConfiguration.class?rev=382474&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lenya/trunk/tools/configure/build/org/apache/lenya/config/BuildPropertiesConfiguration.class
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: lenya/trunk/tools/configure/build/org/apache/lenya/config/Configuration.class
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/configure/build/org/apache/lenya/config/Configuration.class?rev=382474&r1=382473&r2=382474&view=diff
==============================================================================
Binary files - no diff available.
Modified: lenya/trunk/tools/configure/build/org/apache/lenya/config/ConfigureCommandLine.class
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/configure/build/org/apache/lenya/config/ConfigureCommandLine.class?rev=382474&r1=382473&r2=382474&view=diff
==============================================================================
Binary files - no diff available.
Modified: lenya/trunk/tools/configure/build/org/apache/lenya/config/Parameter.class
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/configure/build/org/apache/lenya/config/Parameter.class?rev=382474&r1=382473&r2=382474&view=diff
==============================================================================
Binary files - no diff available.
Modified: lenya/trunk/tools/configure/build/org/apache/lenya/config/PropertiesConfiguration.class
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/configure/build/org/apache/lenya/config/PropertiesConfiguration.class?rev=382474&r1=382473&r2=382474&view=diff
==============================================================================
Binary files - no diff available.
Added: lenya/trunk/tools/configure/src/org/apache/lenya/config/BuildPropertiesConfiguration.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/configure/src/org/apache/lenya/config/BuildPropertiesConfiguration.java?rev=382474&view=auto
==============================================================================
--- lenya/trunk/tools/configure/src/org/apache/lenya/config/BuildPropertiesConfiguration.java (added)
+++ lenya/trunk/tools/configure/src/org/apache/lenya/config/BuildPropertiesConfiguration.java Thu Mar 2 11:15:31 2006
@@ -0,0 +1,43 @@
+/*
+ * Copyright 1999-2004 The Apache Software Foundation
+ *
+ * Licensed 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.lenya.config;
+
+import java.io.FileInputStream;
+import java.util.Enumeration;
+import java.util.Properties;
+import java.util.Vector;
+
+/**
+ * Build Properties Configuration
+ */
+public class BuildPropertiesConfiguration extends PropertiesConfiguration {
+
+ /**
+ *
+ */
+ public String getVersionDefault() {
+ return null;
+ }
+
+ /**
+ *
+ */
+ public String getVersionLocal() {
+ return null;
+ }
+}
Modified: lenya/trunk/tools/configure/src/org/apache/lenya/config/Configuration.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/configure/src/org/apache/lenya/config/Configuration.java?rev=382474&r1=382473&r2=382474&view=diff
==============================================================================
--- lenya/trunk/tools/configure/src/org/apache/lenya/config/Configuration.java (original)
+++ lenya/trunk/tools/configure/src/org/apache/lenya/config/Configuration.java Thu Mar 2 11:15:31 2006
@@ -30,10 +30,25 @@
/**
*
*/
- public void read();
+ public void readDefault();
/**
*
*/
- public void write();
+ public void readLocal();
+
+ /**
+ *
+ */
+ public String getVersionDefault();
+
+ /**
+ *
+ */
+ public String getVersionLocal();
+
+ /**
+ *
+ */
+ public void writeLocal();
}
Modified: lenya/trunk/tools/configure/src/org/apache/lenya/config/ConfigureCommandLine.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/configure/src/org/apache/lenya/config/ConfigureCommandLine.java?rev=382474&r1=382473&r2=382474&view=diff
==============================================================================
--- lenya/trunk/tools/configure/src/org/apache/lenya/config/ConfigureCommandLine.java (original)
+++ lenya/trunk/tools/configure/src/org/apache/lenya/config/ConfigureCommandLine.java Thu Mar 2 11:15:31 2006
@@ -37,7 +37,7 @@
String rootDir = args[0];
// Define all configuration files
- FileConfiguration buildProperties = new PropertiesConfiguration();
+ FileConfiguration buildProperties = new BuildPropertiesConfiguration();
buildProperties.setFilenameDefault(rootDir + "/build.properties");
buildProperties.setFilenameLocal(rootDir + "/local.build.properties");
@@ -46,14 +46,15 @@
for (int i = 0; i < configs.size(); i++) {
Configuration config = (Configuration) configs.elementAt(i);
- config.read();
+ config.readDefault();
+ config.readLocal();
Parameter[] params = config.getParameters();
for (int k = 0; k < params.length; k++) {
System.out.println(params[k]);
// - Ask for new values
}
// - Ask if existing local config should be overwritten
- config.write();
+ config.writeLocal();
}
// Suggest to build now ./build.sh (depending on OS)
}
Modified: lenya/trunk/tools/configure/src/org/apache/lenya/config/Parameter.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/configure/src/org/apache/lenya/config/Parameter.java?rev=382474&r1=382473&r2=382474&view=diff
==============================================================================
--- lenya/trunk/tools/configure/src/org/apache/lenya/config/Parameter.java (original)
+++ lenya/trunk/tools/configure/src/org/apache/lenya/config/Parameter.java Thu Mar 2 11:15:31 2006
@@ -51,6 +51,6 @@
*
*/
public String toString() {
- return name + " " + defaultValue;
+ return name + ":::" + defaultValue + ":::" + localValue;
}
}
Modified: lenya/trunk/tools/configure/src/org/apache/lenya/config/PropertiesConfiguration.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/configure/src/org/apache/lenya/config/PropertiesConfiguration.java?rev=382474&r1=382473&r2=382474&view=diff
==============================================================================
--- lenya/trunk/tools/configure/src/org/apache/lenya/config/PropertiesConfiguration.java (original)
+++ lenya/trunk/tools/configure/src/org/apache/lenya/config/PropertiesConfiguration.java Thu Mar 2 11:15:31 2006
@@ -25,14 +25,15 @@
/**
* Properties Configuration
*/
-public class PropertiesConfiguration extends FileConfiguration {
+abstract public class PropertiesConfiguration extends FileConfiguration {
private Properties defaultProps;
+ private Properties localProps;
/**
*
*/
- public void read() {
+ public void readDefault() {
try {
defaultProps = new Properties();
defaultProps.load(new FileInputStream(getFilenameDefault()));
@@ -44,7 +45,19 @@
/**
*
*/
- public void write() {
+ public void readLocal() {
+ try {
+ localProps = new Properties();
+ localProps.load(new FileInputStream(getFilenameLocal()));
+ } catch (Exception e) {
+ System.err.println(e.getMessage());
+ }
+ }
+
+ /**
+ *
+ */
+ public void writeLocal() {
System.out.println(getFilenameLocal());
}
@@ -59,6 +72,10 @@
Parameter param = new Parameter();
param.setName(name);
param.setDefaultValue(defaultProps.getProperty(name));
+ String localValue = localProps.getProperty(name);
+ if (localValue != null) {
+ param.setLocalValue(localProps.getProperty(name));
+ }
params.addElement(param);
}
Parameter[] p = new Parameter[params.size()];
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org