You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2004/09/16 16:19:10 UTC
svn commit: rev 46179 - in incubator/lenya/trunk/src/java/org/apache/lenya/cms: ac/cocoon cocoon/generation
Author: andreas
Date: Thu Sep 16 07:19:10 2004
New Revision: 46179
Modified:
incubator/lenya/trunk/src/java/org/apache/lenya/cms/ac/cocoon/PolicyHelper.java
incubator/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/generation/ProxyGenerator.java
Log:
get rid of log4j
Modified: incubator/lenya/trunk/src/java/org/apache/lenya/cms/ac/cocoon/PolicyHelper.java
==============================================================================
--- incubator/lenya/trunk/src/java/org/apache/lenya/cms/ac/cocoon/PolicyHelper.java (original)
+++ incubator/lenya/trunk/src/java/org/apache/lenya/cms/ac/cocoon/PolicyHelper.java Thu Sep 16 07:19:10 2004
@@ -26,6 +26,7 @@
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.ComponentSelector;
+import org.apache.avalon.framework.logger.Logger;
import org.apache.cocoon.ProcessingException;
import org.apache.lenya.ac.AccessControlException;
import org.apache.lenya.ac.AccessControllerResolver;
@@ -52,8 +53,10 @@
/**
* Ctor.
+ * @param logger The logger.
*/
- public PolicyHelper() {
+ public PolicyHelper(Logger logger) {
+ this.logger = logger;
}
private DefaultAccessController accessController;
@@ -62,6 +65,15 @@
private InheritingPolicyManager policyManager;
private ComponentManager manager;
private String url;
+ private Logger logger;
+
+ /**
+ * Returns the logger.
+ * @return A logger.
+ */
+ protected Logger getLogger() {
+ return logger;
+ }
/**
* Initializes this helper.
@@ -329,6 +341,8 @@
User[] userArray = userManager.getUsers();
for (int i = 0; i < userArray.length; i++) {
Identity identity = new Identity();
+ identity.enableLogging(getLogger());
+ identity.initialize();
identity.addIdentifiable(userArray[i]);
Role[] roles = policy.getRoles(identity);
for (int roleIndex = 0; roleIndex < roles.length; roleIndex++) {
Modified: incubator/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/generation/ProxyGenerator.java
==============================================================================
--- incubator/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/generation/ProxyGenerator.java (original)
+++ incubator/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/generation/ProxyGenerator.java Thu Sep 16 07:19:10 2004
@@ -15,7 +15,7 @@
*
*/
-/* $Id: ProxyGenerator.java,v 1.23 2004/06/28 12:20:56 andreas Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.cocoon.generation;
@@ -39,14 +39,16 @@
import org.apache.commons.httpclient.HttpState;
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.excalibur.xml.sax.SAXParser;
-import org.apache.log4j.Category;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
+/**
+ * Proxy generator.
+ *
+ * @version $Id:$
+ */
public class ProxyGenerator extends org.apache.cocoon.generation.ServletGenerator implements
Parameterizable {
- private static Category log = Category.getInstance(ProxyGenerator.class);
// The URI of the namespace of this generator
private String URI = "http://apache.org/cocoon/lenya/proxygenerator/1.0";
@@ -64,7 +66,7 @@
public void generate() throws SAXException {
Request request = (Request) objectModel.get(ObjectModelHelper.REQUEST_OBJECT);
- log.debug("\n----------------------------------------------------------------"
+ getLogger().debug("\n----------------------------------------------------------------"
+ "\n- Request: (" + request.getClass().getName() + ") at port "
+ request.getServerPort()
+ "\n----------------------------------------------------------------");
@@ -78,7 +80,7 @@
if (submitMethod.equals("POST")) {
// FIXME: Andreas
if (request instanceof HttpRequest) {
- java.io.InputStream is = intercept(((HttpRequest) request).getInputStream());
+ intercept(((HttpRequest) request).getInputStream());
}
}
@@ -143,14 +145,14 @@
HostConfiguration hostConfiguration = new HostConfiguration();
hostConfiguration.setHost(url.getHost(), url.getPort());
- log.debug("\n----------------------------------------------------------------"
+ getLogger().debug("\n----------------------------------------------------------------"
+ "\n- Starting session at URI: " + url + "\n- Host: "
+ url.getHost() + "\n- Port: " + url.getPort()
+ "\n----------------------------------------------------------------");
int result = httpClient.executeMethod(hostConfiguration, httpMethod);
- log.debug("\n----------------------------------------------------------------"
+ getLogger().debug("\n----------------------------------------------------------------"
+ "\n- Result: " + result
+ "\n----------------------------------------------------------------");
@@ -198,29 +200,13 @@
try {
url = new URL(this.source);
- log.debug(".createURL(): " + url);
+ getLogger().debug(".createURL(): " + url);
} catch (MalformedURLException e) {
url = new URL("http://127.0.0.1:" + request.getServerPort() + this.source);
- log.debug(".createURL(): Add localhost and port: " + url);
+ getLogger().debug(".createURL(): Add localhost and port: " + url);
}
return url;
}
- private void attribute(AttributesImpl attr, String name, String value) {
- attr.addAttribute("", name, name, "CDATA", value);
- }
-
- private void start(String name, AttributesImpl attr) throws SAXException {
- super.contentHandler.startElement(URI, name, name, attr);
- attr.clear();
- }
-
- private void end(String name) throws SAXException {
- super.contentHandler.endElement(URI, name, name);
- }
-
- private void data(String data) throws SAXException {
- super.contentHandler.characters(data.toCharArray(), 0, data.length());
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org