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/05/06 13:48:04 UTC
svn commit: r400288 - in
/lenya/trunk/tools/configure/src/java/org/apache/lenya/config:
ConfigureCommandLine.java ConfigureGUI.java impl/ConfigureCommandLine.java
impl/ConfigureGUI.java
Author: michi
Date: Sat May 6 04:48:02 2006
New Revision: 400288
URL: http://svn.apache.org/viewcvs?rev=400288&view=rev
Log:
Configure abstractized
Added:
lenya/trunk/tools/configure/src/java/org/apache/lenya/config/impl/ConfigureGUI.java
- copied, changed from r400287, lenya/trunk/tools/configure/src/java/org/apache/lenya/config/ConfigureGUI.java
Removed:
lenya/trunk/tools/configure/src/java/org/apache/lenya/config/ConfigureGUI.java
Modified:
lenya/trunk/tools/configure/src/java/org/apache/lenya/config/ConfigureCommandLine.java
lenya/trunk/tools/configure/src/java/org/apache/lenya/config/impl/ConfigureCommandLine.java
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=400288&r1=400287&r2=400288&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 Sat May 6 04:48:02 2006
@@ -29,23 +29,7 @@
/**
* A command line tool to configure Lenya build
*/
-public class ConfigureCommandLine {
-
- /**
- * @param args Command line args
- */
- public static void main(String[] args) {
- System.out.println("\nWelcome to the command line interface to configure the building process of Apache Lenya");
-
- if (args.length != 1) {
- System.err.println("No root dir specified (e.g. /home/USERNAME/src/lenya/trunk)!");
- return;
- }
- String rootDir = args[0];
-
- Vector configs = setConfigurations(rootDir);
- changeConfigurations(configs);
- }
+abstract public class ConfigureCommandLine {
/**
*
@@ -82,31 +66,7 @@
/**
*
*/
- static public Vector setConfigurations(String rootDir) {
- // Define all configuration files
- FileConfiguration buildProperties = new BuildPropertiesConfiguration();
- buildProperties.setFilenameDefault(rootDir + "/build.properties");
- buildProperties.setFilenameLocal(rootDir + "/local.build.properties");
-
- /*
- FileConfiguration defaultPub = new PublicationConfiguration();
- defaultPub.setFilenameDefault(rootDir + "src/pubs/default/config/publication.xconf");
- defaultPub.setFilenameLocal(rootDir + "src/pubs/default/config/local.publication.xconf");
- */
-
- /*
- FileConfiguration log4j = new Log4jConfiguration();
- // src/confpatch/log4j-*
- log4j.setFilenameDefault(rootDir + "src/webapp/WEB-INF/log4j.xconf");
- log4j.setFilenameLocal(rootDir + "src/webapp/WEB-INF/local.log4j.xconf");
- */
-
- Vector configs = new Vector();
- configs.addElement(buildProperties);
- //configs.addElement(defaultPub);
-
- return configs;
- }
+ abstract public Vector setConfigurations(String rootDir);
/**
*
Modified: lenya/trunk/tools/configure/src/java/org/apache/lenya/config/impl/ConfigureCommandLine.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/configure/src/java/org/apache/lenya/config/impl/ConfigureCommandLine.java?rev=400288&r1=400287&r2=400288&view=diff
==============================================================================
--- lenya/trunk/tools/configure/src/java/org/apache/lenya/config/impl/ConfigureCommandLine.java (original)
+++ lenya/trunk/tools/configure/src/java/org/apache/lenya/config/impl/ConfigureCommandLine.java Sat May 6 04:48:02 2006
@@ -31,9 +31,26 @@
public class ConfigureCommandLine extends org.apache.lenya.config.ConfigureCommandLine {
/**
+ * @param args Command line args
+ */
+ public static void main(String[] args) {
+ System.out.println("\nWelcome to the command line interface to configure the building process of Apache Lenya 1.4-dev");
+
+ if (args.length != 1) {
+ System.err.println("No root dir specified (e.g. /home/USERNAME/src/lenya/trunk)!");
+ return;
+ }
+ String rootDir = args[0];
+
+ ConfigureCommandLine ccl = new ConfigureCommandLine();
+ Vector configs = ccl.setConfigurations(rootDir);
+ ccl.changeConfigurations(configs);
+ }
+
+ /**
*
*/
- static public Vector setConfigurations(String rootDir) {
+ public Vector setConfigurations(String rootDir) {
// Define all configuration files
FileConfiguration buildProperties = new BuildPropertiesConfiguration();
buildProperties.setFilenameDefault(rootDir + "/build.properties");
Copied: lenya/trunk/tools/configure/src/java/org/apache/lenya/config/impl/ConfigureGUI.java (from r400287, lenya/trunk/tools/configure/src/java/org/apache/lenya/config/ConfigureGUI.java)
URL: http://svn.apache.org/viewcvs/lenya/trunk/tools/configure/src/java/org/apache/lenya/config/impl/ConfigureGUI.java?p2=lenya/trunk/tools/configure/src/java/org/apache/lenya/config/impl/ConfigureGUI.java&p1=lenya/trunk/tools/configure/src/java/org/apache/lenya/config/ConfigureGUI.java&r1=400287&r2=400288&rev=400288&view=diff
==============================================================================
--- lenya/trunk/tools/configure/src/java/org/apache/lenya/config/ConfigureGUI.java (original)
+++ lenya/trunk/tools/configure/src/java/org/apache/lenya/config/impl/ConfigureGUI.java Sat May 6 04:48:02 2006
@@ -15,7 +15,7 @@
*
*/
-package org.apache.lenya.config;
+package org.apache.lenya.config.impl;
import java.awt.Component;
import java.awt.FlowLayout;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org