cvs commit: cocoon-2.1/src/java/org/apache/cocoon/bean CocoonBean.java

2003-06-24 Thread cziegeler
cziegeler2003/06/24 09:44:35

  Modified:src/java/org/apache/cocoon Main.java Cocoon.java
   src/java/org/apache/cocoon/bean CocoonBean.java
  Log:
  Using ContainerUtil at some places
  Formatting code
  Removing unneeded code
  
  Revision  ChangesPath
  1.6   +1 -2  cocoon-2.1/src/java/org/apache/cocoon/Main.java
  
  Index: Main.java
  ===
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/Main.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Main.java 11 Jun 2003 02:59:36 -  1.5
  +++ Main.java 24 Jun 2003 16:44:33 -  1.6
  @@ -360,7 +360,6 @@
   System.out.println(getProlog());
   
   cocoon.initialize();
  -cocoon.warmup();
   cocoon.process();
   cocoon.dispose();
   
  
  
  
  1.9   +22 -48cocoon-2.1/src/java/org/apache/cocoon/Cocoon.java
  
  Index: Cocoon.java
  ===
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/Cocoon.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Cocoon.java   4 Jun 2003 09:25:53 -   1.8
  +++ Cocoon.java   24 Jun 2003 16:44:35 -  1.9
  @@ -267,8 +267,8 @@
   } else {
   this.componentManager = new 
CocoonComponentManager((ClassLoader)this.context.get(Constants.CONTEXT_CLASS_LOADER));
   }
  -this.componentManager.enableLogging(getLogger().getChildLogger("manager"));
  -this.componentManager.contextualize(this.context);
  +ContainerUtil.enableLogging(this.componentManager, 
getLogger().getChildLogger("manager"));
  +ContainerUtil.contextualize(this.componentManager, this.context);
   this.componentManager.setInstrumentManager(this.instrumentManager);
   
   if (getLogger().isDebugEnabled()) {
  @@ -296,10 +296,13 @@
   }
   if (getLogger().isDebugEnabled()) {
   getLogger().debug("Using parser: " + parser);
  +getLogger().debug("Classpath = " + classpath);
  +getLogger().debug("Work directory = " + workDir.getCanonicalPath());
   }
  +
   ExcaliburComponentManager startupManager = new 
ExcaliburComponentManager((ClassLoader)this.context.get(Constants.CONTEXT_CLASS_LOADER));
  -startupManager.enableLogging(getLogger().getChildLogger("startup"));
  -startupManager.contextualize(this.context);
  +ContainerUtil.enableLogging(startupManager, 
getLogger().getChildLogger("startup"));
  +ContainerUtil.contextualize(startupManager, this.context);
   startupManager.setLogKitManager(this.logKitManager);
   
   try {
  @@ -308,17 +311,14 @@
   throw new ConfigurationException("Could not load parser " + parser, e);
   }
   
  -if (getLogger().isDebugEnabled()) {
  -getLogger().debug("Classpath = " + classpath);
  -getLogger().debug("Work directory = " + workDir.getCanonicalPath());
  -}
  -startupManager.initialize();
  +ContainerUtil.initialize(startupManager);
   
   this.configure(startupManager);
  -startupManager.dispose();
  +
  +ContainerUtil.dispose(startupManager);
   startupManager = null;
   
  -this.componentManager.initialize();
  +ContainerUtil.initialize(this.componentManager);
   
   // Get the Processor and keep it if it's ThreadSafe
   Processor processor = 
(Processor)this.componentManager.lookup(Processor.ROLE);
  @@ -358,11 +358,10 @@
* Configure this Cocoon instance.
*
* @param startupManager an ExcaliburComponentManager value
  - * @return a Configuration value
* @exception ConfigurationException if an error occurs
* @exception ContextException if an error occurs
*/
  -public Configuration configure(ExcaliburComponentManager startupManager) throws 
ConfigurationException, ContextException {
  +public void configure(ExcaliburComponentManager startupManager) throws 
ConfigurationException, ContextException {
   SAXParser p = null;
   Configuration roleConfig = null;
   
  @@ -382,8 +381,8 @@
   }
   
   DefaultRoleManager drm = new DefaultRoleManager();
  -drm.enableLogging(getLogger().getChildLogger("roles"));
  -drm.configure(roleConfig);
  +ContainerUtil.enableLogging(drm, getLogger().getChildLogger("roles"));
  +ContainerUtil.configure(drm, roleConfig);
   roleConfig = null;
   
   try {
  @@ -434,8 +433,8 @@
   }
   
   DefaultRoleManager urm = new DefaultRoleManager(drm);
  -
urm.enableLogging(getLogger().getChildLogger("roles").getChildLogger("user"));
  -urm.configure(roleConfig);
  +Conta

cvs commit: cocoon-2.1/src/java/org/apache/cocoon/bean CocoonBean.java

2003-06-20 Thread jefft
jefft   2003/06/20 23:41:46

  Modified:src/java/org/apache/cocoon/bean CocoonBean.java
  Log:
  Remove seemingly pointless error message
  
  Revision  ChangesPath
  1.11  +5 -4  cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonBean.java
  
  Index: CocoonBean.java
  ===
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonBean.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- CocoonBean.java   11 Jun 2003 02:59:36 -  1.10
  +++ CocoonBean.java   21 Jun 2003 06:41:45 -  1.11
  @@ -229,9 +229,10 @@
   cocoon.setLogKitManager(logKitManager);
   cocoon.initialize();
   
  -if (brokenLinkReportFile!=null && !(new 
File(brokenLinkReportFile).exists())) {
  -  log.error("Broken Link Report File does not exist: " + 
brokenLinkReportFile);
  -}
  +// I don't understand why not having an error file (on startup) is an 
error (JT)
  +//if (brokenLinkReportFile!=null && !(new 
File(brokenLinkReportFile).exists())) {
  +//  log.error("Broken Link Report File does not exist: " + 
brokenLinkReportFile);
  +//}
   
   if (brokenLinkReportFile!=null) {
   brokenLinks= new ArrayList();
  
  
  


cvs commit: cocoon-2.1/src/java/org/apache/cocoon/bean CocoonBean.java

2003-06-10 Thread vgritsenko
vgritsenko2003/06/10 19:59:36

  Modified:src/java/org/apache/cocoon Main.java
   src/java/org/apache/cocoon/bean CocoonBean.java
  Log:
  Some rework of the CocoonBean:
   * remove setDest() method
   * Add toString and hashcode to the Target class
   * destDir in Main can be specified either via argument or in the conf file
  
  Revision  ChangesPath
  1.5   +80 -70cocoon-2.1/src/java/org/apache/cocoon/Main.java
  
  Index: Main.java
  ===
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/Main.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Main.java 4 Jun 2003 19:29:07 -   1.4
  +++ Main.java 11 Jun 2003 02:59:36 -  1.5
  @@ -55,25 +55,21 @@
   import java.util.List;
   import java.util.ArrayList;
   import java.util.Arrays;
  -import java.util.Iterator;
  +import javax.xml.parsers.DocumentBuilderFactory;
  +import javax.xml.parsers.DocumentBuilder;
   
   import org.w3c.dom.Document;
   import org.w3c.dom.Node;
   import org.w3c.dom.NodeList;
   import org.w3c.dom.NamedNodeMap;
   
  -import javax.xml.parsers.DocumentBuilderFactory;
  -import javax.xml.parsers.DocumentBuilder;
  -
   import org.apache.commons.cli.Options;
   import org.apache.commons.cli.Option;
   import org.apache.commons.cli.CommandLine;
  -import org.apache.commons.cli.CommandLineParser;
   import org.apache.commons.cli.PosixParser;
   import org.apache.commons.cli.HelpFormatter;
   
   import org.apache.cocoon.Constants;
  -
   import org.apache.cocoon.bean.CocoonBean;
   
   /**
  @@ -290,21 +286,24 @@
   
   long startTimeMillis = System.currentTimeMillis();
   
  -CocoonBean cocoon = new CocoonBean();
  -String destDir = null;
  -
   Main.setOptions();
  -CommandLineParser parser = new PosixParser();
  -CommandLine line = parser.parse( options, args );
  +CommandLine line = new PosixParser().parse( options, args );
  +CocoonBean cocoon = new CocoonBean();
   
   if (line.hasOption(HELP_OPT)) {
printUsage();
  -}
  -if (line.hasOption(VERSION_OPT)) {
  +} else if (line.hasOption(VERSION_OPT)) {
printVersion();
   }
  +
  +String destDir = null;
  +if (line.hasOption(DEST_DIR_OPT)) {
  +destDir = line.getOptionValue(DEST_DIR_OPT);
  +}
  +
   if (line.hasOption(XCONF_OPT)) {
  -Main.processXConf(cocoon, line.getOptionValue(XCONF_OPT));
  +// destDir from command line overrides one in xconf file
  +destDir = Main.processXConf(cocoon, line.getOptionValue(XCONF_OPT), 
destDir);
   }
   if (line.hasOption(VERBOSE_OPT)) {
   cocoon.setVerbose(true);
  @@ -312,9 +311,7 @@
   if (line.hasOption(PRECOMPILE_ONLY_OPT)) {
   cocoon.setPrecompileOnly(true);
   }
  -if (line.hasOption(DEST_DIR_OPT)) {
  -destDir = line.getOptionValue(DEST_DIR_OPT);
  -}
  +
   if (line.hasOption(WORK_DIR_OPT)) {
   cocoon.setWorkDir(line.getOptionValue(WORK_DIR_OPT));
   }
  @@ -346,10 +343,10 @@
   
cocoon.setBrokenLinkReportFile(line.getOptionValue(BROKEN_LINK_FILE_OPT));
   }
   if (line.hasOption(URI_FILE_OPT)) {
  -cocoon.addTargets(processURIFile(line.getOptionValue(URI_FILE_OPT)));
  +cocoon.addTargets(processURIFile(line.getOptionValue(URI_FILE_OPT)), 
destDir);
   }
   if (line.hasOption(FOLLOW_LINKS_OPT)) {
  -cocoon.setFollowLinks(yesno(line.getOptionValue(FOLLOW_LINKS_OPT)));
  +cocoon.setFollowLinks(yesno(line.getOptionValue(FOLLOW_LINKS_OPT)));
   }
   if (line.hasOption(CONFIRM_EXTENSIONS_OPT)) {
   
cocoon.setConfirmExtensions(yesno(line.getOptionValue(CONFIRM_EXTENSIONS_OPT, "yes")));
  @@ -357,9 +354,8 @@
   if (line.hasOption(LOAD_CLASS_OPT)){
   
cocoon.addLoadedClasses(Arrays.asList(line.getOptionValues(LOAD_CLASS_OPT)));
   }
  -for (Iterator i = line.getArgList().iterator(); i.hasNext();) {
  -cocoon.addTarget((String)i.next(), destDir);
  -}
  +
  +cocoon.addTargets(line.getArgList(), destDir);
   
   System.out.println(getProlog());
   
  @@ -413,15 +409,13 @@
* @param cocoon a CocoonBean that will be configured by the xconf 
file
* @param filename a String value
*/
  -private static void processXConf(CocoonBean cocoon, String filename) {
  +private static String processXConf(CocoonBean cocoon, String filename, String 
destDir) {
   
   try {
   final DocumentBuilder builder = 
DocumentBuilderFactory.newInstance().newDocumentBuilder();
  -
   final Document conf = builder.parse(new 
File(filename).to

cvs commit: cocoon-2.1/src/java/org/apache/cocoon/bean CocoonBean.java

2003-06-05 Thread upayavira
upayavira2003/06/04 07:19:10

  Modified:src/java/org/apache/cocoon Constants.java
   src/java/org/apache/cocoon/bean CocoonBean.java
  Log:
  Moved all comments back from CocoonBean to Contants. Oh well.
  
  Revision  ChangesPath
  1.7   +21 -1 cocoon-2.1/src/java/org/apache/cocoon/Constants.java
  
  Index: Constants.java
  ===
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/Constants.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Constants.java4 Jun 2003 13:48:50 -   1.6
  +++ Constants.java4 Jun 2003 14:19:08 -   1.7
  @@ -276,6 +276,26 @@
*/
   public static final String INDEX_URI = "index";
   
  +/**
  + * The directory to use as context root.
  + */
  +public static final String DEFAULT_CONTEXT_DIR = "./webapp";
  +
  +/**
  + * The diretory to use to use for the generated output.
  + */
  +public static final String DEFAULT_DEST_DIR = "./site";
  +
  +/**
  + * The diretory to use for generated files.
  + */
  +public static final String DEFAULT_WORK_DIR = "./work";
  +
  +/**
  + * How a default configuration file is named.
  + */
  +public static final String DEFAULT_CONF_FILE = "cocoon.xconf";
  +
   /** The namespace URI for the Error/Exception XML */
   public static final String ERROR_NAMESPACE_URI = 
"http://apache.org/cocoon/error/"; + CONF_VERSION;
   
  
  
  
  1.8   +7 -27 cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonBean.java
  
  Index: CocoonBean.java
  ===
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonBean.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- CocoonBean.java   4 Jun 2003 13:48:50 -   1.7
  +++ CocoonBean.java   4 Jun 2003 14:19:09 -   1.8
  @@ -113,28 +113,8 @@
   protected static final String DEFAULT_USER_AGENT = Constants.COMPLETE_NAME;
   protected static final String DEFAULT_ACCEPT = "text/html, */*";
   
  -/**
  - * The directory to use as context root.
  - */
  -public static final String DEFAULT_CONTEXT_DIR = "./webapp";
  -
  -/**
  - * The diretory to use to use for the generated output.
  - */
  -public static final String DEFAULT_DEST_DIR = "./site";
  -
  -/**
  - * The diretory to use for generated files.
  - */
  -public static final String DEFAULT_WORK_DIR = "./work";
  -
  -/**
  - * How a default configuration file is named.
  - */
  -public static final String DEFAULT_CONF_FILE = "cocoon.xconf";
  -
   // User Supplied Parameters
  -private String contextDir = CocoonBean.DEFAULT_CONTEXT_DIR;
  +private String contextDir = Constants.DEFAULT_CONTEXT_DIR;
   private String configFile = null;
   
   private String brokenLinkReportFile = null;
  @@ -142,7 +122,7 @@
   private boolean brokenLinkGenerate = false;
   private String brokenLinkExtension = "";
   
  -private String workDir = CocoonBean.DEFAULT_WORK_DIR;
  +private String workDir = Constants.DEFAULT_WORK_DIR;
   private String logKit = null;
   private String logger = null;
   private String userAgent = DEFAULT_USER_AGENT;
  @@ -282,15 +262,15 @@
   private static File getConfigurationFile(File dir, String configFile) throws 
IOException {
   File conf;
   if (configFile == null) {
  -conf = tryConfigurationFile(dir + File.separator + 
CocoonBean.DEFAULT_CONF_FILE);
  +conf = tryConfigurationFile(dir + File.separator + 
Constants.DEFAULT_CONF_FILE);
   if (conf == null) {
  -conf = tryConfigurationFile(dir + File.separator + "WEB-INF" + 
File.separator + CocoonBean.DEFAULT_CONF_FILE);
  +conf = tryConfigurationFile(dir + File.separator + "WEB-INF" + 
File.separator + Constants.DEFAULT_CONF_FILE);
   }
   if (conf == null) {
  -conf = tryConfigurationFile(System.getProperty("user.dir") + 
File.separator + CocoonBean.DEFAULT_CONF_FILE);
  +conf = tryConfigurationFile(System.getProperty("user.dir") + 
File.separator + Constants.DEFAULT_CONF_FILE);
   }
   if (conf == null) {
  -conf = tryConfigurationFile("/usr/local/etc/" + 
CocoonBean.DEFAULT_CONF_FILE);
  +conf = tryConfigurationFile("/usr/local/etc/" + 
Constants.DEFAULT_CONF_FILE);
   }
   } else {
   conf = new File(configFile);
  
  
  


cvs commit: cocoon-2.1/src/java/org/apache/cocoon/bean CocoonBean.java

2003-06-04 Thread upayavira
upayavira2003/06/04 06:48:50

  Modified:src/java/org/apache/cocoon Constants.java
   src/java/org/apache/cocoon/bean CocoonBean.java
  Log:
  Returning INDEX_URI to Constants.java (from CocoonBean.java)
  
  Revision  ChangesPath
  1.6   +11 -5 cocoon-2.1/src/java/org/apache/cocoon/Constants.java
  
  Index: Constants.java
  ===
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/Constants.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Constants.java4 Jun 2003 09:25:53 -   1.5
  +++ Constants.java4 Jun 2003 13:48:50 -   1.6
  @@ -65,9 +65,9 @@
   
   /** Our properties are now here: */
   private static final String PROPS_FILE = "org/apache/cocoon/cocoon.properties";
  -
  +
   static final Properties properties;
  -
  +
   /**
* Load the cocoon properties
*/
  @@ -82,9 +82,9 @@
   } catch (IOException ioe) {
   throw new RuntimeException("Cocoon cannot load required properties from 
" + PROPS_FILE);
   }
  -
  +
   }
  -
  +
   /** The name of this project. */
   public static final String NAME = properties.getProperty("name");
   
  @@ -269,6 +269,12 @@
* The name of a NotifyingObject in the so called objectModel 
Map.
*/
   public static final String NOTIFYING_OBJECT = "notifying-object";
  +
  +/**
  + * The default URI to be used when a URI requested refers to
  + * a directory, e.g. http://localhost:8080/site/
  + */
  +public static final String INDEX_URI = "index";
   
   /** The namespace URI for the Error/Exception XML */
   public static final String ERROR_NAMESPACE_URI = 
"http://apache.org/cocoon/error/"; + CONF_VERSION;
  
  
  
  1.7   +9 -15 cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonBean.java
  
  Index: CocoonBean.java
  ===
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonBean.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- CocoonBean.java   4 Jun 2003 09:25:53 -   1.6
  +++ CocoonBean.java   4 Jun 2003 13:48:50 -   1.7
  @@ -105,7 +105,7 @@
* @author mailto:[EMAIL PROTECTED]">Stefano Mazzocchi
* @author mailto:[EMAIL PROTECTED]">Nicola Ken Barozzi
* @author mailto:[EMAIL PROTECTED]">Vadim Gritsenko
  - * @author mailto:[EMAIL PROTECTED]">Upayavira 
  + * @author mailto:[EMAIL PROTECTED]">Upayavira
* @version CVS $Id$
*/
   public class CocoonBean {
  @@ -133,12 +133,6 @@
*/
   public static final String DEFAULT_CONF_FILE = "cocoon.xconf";
   
  -/**
  - * The default URI to be used when a URI requested refers to
  - * a directory, e.g. http://localhost:8080/site/
  - */
  -public static final String INDEX_URI = "index";
  -
   // User Supplied Parameters
   private String contextDir = CocoonBean.DEFAULT_CONTEXT_DIR;
   private String configFile = null;
  @@ -153,7 +147,7 @@
   private String logger = null;
   private String userAgent = DEFAULT_USER_AGENT;
   private String accept = DEFAULT_ACCEPT;
  -private String defaultFilename = CocoonBean.INDEX_URI;
  +private String defaultFilename = Constants.INDEX_URI;
   private boolean followLinks = true;
   private boolean precompileOnly = false;
   private boolean confirmExtension = true;
  @@ -497,11 +491,11 @@
   public void addTarget(String type, String root, String sourceURI, String 
destURI){
   targets.add(new Target(type, root, sourceURI, destURI));
   }
  -  
  +
   public void addTarget(String type, String sourceURI, String destURI){
   targets.add(new Target(type, sourceURI, destURI));
   }
  -  
  +
   public void addTarget(String sourceURI, String destURI){
   targets.add(new Target(sourceURI, destURI));
   }
  @@ -735,7 +729,7 @@
*   
* 
* @param target a Target target to process
  - * @return a Collection containing all links found, as 
  + * @return a Collection containing all links found, as
* Target objects.
* @exception Exception if an error occurs
*/
  @@ -1210,7 +1204,7 @@
   private String root;
   private String sourceURI;
   private String destURI;
  -
  +
   public Target(String type, String root, String sourceURI, String destURI){
   this.type = type;
   this.root = root;
  @@ -1233,7 +1227,7 @@
   newURI = newURI.substring(root.length());
   return new Target(this.type, this.root, newURI, this.destURI);
   }
  -
  +
   public String getFinalURI(String actualSourceURI) throws 
ProcessingException {
   if (!actualSourceURI.startsWith(root)) {