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 2006/04/30 03:42:24 UTC
svn commit: r398268 - in
/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya: ac/file/
cms/cocoon/acting/ cms/cocoon/components/modules/input/
cms/cocoon/transformation/
Author: antonio
Date: Sat Apr 29 18:42:21 2006
New Revision: 398268
URL: http://svn.apache.org/viewcvs?rev=398268&view=rev
Log:
Remove interface already implemented by superclass.
Modified:
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/file/FileGroup.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/file/FileRole.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/file/FileUser.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/AbstractAuthorizerAction.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/DefaultCreatorAction.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/ParentChildCreatorAction.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PublicationContentDirModule.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/components/modules/input/ResourceExistsModule.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/AccessControlSitetreeTransformer.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/LinkRewritingTransformer.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/SimpleLinkRewritingTransformer.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/UsecaseMenuTransformer.java
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/file/FileGroup.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/file/FileGroup.java?rev=398268&r1=398267&r2=398268&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/file/FileGroup.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/file/FileGroup.java Sat Apr 29 18:42:21 2006
@@ -15,7 +15,7 @@
*
*/
-/* $Id: FileGroup.java,v 1.4 2004/08/16 15:59:51 andreas Exp $ */
+/* $Id$ */
package org.apache.lenya.ac.file;
@@ -26,14 +26,13 @@
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.configuration.DefaultConfigurationSerializer;
import org.apache.lenya.ac.AccessControlException;
-import org.apache.lenya.ac.Item;
import org.apache.lenya.ac.impl.AbstractGroup;
import org.apache.lenya.ac.impl.ItemConfiguration;
/**
* File-based group implementation.
*/
-public class FileGroup extends AbstractGroup implements Item {
+public class FileGroup extends AbstractGroup {
/**
* @see org.apache.lenya.ac.Group#delete()
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/file/FileRole.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/file/FileRole.java?rev=398268&r1=398267&r2=398268&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/file/FileRole.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/file/FileRole.java Sat Apr 29 18:42:21 2006
@@ -24,15 +24,14 @@
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.configuration.DefaultConfigurationSerializer;
import org.apache.lenya.ac.AccessControlException;
-import org.apache.lenya.ac.Item;
import org.apache.lenya.ac.impl.AbstractRole;
import org.apache.lenya.ac.impl.ItemConfiguration;
/**
* File-based role implementation.
- * @version $Id: FileRole.java,v 1.4 2004/08/16 15:59:51 andreas Exp $
+ * @version $Id$
*/
-public class FileRole extends AbstractRole implements Item {
+public class FileRole extends AbstractRole {
/**
* Creates a new file role.
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/file/FileUser.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/file/FileUser.java?rev=398268&r1=398267&r2=398268&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/file/FileUser.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/file/FileUser.java Sat Apr 29 18:42:21 2006
@@ -26,7 +26,6 @@
import org.apache.avalon.framework.configuration.DefaultConfigurationSerializer;
import org.apache.lenya.ac.AccessControlException;
import org.apache.lenya.ac.Group;
-import org.apache.lenya.ac.Item;
import org.apache.lenya.ac.impl.AbstractUser;
import org.apache.lenya.ac.impl.ItemConfiguration;
import org.apache.log4j.Logger;
@@ -35,7 +34,7 @@
* File-based user implementation.
* @version $Id$
*/
-public class FileUser extends AbstractUser implements Item, Serializable {
+public class FileUser extends AbstractUser implements Serializable {
private static final Logger log = Logger.getLogger(FileUser.class);
public static final String ID = "identity";
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/AbstractAuthorizerAction.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/AbstractAuthorizerAction.java?rev=398268&r1=398267&r2=398268&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/AbstractAuthorizerAction.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/AbstractAuthorizerAction.java Sat Apr 29 18:42:21 2006
@@ -15,14 +15,13 @@
*
*/
-/* $Id: AbstractAuthorizerAction.java,v 1.17 2004/03/03 12:56:32 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.cocoon.acting;
import java.util.HashMap;
import java.util.Map;
-import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
@@ -39,8 +38,7 @@
import org.apache.regexp.REProgram;
import org.apache.regexp.RESyntaxException;
-public abstract class AbstractAuthorizerAction extends AbstractComplementaryConfigurableAction
- implements Configurable {
+public abstract class AbstractAuthorizerAction extends AbstractComplementaryConfigurableAction {
REProgram[] public_matchers;
boolean logRequests = false;
String authenticator_type = null;
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/DefaultCreatorAction.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/DefaultCreatorAction.java?rev=398268&r1=398267&r2=398268&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/DefaultCreatorAction.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/DefaultCreatorAction.java Sat Apr 29 18:42:21 2006
@@ -16,7 +16,6 @@
/* $Id$ */
-
package org.apache.lenya.cms.cocoon.acting;
import java.io.File;
@@ -24,7 +23,6 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
@@ -51,7 +49,7 @@
/**
* DOCUMENT ME!
*/
-public class DefaultCreatorAction extends AbstractComplementaryConfigurableAction implements Configurable {
+public class DefaultCreatorAction extends AbstractComplementaryConfigurableAction {
Logger log = Logger.getLogger(DefaultCreatorAction.class);
private String docsPath = null;
@@ -286,7 +284,7 @@
getLogger().debug(".validate(): parentid=" + parentid + " ; childid=" + childid +
" ; childname=" + childname + " ; childtype=" + childtype + " ; doctype=" + doctype);
- if ((childid.indexOf(" ") >= 0) || (childid.length() == 0)) {
+ if (childid.length() == 0 || childid.indexOf(" ") >= 0) {
return false;
}
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/ParentChildCreatorAction.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/ParentChildCreatorAction.java?rev=398268&r1=398267&r2=398268&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/ParentChildCreatorAction.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/ParentChildCreatorAction.java Sat Apr 29 18:42:21 2006
@@ -19,7 +19,6 @@
package org.apache.lenya.cms.cocoon.acting;
-import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
@@ -56,8 +55,7 @@
import java.util.Map;
import java.util.StringTokenizer;
-public class ParentChildCreatorAction extends AbstractComplementaryConfigurableAction
- implements Configurable {
+public class ParentChildCreatorAction extends AbstractComplementaryConfigurableAction {
private String treeAuthoringPath = null;
private String docsPath = null;
private String doctypesPath = null;
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PublicationContentDirModule.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PublicationContentDirModule.java?rev=398268&r1=398267&r2=398268&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PublicationContentDirModule.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PublicationContentDirModule.java Sat Apr 29 18:42:21 2006
@@ -20,7 +20,6 @@
import java.util.Iterator;
import java.util.Map;
-import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.service.ServiceException;
@@ -36,7 +35,7 @@
/**
* Gets the content directory of a specific publication and specific area
*/
-public class PublicationContentDirModule extends AbstractInputModule implements Serviceable, Disposable {
+public class PublicationContentDirModule extends AbstractInputModule implements Serviceable {
/* (non-Javadoc)
* @see org.apache.cocoon.components.modules.input.InputModule#getAttribute(java.lang.String, org.apache.avalon.framework.configuration.Configuration, java.util.Map)
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/components/modules/input/ResourceExistsModule.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/components/modules/input/ResourceExistsModule.java?rev=398268&r1=398267&r2=398268&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/components/modules/input/ResourceExistsModule.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/components/modules/input/ResourceExistsModule.java Sat Apr 29 18:42:21 2006
@@ -20,7 +20,6 @@
import java.util.Iterator;
import java.util.Map;
-import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.service.ServiceException;
@@ -33,9 +32,9 @@
/**
* Checks if a certain resource exists and returns either the string "true" or "false".
- * @version $Id: ResourceExistsModule.java,v 1.3 2004/04/15 14:11:02 andreas Exp $
+ * @version $Id$
*/
-public class ResourceExistsModule extends AbstractInputModule implements Serviceable, Disposable {
+public class ResourceExistsModule extends AbstractInputModule implements Serviceable {
/* (non-Javadoc)
* @see org.apache.cocoon.components.modules.input.InputModule#getAttribute(java.lang.String, org.apache.avalon.framework.configuration.Configuration, java.util.Map)
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/AccessControlSitetreeTransformer.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/AccessControlSitetreeTransformer.java?rev=398268&r1=398267&r2=398268&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/AccessControlSitetreeTransformer.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/AccessControlSitetreeTransformer.java Sat Apr 29 18:42:21 2006
@@ -22,7 +22,6 @@
import java.io.IOException;
import java.util.Map;
-import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceSelector;
import org.apache.cocoon.ProcessingException;
@@ -54,9 +53,7 @@
* current identity is not allowed to access
* with a <code>protected="true"</code> attribute.
*/
-public class AccessControlSitetreeTransformer
- extends AbstractSAXTransformer
- implements Disposable {
+public class AccessControlSitetreeTransformer extends AbstractSAXTransformer {
public static final String ATTRIBUTE_PROTECTED = "protected";
public static final String PARAMETER_PUBLICATION_ID = "publication-id";
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/LinkRewritingTransformer.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/LinkRewritingTransformer.java?rev=398268&r1=398267&r2=398268&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/LinkRewritingTransformer.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/LinkRewritingTransformer.java Sat Apr 29 18:42:21 2006
@@ -19,7 +19,6 @@
import java.io.IOException;
import java.util.Map;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.service.ServiceSelector;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.ObjectModelHelper;
@@ -70,7 +69,7 @@
*
* $Id: LinkRewritingTransformer.java,v 1.7 2004/03/16 11:12:16 gregor
*/
-public class LinkRewritingTransformer extends AbstractSAXTransformer implements Disposable {
+public class LinkRewritingTransformer extends AbstractSAXTransformer {
private boolean ignoreAElement = false;
private ServiceSelector serviceSelector;
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/SimpleLinkRewritingTransformer.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/SimpleLinkRewritingTransformer.java?rev=398268&r1=398267&r2=398268&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/SimpleLinkRewritingTransformer.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/SimpleLinkRewritingTransformer.java Sat Apr 29 18:42:21 2006
@@ -28,7 +28,6 @@
import java.util.regex.Pattern;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.service.ServiceSelector;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.ObjectModelHelper;
@@ -73,8 +72,7 @@
*
* @deprecated Use the {@link org.apache.lenya.cms.cocoon.transformation.LinkRewritingTransformer} instead.
*/
-public class SimpleLinkRewritingTransformer extends AbstractSAXTransformer
-implements Disposable {
+public class SimpleLinkRewritingTransformer extends AbstractSAXTransformer {
Logger log = Logger.getLogger(SimpleLinkRewritingTransformer.class);
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/UsecaseMenuTransformer.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/UsecaseMenuTransformer.java?rev=398268&r1=398267&r2=398268&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/UsecaseMenuTransformer.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/UsecaseMenuTransformer.java Sat Apr 29 18:42:21 2006
@@ -22,7 +22,6 @@
import java.io.IOException;
import java.util.Map;
-import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceSelector;
import org.apache.cocoon.ProcessingException;
@@ -49,7 +48,7 @@
* This transformer disables menu items (by removing the href attribute)
* which are not allowed with respect to the usecase policies.
*/
-public class UsecaseMenuTransformer extends AbstractSAXTransformer implements Disposable {
+public class UsecaseMenuTransformer extends AbstractSAXTransformer {
public static final String MENU_ELEMENT = "menu";
public static final String ITEM_ELEMENT = "item";
@@ -85,9 +84,7 @@
}
}
}
-
super.startElement(uri, localName, raw, attributes);
-
}
private UsecaseAuthorizer authorizer;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org