svn commit: r742247 - in /lenya/trunk: org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/ org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/ org.apache.lenya.core.api/src/main/java/org/apache/lenya/util/ org.apache.lenya.mod...

[email protected]
Newsgroups gmane.comp.cms.lenya.cvs
Message-ID <[email protected]> 
Author: froethenbacher
Date: Mon Feb  9 04:00:51 2009
New Revision: 742247

URL: http://svn.apache.org/viewvc?rev=742247&view=rev
Log:
Started to replace deprecated Assert with Validate.

Modified:
    lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileAccreditableManager.java
    lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileGroup.java
    lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileGroupManager.java
    lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileIPRangeManager.java
    lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileItemManager.java
    lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileUser.java
    lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileUserManager.java
    lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractItem.java
    lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractRole.java
    lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/CredentialImpl.java
    lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/DefaultPolicy.java
    lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/URLPolicy.java
    lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/util/Assert.java
    lenya/trunk/org.apache.lenya.module.svg/src/main/java/org/apache/lenya/modules/svg/ProtocolHandler.java

Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileAccreditableManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileAccreditableManager.java?rev=742247&r1=742246&r2=742247&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileAccreditableManager.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileAccreditableManager.java Mon Feb  9 04:00:51 2009
@@ -29,6 +29,7 @@
 
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.cocoon.util.NetUtils;
+import org.apache.commons.lang.Validate;
 import org.apache.commons.logging.Log;
 import org.apache.excalibur.source.Source;
 import org.apache.excalibur.source.SourceResolver;
@@ -39,7 +40,6 @@
 import org.apache.lenya.ac.UserManager;
 import org.apache.lenya.ac.UserType;
 import org.apache.lenya.ac.impl.AbstractAccreditableManager;
-import org.apache.lenya.util.Assert;
 
 /**
  * File-based accreditable manager.
@@ -59,10 +59,10 @@
             String configurationUri, UserType[] _userTypes) {
         super(logger);
 
-        Assert.notNull("service manager", manager);
+        Validate.notNull(manager, "Service manager");
         this.manager = manager;
 
-        Assert.notNull("configuration directory", configurationUri);
+        Validate.notNull(configurationUri, "configuration directory");
         this.configurationDirectoryUri = configurationUri;
 
         this.userTypes = new HashSet(Arrays.asList(_userTypes));
@@ -194,8 +194,9 @@
 
     public String getId() {
         try {
-            Assert.notNull("configuration directory", this.getConfigurationDirectory());
-            return this.getConfigurationDirectory().getCanonicalPath();
+        	File configDir = this.getConfigurationDirectory();
+        	assert configDir != null;
+            return configDir.getCanonicalPath();
         } catch (IOException e) {
             throw new RuntimeException(e);
         }

Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileGroup.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileGroup.java?rev=742247&r1=742246&r2=742247&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileGroup.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileGroup.java Mon Feb  9 04:00:51 2009
@@ -26,6 +26,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.commons.lang.Validate;
 import org.apache.commons.logging.Log;
 import org.apache.lenya.ac.AccessControlException;
 import org.apache.lenya.ac.Item;
@@ -129,7 +130,9 @@
     }
 
     protected void setConfigurationDirectory(File _configurationDirectory) {
-        assert (_configurationDirectory != null) && _configurationDirectory.isDirectory();
+        Validate.notNull(_configurationDirectory, "Configuration directory");
+        Validate.isTrue(_configurationDirectory.isDirectory(),
+        		"Configuration directory must be a directory");
         this.configurationDirectory = _configurationDirectory;
     }
 }
\ No newline at end of file

Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileGroupManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileGroupManager.java?rev=742247&r1=742246&r2=742247&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileGroupManager.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileGroupManager.java Mon Feb  9 04:00:51 2009
@@ -24,6 +24,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.commons.lang.Validate;
 import org.apache.commons.logging.Log;
 import org.apache.lenya.ac.AccessControlException;
 import org.apache.lenya.ac.AccreditableManager;
@@ -57,7 +58,7 @@
      */
     public static FileGroupManager instance(AccreditableManager mgr, File configurationDirectory,
             Log logger) throws AccessControlException {
-        assert configurationDirectory != null;
+        Validate.notNull(configurationDirectory);
 
         if (!instances.containsKey(configurationDirectory)) {
             FileGroupManager manager = new FileGroupManager(mgr);

Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileIPRangeManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileIPRangeManager.java?rev=742247&r1=742246&r2=742247&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileIPRangeManager.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileIPRangeManager.java Mon Feb  9 04:00:51 2009
@@ -24,6 +24,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.commons.lang.Validate;
 import org.apache.commons.logging.Log;
 import org.apache.lenya.ac.AccessControlException;
 import org.apache.lenya.ac.AccreditableManager;
@@ -66,7 +67,7 @@
     public static FileIPRangeManager instance(AccreditableManager mgr, File configurationDirectory, Log logger)
             throws AccessControlException {
 
-        assert configurationDirectory != null;
+        Validate.notNull(configurationDirectory);
         if (!configurationDirectory.isDirectory()) {
             throw new AccessControlException("Configuration directory [" + configurationDirectory
                     + "] does not exist!");

Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileItemManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileItemManager.java?rev=742247&r1=742246&r2=742247&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileItemManager.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileItemManager.java Mon Feb  9 04:00:51 2009
@@ -36,6 +36,7 @@
 import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
 import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.lang.Validate;
 import org.apache.commons.logging.Log;
 import org.apache.lenya.ac.AccessControlException;
 import org.apache.lenya.ac.AccreditableManager;
@@ -72,7 +73,7 @@
      * @throws AccessControlException if the item manager cannot be instantiated
      */
     public void configure(File _configurationDirectory) throws AccessControlException {
-        assert _configurationDirectory != null;
+        Validate.notNull(_configurationDirectory);
 
         if (!_configurationDirectory.exists() || !_configurationDirectory.isDirectory()) {
             throw new AccessControlException("The directory ["
@@ -192,7 +193,7 @@
         Configuration config = null;
 
         try {
-            assert file.exists();
+            Validate.isTrue(file.exists(), "file does not exist");
             config = builder.buildFromFile(file);
         } catch (Exception e) {
             String errorMsg = "Exception when reading the configuration from file: "
@@ -244,7 +245,7 @@
      *         exception.
      */
     public void add(Item item) throws AccessControlException {
-        assert item != null;
+        Validate.notNull(item);
         this.items.put(item.getId(), item);
         if (getLogger().isDebugEnabled()) {
             getLogger().debug("Item [" + item + "] added.");

Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileUser.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileUser.java?rev=742247&r1=742246&r2=742247&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileUser.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileUser.java Mon Feb  9 04:00:51 2009
@@ -25,6 +25,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.commons.lang.Validate;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.Log;
 import org.apache.lenya.ac.AccessControlException;
@@ -217,7 +218,8 @@
     }
 
     protected void setConfigurationDirectory(File _configurationDirectory) {
-        assert (_configurationDirectory != null) && _configurationDirectory.isDirectory();
+        Validate.notNull(_configurationDirectory);
+        Validate.isTrue(_configurationDirectory.isDirectory());
         this.configurationDirectory = _configurationDirectory;
     }
 

Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileUserManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileUserManager.java?rev=742247&r1=742246&r2=742247&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileUserManager.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/file/FileUserManager.java Mon Feb  9 04:00:51 2009
@@ -25,6 +25,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.commons.lang.Validate;
 import org.apache.commons.logging.Log;
 import org.apache.lenya.ac.AccessControlException;
 import org.apache.lenya.ac.AccreditableManager;
@@ -68,7 +69,7 @@
     public static FileUserManager instance(AccreditableManager mgr, File configurationDirectory, UserType[] userTypes, Log logger)
             throws AccessControlException {
 
-        assert configurationDirectory != null;
+        Validate.notNull(configurationDirectory);
         if (!configurationDirectory.isDirectory()) {
             throw new AccessControlException("Configuration directory [" + configurationDirectory
                     + "] does not exist!");

Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractItem.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractItem.java?rev=742247&r1=742246&r2=742247&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractItem.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractItem.java Mon Feb  9 04:00:51 2009
@@ -19,12 +19,12 @@
 package org.apache.lenya.ac.impl;
 
 import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.lang.Validate;
 import org.apache.commons.logging.Log;
 import org.apache.lenya.ac.AccreditableManager;
 import org.apache.lenya.ac.Item;
 import org.apache.lenya.ac.ItemManager;
 import org.apache.lenya.ac.ItemUtil;
-import org.apache.lenya.util.Assert;
 
 /**
  * Abstract superclass for all access control objects that can be managed by an
@@ -45,9 +45,9 @@
      * @param logger The logger.
      */
     public AbstractItem(ItemManager itemManager, Log logger) {
-        Assert.notNull("logger", logger);
+        Validate.notNull(logger, "logger");
         setLogger(logger);
-        Assert.notNull("item manager", itemManager);
+        Validate.notNull(itemManager, "item manager");
         this.itemManager = itemManager;
     }
 

Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractRole.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractRole.java?rev=742247&r1=742246&r2=742247&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractRole.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/AbstractRole.java Mon Feb  9 04:00:51 2009
@@ -20,10 +20,10 @@
 
 package org.apache.lenya.ac.impl;
 
+import org.apache.commons.lang.Validate;
 import org.apache.commons.logging.Log;
 import org.apache.lenya.ac.ItemManager;
 import org.apache.lenya.ac.Role;
-import org.apache.lenya.util.Assert;
 
 
 /**
@@ -48,7 +48,7 @@
      */
     public AbstractRole(ItemManager itemManager, Log logger, String name) {
         this(itemManager, logger);
-        Assert.notNull("name", name);
+        Validate.notNull(name, "name");
         setName(name);
     }
 

Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/CredentialImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/CredentialImpl.java?rev=742247&r1=742246&r2=742247&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/CredentialImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/CredentialImpl.java Mon Feb  9 04:00:51 2009
@@ -20,10 +20,10 @@
 
 package org.apache.lenya.ac.impl;
 
+import org.apache.commons.lang.Validate;
 import org.apache.lenya.ac.Accreditable;
 import org.apache.lenya.ac.Credential;
 import org.apache.lenya.ac.Role;
-import org.apache.lenya.util.Assert;
 
 /**
  * Credential implementation.
@@ -40,9 +40,9 @@
      * @param role The role.
      */
     public CredentialImpl(Accreditable accreditable, Role role) {
-        Assert.notNull("accreditable", accreditable);
+        Validate.notNull(accreditable, "accreditable");
+        Validate.notNull(role, "role");
         this.accreditable = accreditable;
-        Assert.notNull("role", role);
         this.role = role;
     }
 

Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/DefaultPolicy.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/DefaultPolicy.java?rev=742247&r1=742246&r2=742247&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/DefaultPolicy.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/DefaultPolicy.java Mon Feb  9 04:00:51 2009
@@ -27,6 +27,7 @@
 import java.util.List;
 import java.util.Set;
 
+import org.apache.commons.lang.Validate;
 import org.apache.lenya.ac.AccessControlException;
 import org.apache.lenya.ac.Accreditable;
 import org.apache.lenya.ac.Credential;
@@ -34,7 +35,6 @@
 import org.apache.lenya.ac.ModifiablePolicy;
 import org.apache.lenya.ac.Policy;
 import org.apache.lenya.ac.Role;
-import org.apache.lenya.util.Assert;
 
 /**
  * A DefaultPolicy is the own policy of a certain URL (not merged).
@@ -207,8 +207,8 @@
     }
 
     public int check(Identity identity, Role role) throws AccessControlException {
-        Assert.notNull("identity", identity);
-        Assert.notNull("role", role);
+        Validate.notNull(identity, "identity");
+        Validate.notNull(role, "role");
         Credential[] credentials = getCredentials();
         for (int i = credentials.length - 1; i >= 0; i--) {
             if (matches(identity, credentials[i].getAccreditable())
@@ -224,8 +224,8 @@
     }
 
     protected boolean matches(Identity identity, Accreditable accreditable) {
-        Assert.notNull("identity", identity);
-        Assert.notNull("accreditable", accreditable);
+        Validate.notNull(identity, "identity");
+        Validate.notNull(accreditable, "accreditable");
         Accreditable[] accrs = identity.getAccreditables();
         return Arrays.asList(accrs).contains(accreditable);
     }

Modified: lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/URLPolicy.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/URLPolicy.java?rev=742247&r1=742246&r2=742247&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/URLPolicy.java (original)
+++ lenya/trunk/org.apache.lenya.core.ac/src/main/java/org/apache/lenya/ac/impl/URLPolicy.java Mon Feb  9 04:00:51 2009
@@ -23,6 +23,7 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
+import org.apache.commons.lang.Validate;
 import org.apache.lenya.ac.AccessControlException;
 import org.apache.lenya.ac.Accreditable;
 import org.apache.lenya.ac.AccreditableManager;
@@ -31,7 +32,6 @@
 import org.apache.lenya.ac.InheritingPolicyManager;
 import org.apache.lenya.ac.Policy;
 import org.apache.lenya.ac.Role;
-import org.apache.lenya.util.Assert;
 
 /**
  * A policy at a certain URL. The final policy is computed by merging the
@@ -112,8 +112,8 @@
      * Iterate the policy tree bottom-up.
      */
     public int check(Identity identity, Role role) throws AccessControlException {
-        Assert.notNull("identity", identity);
-        Assert.notNull("role", role);
+        Validate.notNull(identity, "identity");
+        Validate.notNull(role, "role");
         obtainPolicies();
         
         for (int i = 0; i < this.policies.length; i++) {

Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/util/Assert.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/util/Assert.java?rev=742247&r1=742246&r2=742247&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/util/Assert.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/util/Assert.java Mon Feb  9 04:00:51 2009
@@ -19,7 +19,7 @@
 
 /**
  * Assertion utility.
- * @deprecated Use {@link org.springframework.util.Assert} instead.
+ * @deprecated Use {@link org.apache.commons.lang.Validate} instead.
  */
 public final class Assert {
 

Modified: lenya/trunk/org.apache.lenya.module.svg/src/main/java/org/apache/lenya/modules/svg/ProtocolHandler.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.svg/src/main/java/org/apache/lenya/modules/svg/ProtocolHandler.java?rev=742247&r1=742246&r2=742247&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.svg/src/main/java/org/apache/lenya/modules/svg/ProtocolHandler.java (original)
+++ lenya/trunk/org.apache.lenya.module.svg/src/main/java/org/apache/lenya/modules/svg/ProtocolHandler.java Mon Feb  9 04:00:51 2009
@@ -35,9 +35,9 @@
 import org.apache.batik.util.ParsedURLProtocolHandler;
 import org.apache.cocoon.CascadingIOException;
 import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.commons.lang.Validate;
 import org.apache.excalibur.source.Source;
 import org.apache.excalibur.source.SourceResolver;
-import org.apache.lenya.util.Assert;
 
 /**
  * Batik URL protocol handler for protocols which are handled by the SourceResolver.
@@ -75,7 +75,7 @@
         public ParsedUrlData(String protocol, SourceResolver resolver, String url) {
             this.url = url;
             String prefix = protocol + ":";
-            Assert.isTrue("valid URL", url.length() > prefix.length());
+            Validate.isTrue(url.length() > prefix.length(), "URL not valid");
             this.path = url.substring(prefix.length());
             this.protocol = protocol;
             this.resolver = resolver;
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.