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 2007/04/23 16:21:52 UTC
svn commit: r531479 - in /lenya/trunk/src:
impl/test/org/apache/lenya/cms/rc/ impl/test/org/apache/lenya/net/
java/org/apache/lenya/cms/cocoon/acting/
java/org/apache/lenya/cms/cocoon/flow/
java/org/apache/lenya/cms/publication/ java/org/apache/lenya/c...
Author: andreas
Date: Mon Apr 23 07:21:35 2007
New Revision: 531479
URL: http://svn.apache.org/viewvc?view=rev&rev=531479
Log:
Removed references to log4j
Modified:
lenya/trunk/src/impl/test/org/apache/lenya/cms/rc/RevisionControllerTest.java
lenya/trunk/src/impl/test/org/apache/lenya/net/InetAddressUtilTest.java
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/RevisionControllerAction.java
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/flow/FlowHelperImpl.java
lenya/trunk/src/java/org/apache/lenya/cms/publication/PageEnvelope.java
lenya/trunk/src/java/org/apache/lenya/cms/rc/RCEnvironment.java
lenya/trunk/src/java/org/apache/lenya/cms/rc/RevisionController.java
lenya/trunk/src/java/org/apache/lenya/net/InetAddressUtil.java
lenya/trunk/src/java/org/apache/lenya/search/Grep.java
lenya/trunk/src/java/org/apache/lenya/util/CacheMap.java
lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/file/FileIPRange.java
lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/AbstractAccessControllerResolver.java
lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/AbstractIPRange.java
lenya/trunk/src/modules-core/cache/java/src/org/apache/lenya/ac/cache/SourceCacheImpl.java
lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Rollback.java
lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/SiteOverview.java
lenya/trunk/src/modules-optional/jcrsource/java/src/org/apache/lenya/cms/jcr/usecases/JCRImport.java
lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNode.java
Modified: lenya/trunk/src/impl/test/org/apache/lenya/cms/rc/RevisionControllerTest.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/impl/test/org/apache/lenya/cms/rc/RevisionControllerTest.java?view=diff&rev=531479&r1=531478&r2=531479
==============================================================================
--- lenya/trunk/src/impl/test/org/apache/lenya/cms/rc/RevisionControllerTest.java (original)
+++ lenya/trunk/src/impl/test/org/apache/lenya/cms/rc/RevisionControllerTest.java Mon Apr 23 07:21:35 2007
@@ -82,7 +82,7 @@
String source = args[1];
String identityD = args[2];
String destination = args[3];
- RevisionController rc = new RevisionController();
+ RevisionController rc = new RevisionController(getLogger());
try {
rc.reservedCheckOut(doc1.getRepositoryNode(), identityS);
} catch (FileNotFoundException e) // No such source file
Modified: lenya/trunk/src/impl/test/org/apache/lenya/net/InetAddressUtilTest.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/impl/test/org/apache/lenya/net/InetAddressUtilTest.java?view=diff&rev=531479&r1=531478&r2=531479
==============================================================================
--- lenya/trunk/src/impl/test/org/apache/lenya/net/InetAddressUtilTest.java (original)
+++ lenya/trunk/src/impl/test/org/apache/lenya/net/InetAddressUtilTest.java Mon Apr 23 07:21:35 2007
@@ -19,12 +19,12 @@
import java.net.InetAddress;
import java.net.UnknownHostException;
-import junit.framework.TestCase;
+import org.apache.cocoon.core.container.ContainerTestCase;
/**
* Inet address util test
*/
-public class InetAddressUtilTest extends TestCase {
+public class InetAddressUtilTest extends ContainerTestCase {
public void testInetAddressUtil() throws UnknownHostException {
@@ -38,6 +38,8 @@
InetAddress network = InetAddress.getByName(args[0]); // "195.226.6.64");
InetAddress subnet = InetAddress.getByName(args[1]); // "255.255.255.0");
InetAddress ip = InetAddress.getByName(args[2]); // "195.226.6.70");
- System.out.println(InetAddressUtil.contains(network, subnet, ip));
+
+ InetAddressUtil util = new InetAddressUtil(getLogger());
+ System.out.println(util.contains(network, subnet, ip));
}
}
Modified: lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/RevisionControllerAction.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/RevisionControllerAction.java?view=diff&rev=531479&r1=531478&r2=531479
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/RevisionControllerAction.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/RevisionControllerAction.java Mon Apr 23 07:21:35 2007
@@ -100,14 +100,14 @@
// get Parameters for RC
String publicationPath = publication.getDirectory().getCanonicalPath();
RCEnvironment rcEnvironment = RCEnvironment.getInstance(publication.getServletContext()
- .getCanonicalPath());
+ .getCanonicalPath(), getLogger());
this.rcmlDirectory = rcEnvironment.getRCMLDirectory();
this.rcmlDirectory = publicationPath + File.separator + this.rcmlDirectory;
this.backupDirectory = rcEnvironment.getBackupDirectory();
this.backupDirectory = publicationPath + File.separator + this.backupDirectory;
// Initialize Revision Controller
- this.rc = new RevisionController();
+ this.rc = new RevisionController(getLogger());
// /Initialize Revision Controller
// Get session
Modified: lenya/trunk/src/java/org/apache/lenya/cms/cocoon/flow/FlowHelperImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/flow/FlowHelperImpl.java?view=diff&rev=531479&r1=531478&r2=531479
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/cocoon/flow/FlowHelperImpl.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/cocoon/flow/FlowHelperImpl.java Mon Apr 23 07:21:35 2007
@@ -161,7 +161,7 @@
*/
public RevisionController getRevisionController(FOM_Cocoon cocoon)
throws PageEnvelopeException, IOException {
- return new RevisionController();
+ return new RevisionController(getLogger());
}
/**
Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/PageEnvelope.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/publication/PageEnvelope.java?view=diff&rev=531479&r1=531478&r2=531479
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/PageEnvelope.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/PageEnvelope.java Mon Apr 23 07:21:35 2007
@@ -22,6 +22,7 @@
import java.io.File;
+import org.apache.avalon.framework.logger.ConsoleLogger;
import org.apache.cocoon.environment.Request;
import org.apache.lenya.cms.rc.RCEnvironment;
import org.apache.lenya.cms.site.SiteUtil;
@@ -245,7 +246,8 @@
* @deprecated We should detach the RC environment from the page envelope.
*/
public RCEnvironment getRCEnvironment() {
- return RCEnvironment.getInstance(getPublication().getServletContext().getAbsolutePath());
+ return RCEnvironment.getInstance(getPublication().getServletContext().getAbsolutePath(),
+ new ConsoleLogger());
}
/**
Modified: lenya/trunk/src/java/org/apache/lenya/cms/rc/RCEnvironment.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/rc/RCEnvironment.java?view=diff&rev=531479&r1=531478&r2=531479
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/rc/RCEnvironment.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/rc/RCEnvironment.java Mon Apr 23 07:21:35 2007
@@ -29,14 +29,15 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
-import org.apache.log4j.Logger;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.Logger;
import org.xml.sax.SAXException;
/**
* Helper class that holds the revision controller configuration
*/
-public class RCEnvironment implements Configurable {
- private static Logger log = Logger.getLogger(RCEnvironment.class);
+public class RCEnvironment extends AbstractLogEnabled implements Configurable {
+
/**
* <code>CONFIGURATION_FILE</code> The configuration file
*/
@@ -58,12 +59,13 @@
/**
* Returns the singleton RC environment for this context path.
* @param contextPath The context path (the Lenya webapp directory).
+ * @param logger The logger.
* @return An RC environment.
*/
- public static RCEnvironment getInstance(String contextPath) {
+ public static RCEnvironment getInstance(String contextPath, Logger logger) {
RCEnvironment instance = (RCEnvironment) instances.get(contextPath);
if (instance == null) {
- instance = new RCEnvironment(contextPath);
+ instance = new RCEnvironment(contextPath, logger);
instances.put(contextPath, instance);
}
return instance;
@@ -72,12 +74,14 @@
/**
* Creates a new RCEnvironment object from the context path
* @param contextPath The context path
+ * @param logger The logger.
*/
- public RCEnvironment(String contextPath) {
- log.debug("context path:" + contextPath);
+ public RCEnvironment(String contextPath, Logger logger) {
+ enableLogging(logger);
+ getLogger().debug("context path:" + contextPath);
String configurationFilePath = contextPath + "/" + CONFIGURATION_FILE;
- log.debug("configuration file path:" + configurationFilePath);
+ getLogger().debug("configuration file path:" + configurationFilePath);
File configurationFile = new File(configurationFilePath);
@@ -86,11 +90,11 @@
Configuration configuration = builder.buildFromFile(configurationFile);
configure(configuration);
} catch (final ConfigurationException e) {
- log.error("Cannot load revision controller configuration! ", e);
+ getLogger().error("Cannot load revision controller configuration! ", e);
} catch (final SAXException e) {
- log.error("Cannot load revision controller configuration! ", e);
+ getLogger().error("Cannot load revision controller configuration! ", e);
} catch (final IOException e) {
- log.error("Cannot load revision controller configuration! ", e);
+ getLogger().error("Cannot load revision controller configuration! ", e);
}
}
@@ -103,8 +107,8 @@
setRCMLDirectory(configuration.getChild("rcmlDirectory").getAttribute("href"));
setBackupDirectory(configuration.getChild("backupDirectory").getAttribute("href"));
- log.debug("CONFIGURATION:\nRCML Directory: href=" + getRCMLDirectory());
- log.debug("CONFIGURATION:\nBackup Directory: href=" + getBackupDirectory());
+ getLogger().debug("CONFIGURATION:\nRCML Directory: href=" + getRCMLDirectory());
+ getLogger().debug("CONFIGURATION:\nBackup Directory: href=" + getBackupDirectory());
}
/**
Modified: lenya/trunk/src/java/org/apache/lenya/cms/rc/RevisionController.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/rc/RevisionController.java?view=diff&rev=531479&r1=531478&r2=531479
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/rc/RevisionController.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/rc/RevisionController.java Mon Apr 23 07:21:35 2007
@@ -23,14 +23,14 @@
import java.io.FileNotFoundException;
import java.util.Date;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.Logger;
import org.apache.lenya.cms.repository.Node;
-import org.apache.log4j.Logger;
/**
* Controller for the reserved check-in, check-out, the backup versions and the rollback
*/
-public class RevisionController {
- private static Logger log = Logger.getLogger(RevisionController.class);
+public class RevisionController extends AbstractLogEnabled {
/**
* <code>systemUsername</code> The system user name. This is used for - creating dummy checkin
@@ -42,8 +42,10 @@
/**
* Creates a new RevisionController object.
+ * @param logger The logger.
*/
- public RevisionController() {
+ public RevisionController(Logger logger) {
+ enableLogging(logger);
}
/**
@@ -79,9 +81,9 @@
// having to check back in first.
//
if (entry != null) {
- log.debug("entry: " + entry);
- log.debug("entry.type:" + entry.getType());
- log.debug("entry.identity" + entry.getIdentity());
+ getLogger().debug("entry: " + entry);
+ getLogger().debug("entry.type:" + entry.getType());
+ getLogger().debug("entry.identity" + entry.getIdentity());
}
if ((entry != null) && (entry.getType() != RCML.ci)
@@ -108,9 +110,9 @@
// having to check back in first.
//
if (entry != null) {
- log.debug("entry: " + entry);
- log.debug("entry.type:" + entry.getType());
- log.debug("entry.identity" + entry.getIdentity());
+ getLogger().debug("entry: " + entry);
+ getLogger().debug("entry.type:" + entry.getType());
+ getLogger().debug("entry.identity" + entry.getIdentity());
}
boolean checkedOutByOther = entry != null && entry.getType() != RCML.ci
@@ -133,9 +135,9 @@
// having to check back in first.
//
if (entry != null) {
- log.debug("entry: " + entry);
- log.debug("entry.type:" + entry.getType());
- log.debug("entry.identity" + entry.getIdentity());
+ getLogger().debug("entry: " + entry);
+ getLogger().debug("entry.type:" + entry.getType());
+ getLogger().debug("entry.identity" + entry.getIdentity());
}
return entry != null && entry.getType() == RCML.co;
}
Modified: lenya/trunk/src/java/org/apache/lenya/net/InetAddressUtil.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/net/InetAddressUtil.java?view=diff&rev=531479&r1=531478&r2=531479
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/net/InetAddressUtil.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/net/InetAddressUtil.java Mon Apr 23 07:21:35 2007
@@ -23,20 +23,20 @@
import java.net.InetAddress;
import java.net.UnknownHostException;
-import org.apache.log4j.Logger;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.Logger;
/**
* A utility class for InetAddress. Also see http://jodies.de/ipcalc
*/
-public class InetAddressUtil {
-
- private static final Logger log = Logger.getLogger(InetAddressUtil.class);
+public class InetAddressUtil extends AbstractLogEnabled {
/**
* Ctor.
+ * @param logger The logger.
*/
- private InetAddressUtil() {
- // do nothing
+ public InetAddressUtil(Logger logger) {
+ enableLogging(logger);
}
/**
@@ -46,10 +46,10 @@
* @param ip The IP address to check.
* @return A boolean value.
*/
- public static boolean contains(InetAddress network, InetAddress netmask, InetAddress ip) {
- if(log.isDebugEnabled()) {
- log.debug("=======================================");
- log.debug("Checking IP address: " + ip + " in " + network + " / " + netmask);
+ public boolean contains(InetAddress network, InetAddress netmask, InetAddress ip) {
+ if(getLogger().isDebugEnabled()) {
+ getLogger().debug("=======================================");
+ getLogger().debug("Checking IP address: " + ip + " in " + network + " / " + netmask);
}
byte[] networkBytes = network.getAddress();
@@ -73,12 +73,12 @@
* problem. This method and therefore this whole
* class would probably be obsolete in that case.)
*/
- if(log.isDebugEnabled()) {
- log.debug
+ if(getLogger().isDebugEnabled()) {
+ getLogger().debug
("Network address " + network + ", subnet mask "
+ netmask + " and/or host address " + ip
+ " have different sizes! (return false ...)");
- log.debug("=======================================");
+ getLogger().debug("=======================================");
}
return false;
}
@@ -87,18 +87,18 @@
for(int i=0; i<netmaskBytes.length; i++) {
int mask = netmaskBytes[i] & 0xff;
if((networkBytes[i] & mask) != (ipBytes[i] & mask)) {
- if(log.isDebugEnabled()) {
- log.debug
+ if(getLogger().isDebugEnabled()) {
+ getLogger().debug
(ip + " is not in " + network + " / " + netmask);
- log.debug("=======================================");
+ getLogger().debug("=======================================");
}
return false;
}
}
- if(log.isDebugEnabled()) {
- log.debug
+ if(getLogger().isDebugEnabled()) {
+ getLogger().debug
(ip + " is in " + network + " / " + netmask);
- log.debug("=======================================");
+ getLogger().debug("=======================================");
}
return true;
}
@@ -132,7 +132,7 @@
* need this functionality, you should rewrite it
* yourself.)
*/
- public static int checkNetmask(InetAddress netmask) {
+ public int checkNetmask(InetAddress netmask) {
String[] parts = netmask.getHostAddress().split("\\.");
Integer[] numbers = new Integer[4];
for (int i = 0; i < 4; i++) {
@@ -140,12 +140,12 @@
}
for (int i = 0; i < 4; i++) {
- log.debug(".checkNetmask(): Check part: " + numbers[i]);
+ getLogger().debug(".checkNetmask(): Check part: " + numbers[i]);
if (0 <= numbers[i].intValue() && numbers[i].intValue() <= 255) {
if (numbers[i].intValue() != 255) {
for (int k = i + 1; k < 4; k++) {
if (numbers[k].intValue() != 0) {
- log.error(".checkNetmask(): Illegal Netmask: " + netmask);
+ getLogger().error(".checkNetmask(): Illegal Netmask: " + netmask);
return -1;
}
}
@@ -154,11 +154,11 @@
continue;
}
// FIXME: This check not really be necessary because java.net.UnknownHostException should be thrown long time before
- log.error(".checkNetmask(): Illegal Netmask: " + netmask);
+ getLogger().error(".checkNetmask(): Illegal Netmask: " + netmask);
return -1;
}
- if (log.isDebugEnabled()) {
- log.debug("All parts equal 255: " + netmask);
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("All parts equal 255: " + netmask);
}
return 3;
}
Modified: lenya/trunk/src/java/org/apache/lenya/search/Grep.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/search/Grep.java?view=diff&rev=531479&r1=531478&r2=531479
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/search/Grep.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/search/Grep.java Mon Apr 23 07:21:35 2007
@@ -35,14 +35,14 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.log4j.Logger;
+import org.apache.avalon.framework.logger.ConsoleLogger;
+import org.apache.avalon.framework.logger.Logger;
/**
* Utility class to provide a subset of the grep functionality.
*/
public class Grep {
- private static final Logger log = Logger.getLogger(Grep.class);
-
+
private static Charset charset = Charset.forName("UTF-8");
private static CharsetDecoder decoder = charset.newDecoder();
@@ -54,6 +54,8 @@
* @throws IOException
*/
public static boolean containsPattern(File file, Pattern pattern) throws IOException {
+
+ Logger log = new ConsoleLogger();
FileChannel fc = null;
// Open the file and then get a channel from the stream
@@ -101,6 +103,8 @@
* @throws IOException if the file could not be read.
*/
public static String[] findPattern(File file, Pattern pattern, int group) throws IOException {
+
+ Logger log = new ConsoleLogger();
ArrayList occurences = new ArrayList();
FileInputStream fis = null;
Modified: lenya/trunk/src/java/org/apache/lenya/util/CacheMap.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/util/CacheMap.java?view=diff&rev=531479&r1=531478&r2=531479
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/util/CacheMap.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/util/CacheMap.java Mon Apr 23 07:21:35 2007
@@ -25,30 +25,33 @@
import java.util.SortedMap;
import java.util.TreeMap;
-import org.apache.log4j.Logger;
+import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.logger.Logger;
/**
* A map with a maximum capacity. When the map is full, the oldest entry is removed.
*/
-public class CacheMap extends HashMap {
+public class CacheMap extends HashMap implements LogEnabled {
/**
*
*/
private static final long serialVersionUID = 1L;
- private static final Logger log = Logger.getLogger(CacheMap.class);
/**
* Ctor.
* @param _capacity The maximum number of entries.
+ * @param logger The logger.
*/
- public CacheMap(int _capacity) {
+ public CacheMap(int _capacity, Logger logger) {
+ enableLogging(logger);
assert _capacity > -1;
this.capacity = _capacity;
}
private int capacity;
private SortedMap timeToKey = new TreeMap();
+ private Logger logger;
/**
* @see java.util.Map#put(Object, Object)
@@ -58,8 +61,8 @@
if (size() == this.capacity) {
Object oldestKey = this.timeToKey.get(this.timeToKey.firstKey());
remove(oldestKey);
- if (log.isDebugEnabled()) {
- log.debug("Clearing cache");
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("Clearing cache");
}
}
this.timeToKey.put(new Date(), key);
@@ -71,15 +74,23 @@
*/
public Object get(Object key) {
Object result = super.get(key);
- if (log.isDebugEnabled()) {
+ if (getLogger().isDebugEnabled()) {
if (result != null) {
- log.debug("Using cached object for key [" + key + "]");
+ getLogger().debug("Using cached object for key [" + key + "]");
}
else {
- log.debug("No cached object for key [" + key + "]");
+ getLogger().debug("No cached object for key [" + key + "]");
}
}
return result;
+ }
+
+ protected Logger getLogger() {
+ return this.logger;
+ }
+
+ public void enableLogging(Logger logger) {
+ this.logger = logger;
}
}
Modified: lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/file/FileIPRange.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/file/FileIPRange.java?view=diff&rev=531479&r1=531478&r2=531479
==============================================================================
--- lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/file/FileIPRange.java (original)
+++ lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/file/FileIPRange.java Mon Apr 23 07:21:35 2007
@@ -29,6 +29,7 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.configuration.DefaultConfigurationSerializer;
+import org.apache.avalon.framework.logger.ConsoleLogger;
import org.apache.avalon.framework.logger.Logger;
import org.apache.lenya.ac.AccessControlException;
import org.apache.lenya.ac.ItemManager;
@@ -63,7 +64,8 @@
InetAddress subnetMask = InetAddress.getByName(args[1]);
Machine machine = new Machine(args[2]);
- if (InetAddressUtil.contains(networkAddress, subnetMask, machine.getAddress())) {
+ InetAddressUtil util = new InetAddressUtil(new ConsoleLogger());
+ if (util.contains(networkAddress, subnetMask, machine.getAddress())) {
System.out.println("true");
} else {
System.out.println("false");
Modified: lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/AbstractAccessControllerResolver.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/AbstractAccessControllerResolver.java?view=diff&rev=531479&r1=531478&r2=531479
==============================================================================
--- lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/AbstractAccessControllerResolver.java (original)
+++ lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/AbstractAccessControllerResolver.java Mon Apr 23 07:21:35 2007
@@ -39,7 +39,14 @@
implements AccessControllerResolver, Serviceable, ThreadSafe {
protected static final int CAPACITY = 1000;
- private CacheMap cache = new CacheMap(CAPACITY);
+ private CacheMap cache;
+
+ protected CacheMap getCache() {
+ if (this.cache == null) {
+ this.cache = new CacheMap(CAPACITY, getLogger());
+ }
+ return this.cache;
+ }
/**
* @see org.apache.lenya.ac.AccessControllerResolver#resolveAccessController(java.lang.String)
@@ -63,13 +70,15 @@
getManager().release(resolver);
}
}
+
+ CacheMap cache = getCache();
- synchronized (this.cache) {
- controller = (AccessController) this.cache.get(key);
+ synchronized (cache) {
+ controller = (AccessController) cache.get(key);
if (controller == null) {
getLogger().debug("No access controller in cache.");
controller = doResolveAccessController(webappUrl);
- this.cache.put(key, controller);
+ cache.put(key, controller);
} else {
getLogger().debug("Getting access controller from cache.");
}
Modified: lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/AbstractIPRange.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/AbstractIPRange.java?view=diff&rev=531479&r1=531478&r2=531479
==============================================================================
--- lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/AbstractIPRange.java (original)
+++ lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/AbstractIPRange.java Mon Apr 23 07:21:35 2007
@@ -329,7 +329,8 @@
* about this. ;-)
*/
getLogger().debug("Checking IP range: [" + getId() + "]");
- return InetAddressUtil.contains(this.networkAddress, this.subnetMask, machine.getAddress());
+ InetAddressUtil util = new InetAddressUtil(getLogger());
+ return util.contains(this.networkAddress, this.subnetMask, machine.getAddress());
}
/**
Modified: lenya/trunk/src/modules-core/cache/java/src/org/apache/lenya/ac/cache/SourceCacheImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/cache/java/src/org/apache/lenya/ac/cache/SourceCacheImpl.java?view=diff&rev=531479&r1=531478&r2=531479
==============================================================================
--- lenya/trunk/src/modules-core/cache/java/src/org/apache/lenya/ac/cache/SourceCacheImpl.java (original)
+++ lenya/trunk/src/modules-core/cache/java/src/org/apache/lenya/ac/cache/SourceCacheImpl.java Mon Apr 23 07:21:35 2007
@@ -61,7 +61,6 @@
* Ctor.
*/
public SourceCacheImpl() {
- this.cache = new CacheMap(CAPACITY);
}
protected static final int CAPACITY = 1000;
@@ -72,6 +71,9 @@
* @return A cache object.
*/
protected CacheMap getCache() {
+ if (this.cache == null) {
+ this.cache = new CacheMap(CAPACITY, getLogger());
+ }
return this.cache;
}
Modified: lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Rollback.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Rollback.java?view=diff&rev=531479&r1=531478&r2=531479
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Rollback.java (original)
+++ lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Rollback.java Mon Apr 23 07:21:35 2007
@@ -70,7 +70,7 @@
Document document = getSourceDocument();
// Initialize Revision Controller
- RevisionController rc = new RevisionController();
+ RevisionController rc = new RevisionController(getLogger());
Map objectModel = ContextHelper.getObjectModel(getContext());
Request request = ObjectModelHelper.getRequest(objectModel);
Modified: lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/SiteOverview.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/SiteOverview.java?view=diff&rev=531479&r1=531478&r2=531479
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/SiteOverview.java (original)
+++ lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/SiteOverview.java Mon Apr 23 07:21:35 2007
@@ -168,7 +168,7 @@
}
protected RevisionController getRevisionController() {
- return new RevisionController();
+ return new RevisionController(getLogger());
}
/**
Modified: lenya/trunk/src/modules-optional/jcrsource/java/src/org/apache/lenya/cms/jcr/usecases/JCRImport.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-optional/jcrsource/java/src/org/apache/lenya/cms/jcr/usecases/JCRImport.java?view=diff&rev=531479&r1=531478&r2=531479
==============================================================================
--- lenya/trunk/src/modules-optional/jcrsource/java/src/org/apache/lenya/cms/jcr/usecases/JCRImport.java (original)
+++ lenya/trunk/src/modules-optional/jcrsource/java/src/org/apache/lenya/cms/jcr/usecases/JCRImport.java Mon Apr 23 07:21:35 2007
@@ -33,7 +33,6 @@
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.servlet.multipart.Part;
import org.apache.lenya.cms.usecase.AbstractUsecase;
-import org.apache.log4j.Logger;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -45,7 +44,6 @@
* Import JCR content.
*/
public class JCRImport extends AbstractUsecase {
- private static final Logger log = Logger.getLogger(JCRImport.class);
private static final String IMPORT_TARGET_PARAM = "lenya.usecase.importExport.import";
private static final String IMPORT_TARGET_PUBLICATION = "publication";
@@ -96,7 +94,7 @@
String importTarget = request.getParameter(IMPORT_TARGET_PARAM);
if (IMPORT_TARGET_REPOSITORY.equals(importTarget)) {
// Import Lenya repository
- log.debug("Importing Lenya repository into JCR");
+ getLogger().debug("Importing Lenya repository into JCR");
if (!JCR_LENYA_BASE_NAME.equals(firstNodeName)) {
throw new JCRImportException("Corrupt Lenya repository data file");
}
@@ -121,7 +119,7 @@
}
} else if (IMPORT_TARGET_PUBLICATION.equals(importTarget)) {
// Import Lenya publication
- log.debug("Importing Lenya publication into JCR");
+ getLogger().debug("Importing Lenya publication into JCR");
if (!session.itemExists(JCR_LENYA_PUBLICATON_ROOT)) {
throw new JCRImportException("Lenya JCR root not found [" + JCR_LENYA_ROOT + "]");
// TODO: Create JCR_LENYA_PUBLICATON_ROOT
Modified: lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNode.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNode.java?view=diff&rev=531479&r1=531478&r2=531479
==============================================================================
--- lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNode.java (original)
+++ lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNode.java Mon Apr 23 07:21:35 2007
@@ -165,7 +165,7 @@
protected RevisionController getRevisionController() throws RepositoryException {
if (this.revisionController == null) {
- this.revisionController = new RevisionController();
+ this.revisionController = new RevisionController(getLogger());
}
return this.revisionController;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org