You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by un...@apache.org on 2004/06/05 14:20:20 UTC
cvs commit: jakarta-slide/src/share/org/apache/slide/store IndexStore.java
unico 2004/06/05 05:20:20
Modified: src/util/org/apache/util DOMWriter.java URI.java
PropertyWriter.java
src/share/org/apache/slide/structure StructureImpl.java
src/share/org/apache/slide/lock LockImpl.java
src/webdav/server/org/apache/slide/webdav/method
SubscribeMethod.java UnsubscribeMethod.java
TransactionMethod.java
src/share/org/apache/slide/extractor ExtractorManager.java
AbstractContentExtractor.java
PropertyExtractorTrigger.java
src/share/org/apache/slide/event EventCollectionFilter.java
src/share/org/apache/slide/search/basic/expression
MergeExpression.java
src/share/org/apache/slide/content
NodeRevisionDescriptors.java ContentImpl.java
src/share/org/apache/slide/macro Macro.java
src/webdav/server/org/apache/slide/webdav/util
WebdavUtils.java
src/share/org/apache/slide/security SecurityImpl.java
src/share/org/apache/slide/common Slide.java
src/share/org/apache/slide/search SearchImpl.java
Indexer.java
src/share/org/apache/slide/store IndexStore.java
Log:
access statics statically
remove unused imports
Revision Changes Path
1.10 +4 -4 jakarta-slide/src/util/org/apache/util/DOMWriter.java
Index: DOMWriter.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/util/org/apache/util/DOMWriter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DOMWriter.java 11 Feb 2004 11:30:23 -0000 1.9
+++ DOMWriter.java 5 Jun 2004 12:20:19 -0000 1.10
@@ -122,7 +122,7 @@
// print document
case Node.DOCUMENT_NODE: {
if ( !canonical ) {
- String Encoding = this.getWriterEncoding();
+ String Encoding = DOMWriter.getWriterEncoding();
if( Encoding.equalsIgnoreCase( "DEFAULT" ) )
Encoding = "UTF-8";
else if( Encoding.equalsIgnoreCase( "Unicode" ) )
1.30 +5 -5 jakarta-slide/src/util/org/apache/util/URI.java
Index: URI.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/util/org/apache/util/URI.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- URI.java 11 Feb 2004 11:30:23 -0000 1.29
+++ URI.java 5 Jun 2004 12:20:19 -0000 1.30
@@ -167,7 +167,7 @@
throw new URIException(URIException.PARSING, "scheme required");
}
char[] s = scheme.toLowerCase().toCharArray();
- if (validate(s, this.scheme)) {
+ if (validate(s, URI.scheme)) {
_scheme = s; // is_absoluteURI
} else {
throw new URIException(URIException.PARSING, "incorrect scheme");
1.6 +4 -4 jakarta-slide/src/util/org/apache/util/PropertyWriter.java
Index: PropertyWriter.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/util/org/apache/util/PropertyWriter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PropertyWriter.java 11 Feb 2004 11:30:23 -0000 1.5
+++ PropertyWriter.java 5 Jun 2004 12:20:19 -0000 1.6
@@ -122,7 +122,7 @@
// print document
case Node.DOCUMENT_NODE: {
if ( !canonical ) {
- String Encoding = this.getWriterEncoding();
+ String Encoding = PropertyWriter.getWriterEncoding();
if( Encoding.equalsIgnoreCase( "DEFAULT" ) )
Encoding = "UTF-8";
else if( Encoding.equalsIgnoreCase( "Unicode" ) )
1.45 +4 -5 jakarta-slide/src/share/org/apache/slide/structure/StructureImpl.java
Index: StructureImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/structure/StructureImpl.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- StructureImpl.java 6 May 2004 09:19:19 -0000 1.44
+++ StructureImpl.java 5 Jun 2004 12:20:19 -0000 1.45
@@ -47,7 +47,6 @@
import org.apache.slide.store.Store;
import org.apache.slide.util.Configuration;
import org.apache.slide.event.EventDispatcher;
-import org.apache.slide.event.ContentEvent;
import org.apache.slide.event.StructureEvent;
import org.apache.slide.event.VetoException;
1.43 +4 -5 jakarta-slide/src/share/org/apache/slide/lock/LockImpl.java
Index: LockImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/lock/LockImpl.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- LockImpl.java 24 Feb 2004 16:47:08 -0000 1.42
+++ LockImpl.java 5 Jun 2004 12:20:19 -0000 1.43
@@ -44,7 +44,6 @@
import org.apache.slide.util.Configuration;
import org.apache.slide.event.VetoException;
import org.apache.slide.event.EventDispatcher;
-import org.apache.slide.event.ContentEvent;
import org.apache.slide.event.LockEvent;
/**
1.7 +4 -12 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/SubscribeMethod.java
Index: SubscribeMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/SubscribeMethod.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SubscribeMethod.java 26 Apr 2004 11:41:49 -0000 1.6
+++ SubscribeMethod.java 5 Jun 2004 12:20:19 -0000 1.7
@@ -24,22 +24,14 @@
package org.apache.slide.webdav.method;
import org.apache.slide.common.NamespaceAccessToken;
-import org.apache.slide.common.SlideException;
-import org.apache.slide.common.Domain;
import org.apache.slide.event.EventDispatcher;
-import org.apache.slide.event.ContentEvent;
import org.apache.slide.webdav.WebdavException;
import org.apache.slide.webdav.WebdavServletConfig;
-import org.apache.slide.webdav.event.WebdavEvent;
import org.apache.slide.webdav.event.NotificationTrigger;
import org.apache.slide.webdav.event.Subscriber;
+import org.apache.slide.webdav.event.WebdavEvent;
import org.apache.slide.webdav.util.NotificationConstants;
-import org.apache.slide.util.logger.Logger;
import org.apache.util.WebdavStatus;
-import org.jdom.output.XMLOutputter;
-
-import java.net.URL;
-import java.net.MalformedURLException;
/**
1.2 +5 -13 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UnsubscribeMethod.java
Index: UnsubscribeMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UnsubscribeMethod.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UnsubscribeMethod.java 15 Mar 2004 12:08:32 -0000 1.1
+++ UnsubscribeMethod.java 5 Jun 2004 12:20:19 -0000 1.2
@@ -23,24 +23,16 @@
package org.apache.slide.webdav.method;
+
import org.apache.slide.common.NamespaceAccessToken;
-import org.apache.slide.common.SlideException;
-import org.apache.slide.common.Domain;
import org.apache.slide.event.EventDispatcher;
import org.apache.slide.webdav.WebdavException;
import org.apache.slide.webdav.WebdavServletConfig;
-import org.apache.slide.webdav.event.WebdavEvent;
import org.apache.slide.webdav.event.NotificationTrigger;
import org.apache.slide.webdav.event.Subscriber;
+import org.apache.slide.webdav.event.WebdavEvent;
import org.apache.slide.webdav.util.NotificationConstants;
-import org.apache.slide.util.logger.Logger;
import org.apache.util.WebdavStatus;
-import org.jdom.output.XMLOutputter;
-import org.jdom.output.Format;
-import org.jdom.Element;
-
-import java.net.URL;
-import java.net.MalformedURLException;
/**
1.2 +6 -15 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/TransactionMethod.java
Index: TransactionMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/TransactionMethod.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TransactionMethod.java 4 Mar 2004 09:41:50 -0000 1.1
+++ TransactionMethod.java 5 Jun 2004 12:20:19 -0000 1.2
@@ -23,24 +23,15 @@
package org.apache.slide.webdav.method;
-import org.apache.slide.common.NamespaceAccessToken;
-import org.apache.slide.common.SlideException;
import org.apache.slide.common.Domain;
-import org.apache.slide.event.EventDispatcher;
+import org.apache.slide.common.NamespaceAccessToken;
+import org.apache.slide.util.logger.Logger;
import org.apache.slide.webdav.WebdavException;
import org.apache.slide.webdav.WebdavServletConfig;
-import org.apache.slide.webdav.event.WebdavEvent;
-import org.apache.slide.webdav.event.NotificationTrigger;
-import org.apache.slide.webdav.event.Subscriber;
-import org.apache.slide.webdav.util.NotificationConstants;
import org.apache.slide.webdav.util.TransactionConstants;
-import org.apache.slide.util.logger.Logger;
import org.apache.util.WebdavStatus;
-import org.jdom.output.XMLOutputter;
import org.jdom.output.Format;
-
-import java.net.URL;
-import java.net.MalformedURLException;
+import org.jdom.output.XMLOutputter;
/**
1.2 +3 -4 jakarta-slide/src/share/org/apache/slide/extractor/ExtractorManager.java
Index: ExtractorManager.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/extractor/ExtractorManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExtractorManager.java 1 Mar 2004 10:04:55 -0000 1.1
+++ ExtractorManager.java 5 Jun 2004 12:20:19 -0000 1.2
@@ -30,7 +30,6 @@
import org.apache.slide.content.NodeRevisionDescriptor;
import java.util.*;
-import java.lang.reflect.Method;
import java.lang.reflect.Constructor;
/**
1.2 +3 -4 jakarta-slide/src/share/org/apache/slide/extractor/AbstractContentExtractor.java
Index: AbstractContentExtractor.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/extractor/AbstractContentExtractor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractContentExtractor.java 1 Mar 2004 10:04:55 -0000 1.1
+++ AbstractContentExtractor.java 5 Jun 2004 12:20:19 -0000 1.2
@@ -23,7 +23,6 @@
package org.apache.slide.extractor;
-import java.util.Map;
import java.io.InputStream;
import java.io.Reader;
1.3 +8 -11 jakarta-slide/src/share/org/apache/slide/extractor/PropertyExtractorTrigger.java
Index: PropertyExtractorTrigger.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/extractor/PropertyExtractorTrigger.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PropertyExtractorTrigger.java 9 Mar 2004 10:12:12 -0000 1.2
+++ PropertyExtractorTrigger.java 5 Jun 2004 12:20:19 -0000 1.3
@@ -23,19 +23,16 @@
package org.apache.slide.extractor;
+import java.io.ByteArrayInputStream;
+import java.util.Iterator;
+import java.util.Map;
+
import org.apache.slide.content.NodeRevisionContent;
import org.apache.slide.content.NodeRevisionDescriptor;
import org.apache.slide.content.NodeRevisionDescriptors;
import org.apache.slide.event.ContentAdapter;
import org.apache.slide.event.ContentEvent;
import org.apache.slide.event.VetoException;
-import org.apache.slide.util.conf.Configurable;
-import org.apache.slide.util.conf.Configuration;
-import org.apache.slide.util.conf.ConfigurationException;
-
-import java.io.ByteArrayInputStream;
-import java.lang.reflect.Method;
-import java.util.*;
/**
* @author <a href="mailto:dflorey@c1-fse.de">Daniel Florey</a>
1.4 +4 -5 jakarta-slide/src/share/org/apache/slide/event/EventCollectionFilter.java
Index: EventCollectionFilter.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/event/EventCollectionFilter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EventCollectionFilter.java 25 Feb 2004 14:04:36 -0000 1.3
+++ EventCollectionFilter.java 5 Jun 2004 12:20:19 -0000 1.4
@@ -26,7 +26,6 @@
import java.util.List;
import java.util.Iterator;
import java.util.ArrayList;
-import java.util.EventObject;
/**
* @author <a href="mailto:dflorey@c1-fse.de">Daniel Florey</a>
1.5 +4 -5 jakarta-slide/src/share/org/apache/slide/search/basic/expression/MergeExpression.java
Index: MergeExpression.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/expression/MergeExpression.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MergeExpression.java 11 Feb 2004 11:30:17 -0000 1.4
+++ MergeExpression.java 5 Jun 2004 12:20:19 -0000 1.5
@@ -28,7 +28,6 @@
import org.apache.slide.search.InvalidQueryException;
import org.apache.slide.search.SearchException;
-import org.apache.slide.search.basic.BasicExpressionFactory;
import org.apache.slide.search.basic.IBasicExpression;
import org.apache.slide.search.basic.IBasicResultSet;
import org.jdom.Element;
1.16 +5 -5 jakarta-slide/src/share/org/apache/slide/content/NodeRevisionDescriptors.java
Index: NodeRevisionDescriptors.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/content/NodeRevisionDescriptors.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- NodeRevisionDescriptors.java 11 Feb 2004 11:30:13 -0000 1.15
+++ NodeRevisionDescriptors.java 5 Jun 2004 12:20:19 -0000 1.16
@@ -196,7 +196,7 @@
* Get initial revision.
*/
public NodeRevisionNumber getInitialRevision() {
- return this.initialRevision;
+ return NodeRevisionDescriptors.initialRevision;
}
1.58 +4 -5 jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java
Index: ContentImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- ContentImpl.java 9 Mar 2004 10:11:49 -0000 1.57
+++ ContentImpl.java 5 Jun 2004 12:20:19 -0000 1.58
@@ -49,7 +49,6 @@
import org.apache.slide.event.EventDispatcher;
import org.apache.slide.event.ContentEvent;
import org.apache.slide.event.VetoException;
-import org.apache.slide.event.TransactionEvent;
/**
* Implementation of the content interface.
1.18 +4 -5 jakarta-slide/src/share/org/apache/slide/macro/Macro.java
Index: Macro.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/macro/Macro.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Macro.java 24 Feb 2004 16:47:08 -0000 1.17
+++ Macro.java 5 Jun 2004 12:20:19 -0000 1.18
@@ -24,7 +24,6 @@
package org.apache.slide.macro;
import org.apache.slide.common.SlideToken;
-import org.apache.slide.event.VetoException;
/**
* Macro helper class.
1.18 +5 -5 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/WebdavUtils.java
Index: WebdavUtils.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/WebdavUtils.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- WebdavUtils.java 1 Apr 2004 14:41:02 -0000 1.17
+++ WebdavUtils.java 5 Jun 2004 12:20:20 -0000 1.18
@@ -473,7 +473,7 @@
return true;
if (revisionDescriptor.propertyValueContains(
- revisionDescriptor.RESOURCE_TYPE ,"collection")) {
+ NodeRevisionDescriptor.RESOURCE_TYPE ,"collection")) {
result = true;
}
1.48 +7 -8 jakarta-slide/src/share/org/apache/slide/security/SecurityImpl.java
Index: SecurityImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/security/SecurityImpl.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- SecurityImpl.java 24 Feb 2004 16:47:08 -0000 1.47
+++ SecurityImpl.java 5 Jun 2004 12:20:20 -0000 1.48
@@ -59,7 +59,6 @@
import org.apache.slide.util.logger.Logger;
import org.apache.slide.event.VetoException;
import org.apache.slide.event.EventDispatcher;
-import org.apache.slide.event.ContentEvent;
import org.apache.slide.event.SecurityEvent;
import org.jdom.JDOMException;
@@ -879,11 +878,11 @@
public boolean hasRole(ObjectNode object, String role)
throws ServiceAccessException, ObjectNotFoundException {
- if (role.equals(namespaceConfig.NOBODY))
+ if (role.equals(NamespaceConfig.NOBODY))
return true;
String associatedRole = namespaceConfig.getRoleMapping(role);
if ((associatedRole != null)
- && (associatedRole.equals(namespaceConfig.NOBODY)))
+ && (associatedRole.equals(NamespaceConfig.NOBODY)))
return true;
Class roleClass = (Class) rolesCache.get(role);
@@ -925,7 +924,7 @@
public Enumeration getRoles(ObjectNode object) {
Vector result = new Vector();
- result.addElement(namespaceConfig.NOBODY);
+ result.addElement(NamespaceConfig.NOBODY);
Class currentObjectClass = object.getClass();
1.9 +12 -12 jakarta-slide/src/share/org/apache/slide/common/Slide.java
Index: Slide.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/Slide.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Slide.java 11 Feb 2004 11:30:11 -0000 1.8
+++ Slide.java 5 Jun 2004 12:20:20 -0000 1.9
@@ -175,7 +175,7 @@
if (configFile == null) {
- domain.selfInit();
+ Domain.selfInit();
} else {
@@ -191,9 +191,9 @@
new ConfigurationElement(pop.load(new InputSource(is),
parser.getXMLReader()));
- domain.init(slideConfiguration);
+ Domain.init(slideConfiguration);
- domain.start();
+ Domain.start();
}
@@ -236,7 +236,7 @@
try {
- domain.stop();
+ Domain.stop();
} catch (Throwable t) {
@@ -276,7 +276,7 @@
*/
public NamespaceAccessToken accessNamespace(SecurityToken token,
String namespaceName) {
- return domain.accessNamespace(token, namespaceName);
+ return Domain.accessNamespace(token, namespaceName);
}
@@ -286,7 +286,7 @@
* @param token Namespace access token
*/
public void closeNamespace(NamespaceAccessToken token) {
- domain.closeNamespace(token);
+ Domain.closeNamespace(token);
}
@@ -297,7 +297,7 @@
* @param namespaceName Name of the namespace
*/
public void closeNamespace(SecurityToken token, String namespaceName) {
- domain.closeNamespace(token, namespaceName);
+ Domain.closeNamespace(token, namespaceName);
}
@@ -308,7 +308,7 @@
* @return DomainAccessToken Access token to the domain
*/
public DomainAccessToken accessDomain(SecurityToken token) {
- return domain.accessDomain(token);
+ return Domain.accessDomain(token);
}
1.18 +4 -5 jakarta-slide/src/share/org/apache/slide/search/SearchImpl.java
Index: SearchImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/SearchImpl.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- SearchImpl.java 24 Feb 2004 16:47:08 -0000 1.17
+++ SearchImpl.java 5 Jun 2004 12:20:20 -0000 1.18
@@ -35,7 +35,6 @@
import org.apache.slide.structure.Structure;
import org.apache.slide.event.VetoException;
import org.apache.slide.event.EventDispatcher;
-import org.apache.slide.event.StructureEvent;
import org.apache.slide.event.SearchEvent;
import org.jdom.Element;
1.2 +4 -5 jakarta-slide/src/share/org/apache/slide/search/Indexer.java
Index: Indexer.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/Indexer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Indexer.java 25 Feb 2004 10:04:29 -0000 1.1
+++ Indexer.java 5 Jun 2004 12:20:20 -0000 1.2
@@ -24,7 +24,6 @@
package org.apache.slide.search;
-import org.apache.slide.common.ServiceAccessException;
import org.apache.slide.common.Uri;
import org.apache.slide.content.NodeRevisionContent;
import org.apache.slide.content.NodeRevisionDescriptor;
1.9 +4 -9 jakarta-slide/src/share/org/apache/slide/store/IndexStore.java
Index: IndexStore.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/store/IndexStore.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- IndexStore.java 25 Feb 2004 10:04:29 -0000 1.8
+++ IndexStore.java 5 Jun 2004 12:20:20 -0000 1.9
@@ -24,11 +24,6 @@
package org.apache.slide.store;
import org.apache.slide.common.Service;
-import org.apache.slide.common.ServiceAccessException;
-import org.apache.slide.common.Uri;
-import org.apache.slide.content.NodeRevisionContent;
-import org.apache.slide.content.NodeRevisionDescriptor;
-import org.apache.slide.content.NodeRevisionNumber;
import org.apache.slide.search.Indexer;
import org.apache.slide.search.basic.IBasicExpressionFactoryProvider;
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org