You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by si...@apache.org on 2010/11/15 22:47:11 UTC
svn commit: r1035470 - in
/incubator/river/jtsk/trunk/src/com/sun/jini/mahalo:
TxnManagerTransaction.java TxnMgrAdminProxy.java TxnMgrProxy.java
UnknownTaskException.java log/MultiLogManager.java log/SimpleLogFile.java
log/TransientLogFile.java
Author: sijskes
Date: Mon Nov 15 21:47:11 2010
New Revision: 1035470
URL: http://svn.apache.org/viewvc?rev=1035470&view=rev
Log:
fixed imports
Modified:
incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/TxnManagerTransaction.java
incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/TxnMgrAdminProxy.java
incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/TxnMgrProxy.java
incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/UnknownTaskException.java
incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/log/MultiLogManager.java
incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/log/SimpleLogFile.java
incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/log/TransientLogFile.java
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/TxnManagerTransaction.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/TxnManagerTransaction.java?rev=1035470&r1=1035469&r2=1035470&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/TxnManagerTransaction.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/TxnManagerTransaction.java Mon Nov 15 21:47:11 2010
@@ -15,19 +15,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.sun.jini.mahalo;
-
-import net.jini.id.Uuid;
-import net.jini.core.transaction.*;
-import net.jini.core.transaction.server.*;
-import net.jini.security.ProxyPreparer;
-import com.sun.jini.mahalo.log.*;
+package com.sun.jini.mahalo;
import com.sun.jini.constants.TimeConstants;
import com.sun.jini.constants.TxnConstants;
import com.sun.jini.landlord.LeasedResource;
import com.sun.jini.logging.Levels;
+import com.sun.jini.mahalo.log.ClientLog;
+import com.sun.jini.mahalo.log.LogException;
+import com.sun.jini.mahalo.log.LogManager;
import com.sun.jini.thread.TaskManager;
import com.sun.jini.thread.WakeupManager;
@@ -40,6 +37,20 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.Vector;
+import net.jini.core.transaction.CannotAbortException;
+import net.jini.core.transaction.CannotCommitException;
+import net.jini.core.transaction.CannotJoinException;
+import net.jini.core.transaction.TimeoutExpiredException;
+import net.jini.core.transaction.Transaction;
+import net.jini.core.transaction.TransactionException;
+import net.jini.core.transaction.server.CrashCountException;
+import net.jini.core.transaction.server.ServerTransaction;
+import net.jini.core.transaction.server.TransactionConstants;
+import net.jini.core.transaction.server.TransactionManager;
+import net.jini.core.transaction.server.TransactionParticipant;
+import net.jini.id.Uuid;
+import net.jini.security.ProxyPreparer;
+
/**
* TxnManagerTransaction is a class which
* captures the internal representation of a transaction
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/TxnMgrAdminProxy.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/TxnMgrAdminProxy.java?rev=1035470&r1=1035469&r2=1035470&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/TxnMgrAdminProxy.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/TxnMgrAdminProxy.java Mon Nov 15 21:47:11 2010
@@ -26,7 +26,6 @@ import net.jini.id.Uuid;
import net.jini.security.proxytrust.ProxyTrustIterator;
import net.jini.security.proxytrust.SingletonProxyTrustIterator;
-import java.lang.reflect.Method;
import java.io.InvalidObjectException;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -34,7 +33,6 @@ import java.io.ObjectStreamException;
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.security.auth.Subject;
import net.jini.admin.JoinAdmin;
import net.jini.core.discovery.LookupLocator;
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/TxnMgrProxy.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/TxnMgrProxy.java?rev=1035470&r1=1035469&r2=1035470&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/TxnMgrProxy.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/TxnMgrProxy.java Mon Nov 15 21:47:11 2010
@@ -17,17 +17,14 @@
*/
package com.sun.jini.mahalo;
-import com.sun.jini.proxy.ThrowThis;
import net.jini.core.constraint.MethodConstraints;
import net.jini.core.constraint.RemoteMethodControl;
import net.jini.id.ReferentUuid;
import net.jini.id.ReferentUuids;
import net.jini.id.Uuid;
-import net.jini.security.TrustVerifier;
import net.jini.security.proxytrust.ProxyTrustIterator;
import net.jini.security.proxytrust.SingletonProxyTrustIterator;
-import java.lang.reflect.Method;
import java.io.IOException;
import java.io.InvalidObjectException;
import java.io.ObjectInputStream;
@@ -35,10 +32,7 @@ import java.io.ObjectStreamException;
import java.io.Serializable;
import java.rmi.RemoteException;
-import javax.security.auth.Subject;
-
import net.jini.admin.Administrable;
-import net.jini.core.lease.Lease;
import net.jini.core.lease.LeaseDeniedException;
import net.jini.core.transaction.server.CrashCountException;
import net.jini.core.transaction.server.TransactionManager;
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/UnknownTaskException.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/UnknownTaskException.java?rev=1035470&r1=1035469&r2=1035470&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/UnknownTaskException.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/UnknownTaskException.java Mon Nov 15 21:47:11 2010
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package com.sun.jini.mahalo;
/**
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/log/MultiLogManager.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/log/MultiLogManager.java?rev=1035470&r1=1035469&r2=1035470&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/log/MultiLogManager.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/log/MultiLogManager.java Mon Nov 15 21:47:11 2010
@@ -15,19 +15,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package com.sun.jini.mahalo.log;
import com.sun.jini.logging.Levels;
import com.sun.jini.mahalo.TxnManager;
import com.sun.jini.system.FileSystem;
+import java.io.File;
+import java.io.FilenameFilter;
import net.jini.admin.Administrable;
-import java.io.*;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.util.Arrays;
import java.util.logging.Level;
import java.util.logging.Logger;
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/log/SimpleLogFile.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/log/SimpleLogFile.java?rev=1035470&r1=1035469&r2=1035470&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/log/SimpleLogFile.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/log/SimpleLogFile.java Mon Nov 15 21:47:11 2010
@@ -15,18 +15,30 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package com.sun.jini.mahalo.log;
import com.sun.jini.logging.Levels;
import com.sun.jini.mahalo.log.MultiLogManager.LogRemovalManager;
import com.sun.jini.mahalo.TxnManager;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.EOFException;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InvalidClassException;
+import java.io.NotSerializableException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.OutputStream;
import java.util.ArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
-import java.io.*;
-
/**
* An implementation of a re-usable <code>Log</code>.
*
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/log/TransientLogFile.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/log/TransientLogFile.java?rev=1035470&r1=1035469&r2=1035470&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/log/TransientLogFile.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/log/TransientLogFile.java Mon Nov 15 21:47:11 2010
@@ -15,18 +15,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package com.sun.jini.mahalo.log;
-import com.sun.jini.logging.Levels;
import com.sun.jini.mahalo.log.MultiLogManager.LogRemovalManager;
import com.sun.jini.mahalo.TxnManager;
-import java.util.ArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
-import java.io.*;
-
/**
* An implementation of a non-persistent <code>Log</code>.
*