unico 2004/10/30 05:48:42
Modified: src/stores/org/apache/slide/store/impl/rdbms
JDBCAwareInputStream.java AbstractRDBMSStore.java
OracleRDBMSAdapter.java
src/webdav/server/org/apache/slide/webdav WebdavServlet.java
src/stores/org/apache/slide/store/file SimpleFileStore.java
CountdownStore.java
src/share/org/apache/slide/macro MacroImpl.java
src/share/org/apache/slide/util
ByteSizeLimitedObjectCache.java
Log:
organize imports
Revision Changes Path
1.7 +4 -7
jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/JDBCAwareInputStream.java
Index: JDBCAwareInputStream.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/JDBCAwareInputStream.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JDBCAwareInputStream.java 3 Aug 2004 11:02:47 -0000 1.6
+++ JDBCAwareInputStream.java 30 Oct 2004 12:48:42 -0000 1.7
@@ -31,9 +31,6 @@
import java.sql.SQLException;
import java.sql.Statement;
-import org.apache.slide.common.ServiceAccessException;
-import org.apache.slide.util.logger.Logger;
-
/**
* Wrapper for an input stream that has come from a JDBC connection. This
* wrapper also closes the underlying JDBC result set - freeing precious system
1.11 +4 -6
jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/AbstractRDBMSStore.java
Index: AbstractRDBMSStore.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/AbstractRDBMSStore.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AbstractRDBMSStore.java 3 Aug 2004 11:02:47 -0000 1.10
+++ AbstractRDBMSStore.java 30 Oct 2004 12:48:42 -0000 1.11
@@ -35,9 +35,7 @@
import org.apache.commons.transaction.util.xa.AbstractTransactionalResource;
import org.apache.commons.transaction.util.xa.TransactionalResource;
-import org.apache.slide.common.AbstractXAService;
import org.apache.slide.common.AbstractXAServiceBase;
-import org.apache.slide.common.Scope;
import org.apache.slide.common.Service;
import org.apache.slide.common.ServiceAccessException;
import org.apache.slide.common.ServiceConnectionFailedException;
1.11 +11 -9
jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/OracleRDBMSAdapter.java
Index: OracleRDBMSAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/OracleRDBMSAdapter.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- OracleRDBMSAdapter.java 20 Aug 2004 17:50:38 -0000 1.10
+++ OracleRDBMSAdapter.java 30 Oct 2004 12:48:42 -0000 1.11
@@ -23,12 +23,14 @@
package org.apache.slide.store.impl.rdbms;
-import org.apache.slide.common.*;
-import org.apache.slide.content.*;
-import org.apache.slide.util.logger.Logger;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
-import java.io.*;
-import java.sql.*;
+import org.apache.slide.common.Service;
+import org.apache.slide.common.ServiceAccessException;
+import org.apache.slide.util.logger.Logger;
/**
1.66 +4 -8
jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java
Index: WebdavServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- WebdavServlet.java 30 Oct 2004 08:45:21 -0000 1.65
+++ WebdavServlet.java 30 Oct 2004 12:48:42 -0000 1.66
@@ -43,12 +43,8 @@
import org.apache.slide.common.Domain;
import org.apache.slide.common.DomainInitializationFailedError;
import org.apache.slide.common.NamespaceAccessToken;
-import org.apache.slide.common.SlideException;
import org.apache.slide.common.SlideToken;
import org.apache.slide.common.SlideTokenWrapper;
-import org.apache.slide.security.AccessDeniedException;
-import org.apache.slide.structure.LinkedObjectNotFoundException;
-import org.apache.slide.structure.ObjectNotFoundException;
import org.apache.slide.util.logger.Logger;
import org.apache.slide.webdav.util.DirectoryIndexGenerator;
import org.apache.slide.webdav.util.WebdavConstants;
1.4 +29 -9
jakarta-slide/src/stores/org/apache/slide/store/file/SimpleFileStore.java
Index: SimpleFileStore.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/file/SimpleFileStore.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SimpleFileStore.java 20 Sep 2004 12:36:33 -0000 1.3
+++ SimpleFileStore.java 30 Oct 2004 12:48:42 -0000 1.4
@@ -23,12 +23,32 @@
package org.apache.slide.store.file;
-import java.util.*;
-import java.io.*;
-import org.apache.slide.content.*;
-import org.apache.slide.common.*;
-import org.apache.slide.structure.*;
-import org.apache.slide.store.file.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Date;
+import java.util.Hashtable;
+import java.util.Vector;
+
+import org.apache.slide.common.ServiceAccessException;
+import org.apache.slide.common.ServiceParameterErrorException;
+import org.apache.slide.common.ServiceParameterMissingException;
+import org.apache.slide.common.Uri;
+import org.apache.slide.content.NodeRevisionContent;
+import org.apache.slide.content.NodeRevisionDescriptor;
+import org.apache.slide.content.NodeRevisionDescriptors;
+import org.apache.slide.content.NodeRevisionNumber;
+import org.apache.slide.content.RevisionAlreadyExistException;
+import org.apache.slide.content.RevisionDescriptorNotFoundException;
+import org.apache.slide.content.RevisionNotFoundException;
+import org.apache.slide.structure.ObjectAlreadyExistsException;
+import org.apache.slide.structure.ObjectNode;
+import org.apache.slide.structure.ObjectNotFoundException;
+import org.apache.slide.structure.SubjectNode;
/**
* SimpleFileStore implements ContentStore, NodeStore, RevisionDescriptorStore,
1.2 +19 -10
jakarta-slide/src/stores/org/apache/slide/store/file/CountdownStore.java
Index: CountdownStore.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/file/CountdownStore.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CountdownStore.java 20 Sep 2004 07:56:38 -0000 1.1
+++ CountdownStore.java 30 Oct 2004 12:48:42 -0000 1.2
@@ -23,14 +23,23 @@
package org.apache.slide.store.file;
-import java.util.*;
-import javax.transaction.xa.*;
-import org.apache.slide.store.*;
-import org.apache.slide.store.file.*;
-import org.apache.slide.content.*;
-import org.apache.slide.common.*;
-import org.apache.slide.structure.*;
-import org.apache.slide.util.logger.*;
+import java.util.Date;
+import java.util.Hashtable;
+import java.util.Vector;
+
+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.NodeRevisionDescriptors;
+import org.apache.slide.content.NodeRevisionNumber;
+import org.apache.slide.content.RevisionAlreadyExistException;
+import org.apache.slide.content.RevisionDescriptorNotFoundException;
+import org.apache.slide.content.RevisionNotFoundException;
+import org.apache.slide.structure.ObjectAlreadyExistsException;
+import org.apache.slide.structure.ObjectNode;
+import org.apache.slide.structure.ObjectNotFoundException;
+import org.apache.slide.structure.SubjectNode;
/**
* CountdownStore is an AbstractSimpleStore implementation that shows how
1.49 +8 -9 jakarta-slide/src/share/org/apache/slide/macro/MacroImpl.java
Index: MacroImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/macro/MacroImpl.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- MacroImpl.java 29 Oct 2004 13:32:04 -0000 1.48
+++ MacroImpl.java 30 Oct 2004 12:48:42 -0000 1.49
@@ -29,10 +29,10 @@
import java.util.Iterator;
import java.util.Map;
import java.util.StringTokenizer;
+
import org.apache.slide.common.Domain;
import org.apache.slide.common.Namespace;
import org.apache.slide.common.NamespaceConfig;
-import org.apache.slide.common.Scope;
import org.apache.slide.common.ServiceAccessException;
import org.apache.slide.common.SlideException;
import org.apache.slide.common.SlideToken;
@@ -45,6 +45,9 @@
import org.apache.slide.content.NodeRevisionDescriptors;
import org.apache.slide.content.NodeRevisionNumber;
import org.apache.slide.content.RevisionDescriptorNotFoundException;
+import org.apache.slide.event.EventDispatcher;
+import org.apache.slide.event.MacroEvent;
+import org.apache.slide.event.VetoException;
import org.apache.slide.lock.Lock;
import org.apache.slide.lock.NodeLock;
import org.apache.slide.lock.ObjectLockedException;
@@ -61,10 +64,6 @@
import org.apache.slide.structure.ObjectNotFoundException;
import org.apache.slide.structure.Structure;
import org.apache.slide.util.Configuration;
-import org.apache.slide.event.EventDispatcher;
-import org.apache.slide.event.MacroEvent;
-import org.apache.slide.event.StructureEvent;
-import org.apache.slide.event.VetoException;
/**
* Macro helper class.
1.7 +6 -8
jakarta-slide/src/share/org/apache/slide/util/ByteSizeLimitedObjectCache.java
Index: ByteSizeLimitedObjectCache.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/util/ByteSizeLimitedObjectCache.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ByteSizeLimitedObjectCache.java 20 Oct 2004 07:22:44 -0000 1.6
+++ ByteSizeLimitedObjectCache.java 30 Oct 2004 12:48:42 -0000 1.7
@@ -25,14 +25,12 @@
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import java.util.Iterator;
-
-import org.apache.slide.util.TxLRUObjectCache.TimeoutValuePair;
-import org.apache.slide.util.logger.Logger;
import org.apache.commons.collections.LRUMap;
+import org.apache.slide.util.logger.Logger;
/**
* Transactional LRU byte counting object cache. Caches objects using a
least-recently-used strategy.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
