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/03 15:41:23 UTC
svn commit: r382839 - in /lenya/trunk/tools/configure:
build/classes/org/apache/lenya/config/ConfigureCommandLine.class
src/java/org/apache/lenya/config/ConfigureCommandLine.java
Author: michi
Date: Fri Mar 3 06:41:22 2006
New Revision: 382839
URL: http://svn.apache.org/viewcvs?rev=382839&view=rev
Log:
subsequent parameters implemented
Modified:
lenya/trunk/tools/configure/build/classes/org/apache/lenya/config/ConfigureCommandLine.class
lenya/trunk/tools/configure/src/java/org/apache/lenya/config/ConfigureCommandLine.java
Modified: lenya/trunk/tools/configure/build/classes/org/apache/lenya/config/ConfigureCommandLine.class
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/configure/build/classes/org/apache/lenya/config/ConfigureCommandLine.class?rev=382839&r1=382838&r2=382839&view=diff
==============================================================================
Binary files - no diff available.
Modified: lenya/trunk/tools/configure/src/java/org/apache/lenya/config/ConfigureCommandLine.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/configure/src/java/org/apache/lenya/config/ConfigureCommandLine.java?rev=382839&r1=382838&r2=382839&view=diff
==============================================================================
--- lenya/trunk/tools/configure/src/java/org/apache/lenya/config/ConfigureCommandLine.java (original)
+++ lenya/trunk/tools/configure/src/java/org/apache/lenya/config/ConfigureCommandLine.java Fri Mar 3 06:41:22 2006
@@ -58,7 +58,35 @@
for (int i = 0; i < configs.size(); i++) {
Configuration config = (Configuration) configs.elementAt(i);
config.read();
+
Parameter[] params = config.getConfigurableParameters();
+ readParameters(params, config);
+
+ if (config.localConfigExists()) {
+ System.out.println("\nWARNING: Local configuration already exists!");
+ System.out.print("Do you want to overwrite (y/N)? ");
+ try {
+ String value = br.readLine();
+ if (value.equals("y")) {
+ config.writeLocal();
+ } else {
+ System.out.println("Local configuration has NOT been overwritten.");
+ }
+ } catch (Exception e) {
+ System.err.println(e.getMessage());
+ }
+ } else {
+ config.writeLocal();
+ }
+ }
+ // TODO: Suggest to build now ./build.sh (depending on OS)
+ }
+
+ /**
+ *
+ */
+ static public void readParameters(Parameter[] params, Configuration config) {
+ BufferedReader br = new BufferedReader(new InputStreamReader(System.in));
for (int k = 0; k < params.length; k++) {
try {
boolean notOK = true;
@@ -90,30 +118,18 @@
System.out.println(" Value entered : " + params[k].getLocalValue());
Parameter[] subParams = params[k].getSubsequentParameters(params[k].getLocalValue(), config);
if (subParams != null) {
- System.out.println(" Subsequent Params : " + subParams.length);
+ String sp = "";
+ for (int j = 0; j < subParams.length; j++) {
+ sp = sp + subParams[j].getName();
+ if (j != subParams.length -1) sp = sp + ", ";
+ }
+ System.out.println(" " + subParams.length + " Subsequent Params : " + sp);
+ readParameters(subParams, config);
}
} catch (Exception e) {
System.err.println(e.getMessage());
}
config.setParameter(params[k]);
}
- if (config.localConfigExists()) {
- System.out.println("\nWARNING: Local configuration already exists!");
- System.out.print("Do you want to overwrite (y/N)? ");
- try {
- String value = br.readLine();
- if (value.equals("y")) {
- config.writeLocal();
- } else {
- System.out.println("Local configuration has NOT been overwritten.");
- }
- } catch (Exception e) {
- System.err.println(e.getMessage());
- }
- } else {
- config.writeLocal();
- }
- }
- // TODO: Suggest to build now ./build.sh (depending on OS)
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org