You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by bl...@apache.org on 2001/02/09 21:51:11 UTC
cvs commit: xml-cocoon/src/org/apache/cocoon/generation DirectoryGenerator.java
bloritsch 01/02/09 12:51:11
Modified: src/org/apache/cocoon/acting Tag: xml-cocoon2
AbstractAction.java AddEmployeeAction.java
DelEmployeeAction.java HelloAction.java
LangSelect.java UpdEmployeeAction.java
src/org/apache/cocoon/generation Tag: xml-cocoon2
DirectoryGenerator.java
Log:
Formatting and JavaDoc cleanup.
Revision Changes Path
No revision
No revision
1.1.2.3 +6 -13 xml-cocoon/src/org/apache/cocoon/acting/Attic/AbstractAction.java
Index: AbstractAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/AbstractAction.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- AbstractAction.java 2001/01/22 21:56:33 1.1.2.2
+++ AbstractAction.java 2001/02/09 20:51:10 1.1.2.3
@@ -8,23 +8,16 @@
package org.apache.cocoon.acting;
import org.apache.avalon.Configurable;
-import org.apache.avalon.Loggable;
+import org.apache.avalon.AbstractLoggable;
import org.apache.log.Logger;
/**
+ * AbstractAction gives you the infrastructure for easily deploying more
+ * Actions. In order to get at the Logger, use getLogger().
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/01/22 21:56:33 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/02/09 20:51:10 $
*/
-public abstract class AbstractAction implements Action, Configurable, Loggable {
-
- protected Logger log;
-
- public void setLogger(Logger logger) {
- if (this.log == null) {
- this.log = logger;
- }
- }
-
-}
+public abstract class AbstractAction extends AbstractLoggable
+implements Action, Configurable {}
1.1.2.8 +8 -5 xml-cocoon/src/org/apache/cocoon/acting/Attic/AddEmployeeAction.java
Index: AddEmployeeAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/AddEmployeeAction.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- AddEmployeeAction.java 2001/02/06 15:23:36 1.1.2.7
+++ AddEmployeeAction.java 2001/02/09 20:51:10 1.1.2.8
@@ -32,9 +32,12 @@
import org.apache.cocoon.Constants;
/**
+ * A simple action that Adds an employee the Employee Table used in
+ * the demonstration SQL code.
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/02/06 15:23:36 $
+ * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
+ * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/02/09 20:51:10 $
*/
public class AddEmployeeAction extends ComposerAction {
@@ -50,7 +53,7 @@
ComponentSelector selector = (ComponentSelector) this.manager.lookup(Roles.DB_CONNECTION);
this.datasource = (DataSourceComponent) selector.select(connElement.getValue());
} catch (ComponentManagerException cme) {
- log.error("Could not get the DataSourceComponent", cme);
+ getLogger().error("Could not get the DataSourceComponent", cme);
throw new ConfigurationException("Could not get the DataSource Component", cme);
}
}
@@ -103,10 +106,10 @@
try {
conn.rollback();
} catch (SQLException sse) {
- log.error("Caught an exception trying to roll back transaction", sse);
+ getLogger().error("Caught an exception trying to roll back transaction", sse);
}
- log.error("There was a SQL error", se);
+ getLogger().error("There was a SQL error", se);
} finally {
try {
if (ps != null) ps.close();
@@ -114,7 +117,7 @@
if (rs.getStatement() != null) rs.getStatement().close();
conn.close();
} catch (Exception e) {
- log.error("We should never be in this clause", e);
+ getLogger().error("We should never be in this clause", e);
}
}
1.1.2.6 +10 -6 xml-cocoon/src/org/apache/cocoon/acting/Attic/DelEmployeeAction.java
Index: DelEmployeeAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/DelEmployeeAction.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- DelEmployeeAction.java 2001/02/06 15:23:37 1.1.2.5
+++ DelEmployeeAction.java 2001/02/09 20:51:10 1.1.2.6
@@ -30,10 +30,14 @@
import org.xml.sax.EntityResolver;
import org.apache.cocoon.Constants;
+
/**
+ * A simple action that deletes a record in the Employee Table used
+ * in the demonstration SQL code.
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/02/06 15:23:37 $
+ * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/02/09 20:51:10 $
*/
public class DelEmployeeAction extends ComposerAction {
@@ -49,7 +53,7 @@
ComponentSelector selector = (ComponentSelector) this.manager.lookup(Roles.DB_CONNECTION);
this.datasource = (DataSourceComponent) selector.select(connElement.getValue());
} catch (ComponentManagerException cme) {
- log.error("Could not get the DataSourceComponent", cme);
+ getLogger().error("Could not get the DataSourceComponent", cme);
throw new ConfigurationException("Could not get the DataSource Component", cme);
}
}
@@ -61,7 +65,7 @@
public Map act (EntityResolver resolver, Map objectModel, String src, Parameters par) throws Exception {
HttpServletRequest req = (HttpServletRequest) objectModel.get(Constants.REQUEST_OBJECT);
String id = req.getParameter("employee");
- log.debug("deleting employee " + id);
+ getLogger().debug("deleting employee " + id);
String name = req.getParameter("name");
if (deleteEmployee(id) == true) {
@@ -91,16 +95,16 @@
try {
conn.rollback();
} catch (SQLException sse) {
- log.error("Caught an exception trying to roll back transaction", sse);
+ getLogger().error("Caught an exception trying to roll back transaction", sse);
}
- log.error("There was a SQL error", se);
+ getLogger().error("There was a SQL error", se);
} finally {
try {
if (ps != null) ps.close();
conn.close();
} catch (Exception e) {
- log.error("We should never be in this clause", e);
+ getLogger().error("We should never be in this clause", e);
}
}
1.1.2.8 +11 -22 xml-cocoon/src/org/apache/cocoon/acting/Attic/HelloAction.java
Index: HelloAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/HelloAction.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- HelloAction.java 2000/12/15 20:35:09 1.1.2.7
+++ HelloAction.java 2001/02/09 20:51:10 1.1.2.8
@@ -22,10 +22,13 @@
import org.xml.sax.EntityResolver;
import org.apache.cocoon.Constants;
+
/**
+ * A simple Action that tracks if a <code>Session</code> object
+ * has been created or not.
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/12/15 20:35:09 $
+ * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/02/09 20:51:10 $
*/
public class HelloAction extends ComposerAction {
@@ -43,32 +46,18 @@
HttpServletRequest req = (HttpServletRequest) objectModel.get(Constants.REQUEST_OBJECT);
if (req != null) {
HttpSession session = req.getSession (false);
- ServletContext context = (ServletContext)objectModel.get(Constants.CONTEXT_OBJECT);
- if (context != null) {
- if (session != null) {
- if (session.isNew()) {
- super.log.debug("Session is new");
- context.log("Session is new");
- } else {
- super.log.debug("Session is new");
- context.log("Session is old");
- }
+
+ if (session != null) {
+ if (session.isNew()) {
+ getLogger().debug("Session is new");
} else {
- super.log.debug("A session object was not created");
- context.log("A session object was not created");
+ getLogger().debug("Session is old");
}
} else {
- if (session != null) {
- if (session.isNew()) {
- super.log.debug("Session is new");
- } else {
- super.log.debug("Session is old");
- }
- } else {
- super.log.debug("A session object was not created");
- }
+ getLogger().debug("A session object was not created");
}
}
+
return null;
}
}
1.1.2.3 +43 -47 xml-cocoon/src/org/apache/cocoon/acting/Attic/LangSelect.java
Index: LangSelect.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/LangSelect.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- LangSelect.java 2000/12/15 20:35:09 1.1.2.2
+++ LangSelect.java 2001/02/09 20:51:11 1.1.2.3
@@ -9,6 +9,24 @@
*/
package org.apache.cocoon.acting;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.apache.cocoon.acting.Action;
+
+import org.apache.avalon.Parameters;
+
+import org.xml.sax.EntityResolver;
+
/**
* LangSelect Action returns two character language code to sitemap.
*
@@ -31,33 +49,11 @@
* Creation date: (3.11.2000 14:32:19)
* @author: <a href="mailto:lassi.immonen@valkeus.com">Lassi Immonen</a>
*/
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import org.apache.cocoon.acting.Action;
-
-import org.apache.avalon.Parameters;
-
-import org.xml.sax.EntityResolver;
-
+public class LangSelect extends java.lang.Object implements Action {
+ private final static String DEFAULT_LANG = "en";
-public class LangSelect extends java.lang.Object implements Action {
- private final static String default_lang = "en";
-
-
-
/**
* Selects language if it is not set already in objectModel
* Puts lang parameter to session and to objectModel
@@ -65,33 +61,33 @@
*/
public Map act(EntityResolver resolver, Map objectModel, String source,
Parameters par) throws Exception {
-
+
String lang;
-
+
if (objectModel.containsKey("lang")) {
lang = (String)(objectModel.get("lang"));
} else {
lang = getLang(objectModel, par);
objectModel.put("lang", lang);
}
-
- HttpServletRequest req =
+
+ HttpServletRequest req =
(HttpServletRequest)(objectModel.get("request"));
-
+
HttpSession session = req.getSession();
if (session != null) {
if (session.getAttribute("lang") == null) {
session.setAttribute("lang", lang);
}
}
-
+
Map m = new HashMap(1);
m.put("lang", lang);
return m;
}
-
-
-
+
+
+
/**
* Returns two character language code by checking environment in following order
* 1. Http request has parameter lang
@@ -104,10 +100,10 @@
* @param par org.apache.avalon.Parameters
*/
public static String getLang(Map objectModel, Parameters par) {
-
+
List langs_avail = new ArrayList();
List langs_user = new ArrayList();
-
+
Iterator params = par.getParameterNames();
while (params.hasNext()) {
String paramname = (String)(params.next());
@@ -115,15 +111,15 @@
langs_avail.add(par.getParameter(paramname, null));
}
}
- String def_lang = par.getParameter("default_lang", default_lang);
-
- HttpServletRequest req =
+ String def_lang = par.getParameter("default_lang", LangSelect.DEFAULT_LANG);
+
+ HttpServletRequest req =
(HttpServletRequest)(objectModel.get("request"));
-
+
String lang = null;
-
+
lang = req.getParameter("lang");
-
+
if (lang == null) {
HttpSession session = req.getSession(false);
if (session != null) {
@@ -132,9 +128,9 @@
lang = session_lang.toString();
}
}
-
+
}
-
+
if (lang == null) {
Cookie[] cookies = req.getCookies();
if (cookies != null) {
@@ -146,18 +142,18 @@
}
}
}
-
+
if (lang == null) {
-
+
Enumeration locales = req.getLocales();
while (locales.hasMoreElements()) {
Locale locale = (Locale)(locales.nextElement());
langs_user.add(locale.getLanguage());
}
-
+
boolean match = false;
int i = 0;
-
+
for ( ; i < langs_user.size() && !match; i++) {
for ( int j = 0; j < langs_avail.size(); j++) {
if (((String)(langs_user.get(i))).equals(
1.1.2.7 +9 -5 xml-cocoon/src/org/apache/cocoon/acting/Attic/UpdEmployeeAction.java
Index: UpdEmployeeAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/UpdEmployeeAction.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- UpdEmployeeAction.java 2001/02/06 15:23:37 1.1.2.6
+++ UpdEmployeeAction.java 2001/02/09 20:51:11 1.1.2.7
@@ -30,10 +30,14 @@
import org.xml.sax.EntityResolver;
import org.apache.cocoon.Constants;
+
/**
+ * A simple action that updates the Employee Table used in the
+ * demonstration SQL code.
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/02/06 15:23:37 $
+ * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/02/09 20:51:11 $
*/
public class UpdEmployeeAction extends ComposerAction {
@@ -49,7 +53,7 @@
ComponentSelector selector = (ComponentSelector) this.manager.lookup(Roles.DB_CONNECTION);
this.datasource = (DataSourceComponent) selector.select(connElement.getValue());
} catch (ComponentManagerException cme) {
- log.error("Could not get the DataSourceComponent", cme);
+ getLogger().error("Could not get the DataSourceComponent", cme);
throw new ConfigurationException("Could not get the DataSource Component", cme);
}
}
@@ -93,16 +97,16 @@
try {
conn.rollback();
} catch (SQLException sse) {
- log.error("Caught an exception trying to roll back transaction", sse);
+ getLogger().error("Caught an exception trying to roll back transaction", sse);
}
- log.error("There was a SQL error", se);
+ getLogger().error("There was a SQL error", se);
} finally {
try {
if (ps != null) ps.close();
conn.close();
} catch (Exception e) {
- log.error("We should never be in this clause", e);
+ getLogger().error("We should never be in this clause", e);
}
}
No revision
No revision
1.1.2.14 +2 -2 xml-cocoon/src/org/apache/cocoon/generation/Attic/DirectoryGenerator.java
Index: DirectoryGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/DirectoryGenerator.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- DirectoryGenerator.java 2001/02/05 16:23:08 1.1.2.13
+++ DirectoryGenerator.java 2001/02/09 20:51:11 1.1.2.14
@@ -59,7 +59,7 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/02/05 16:23:08 $ */
+ * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/02/09 20:51:11 $ */
public class DirectoryGenerator extends ComposerGenerator implements Poolable {
@@ -122,7 +122,7 @@
*
* @throws SAXException
* if an error occurs while outputting the document
- * @throws IOException
+ * @throws ProcessingException
* if the requsted URI isn't a directory on the local
* filesystem
*/