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:32:03 UTC
svn commit: r1035464 - /incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/
Author: sijskes
Date: Mon Nov 15 21:32:03 2010
New Revision: 1035464
URL: http://svn.apache.org/viewvc?rev=1035464&view=rev
Log:
fixed imports
Modified:
incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/AbortJob.java
incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/AbortRecord.java
incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/CommitJob.java
incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/CommitRecord.java
incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/Job.java
incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/JoinStateManager.java
incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/LeaseExpirationMgr.java
incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/ParticipantAbortRecord.java
incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/ParticipantCommitRecord.java
incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/ParticipantHandle.java
incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/ParticipantModRecord.java
incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/ParticipantTask.java
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/AbortJob.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/AbortJob.java?rev=1035464&r1=1035463&r2=1035464&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/AbortJob.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/AbortJob.java Mon Nov 15 21:32:03 2010
@@ -17,27 +17,26 @@
*/
package com.sun.jini.mahalo;
-import net.jini.core.transaction.*;
-import net.jini.core.transaction.server.*;
-
-import com.sun.jini.mahalo.*;
-import com.sun.jini.mahalo.log.*;
-import com.sun.jini.thread.*;
+import com.sun.jini.mahalo.log.ClientLog;
+import com.sun.jini.thread.TaskManager;
+import com.sun.jini.thread.WakeupManager;
import java.rmi.activation.ActivateFailedException;
import java.rmi.RemoteException;
import java.rmi.NoSuchObjectException;
import java.rmi.MarshalException;
-import java.rmi.StubNotFoundException;
-import java.rmi.UnexpectedException;
import java.rmi.UnknownHostException;
-import java.rmi.UnmarshalException;
import java.rmi.ConnectIOException;
import java.rmi.AccessException;
import java.rmi.ConnectException;
import java.util.logging.Level;
import java.util.logging.Logger;
+import net.jini.core.transaction.Transaction;
+import net.jini.core.transaction.TransactionException;
+import net.jini.core.transaction.server.ServerTransaction;
+import net.jini.core.transaction.server.TransactionConstants;
+import net.jini.core.transaction.server.TransactionParticipant;
/**
* An implementation of a <code>com.sun.jini.mahalo.Job</code> which
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/AbortRecord.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/AbortRecord.java?rev=1035464&r1=1035463&r2=1035464&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/AbortRecord.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/AbortRecord.java Mon Nov 15 21:32:03 2010
@@ -17,11 +17,7 @@
*/
package com.sun.jini.mahalo;
-import com.sun.jini.mahalo.log.*;
-
-import net.jini.core.transaction.server.TransactionManager;
-
-import java.io.Serializable;
+import com.sun.jini.mahalo.log.CannotRecoverException;
import java.util.logging.Level;
import java.util.logging.Logger;
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/CommitJob.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/CommitJob.java?rev=1035464&r1=1035463&r2=1035464&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/CommitJob.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/CommitJob.java Mon Nov 15 21:32:03 2010
@@ -17,27 +17,26 @@
*/
package com.sun.jini.mahalo;
-import net.jini.core.transaction.*;
-import net.jini.core.transaction.server.*;
-
-import com.sun.jini.mahalo.*;
-import com.sun.jini.mahalo.log.*;
-import com.sun.jini.thread.*;
+import com.sun.jini.mahalo.log.ClientLog;
+import com.sun.jini.thread.TaskManager;
+import com.sun.jini.thread.WakeupManager;
import java.rmi.activation.ActivateFailedException;
import java.rmi.RemoteException;
import java.rmi.NoSuchObjectException;
import java.rmi.MarshalException;
-import java.rmi.StubNotFoundException;
-import java.rmi.UnexpectedException;
import java.rmi.UnknownHostException;
-import java.rmi.UnmarshalException;
import java.rmi.ConnectIOException;
import java.rmi.AccessException;
import java.rmi.ConnectException;
import java.util.logging.Level;
import java.util.logging.Logger;
+import net.jini.core.transaction.Transaction;
+import net.jini.core.transaction.TransactionException;
+import net.jini.core.transaction.server.ServerTransaction;
+import net.jini.core.transaction.server.TransactionConstants;
+import net.jini.core.transaction.server.TransactionParticipant;
/**
* An implementation of a <code>Job</code> which interacts with
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/CommitRecord.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/CommitRecord.java?rev=1035464&r1=1035463&r2=1035464&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/CommitRecord.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/CommitRecord.java Mon Nov 15 21:32:03 2010
@@ -17,14 +17,9 @@
*/
package com.sun.jini.mahalo;
-import com.sun.jini.mahalo.log.*;
-
+import com.sun.jini.mahalo.log.CannotRecoverException;
import net.jini.core.transaction.server.TransactionParticipant;
-import net.jini.core.transaction.server.TransactionManager;
-
-import com.sun.jini.mahalo.ParticipantHandle;
-import java.io.Serializable;
import java.util.logging.Level;
import java.util.logging.Logger;
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/Job.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/Job.java?rev=1035464&r1=1035463&r2=1035464&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/Job.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/Job.java Mon Nov 15 21:32:03 2010
@@ -17,10 +17,11 @@
*/
package com.sun.jini.mahalo;
-import com.sun.jini.mahalo.*;
-import com.sun.jini.thread.*;
-
-import java.util.*;
+import com.sun.jini.thread.TaskManager;
+import com.sun.jini.thread.WakeupManager;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/JoinStateManager.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/JoinStateManager.java?rev=1035464&r1=1035463&r2=1035464&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/JoinStateManager.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/JoinStateManager.java Mon Nov 15 21:32:03 2010
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package com.sun.jini.mahalo;
import java.io.IOException;
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/LeaseExpirationMgr.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/LeaseExpirationMgr.java?rev=1035464&r1=1035463&r2=1035464&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/LeaseExpirationMgr.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/LeaseExpirationMgr.java Mon Nov 15 21:32:03 2010
@@ -15,10 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package com.sun.jini.mahalo;
-import java.util.Map;
-import java.rmi.RemoteException;
import java.lang.ref.WeakReference;
import net.jini.core.lease.UnknownLeaseException;
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/ParticipantAbortRecord.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/ParticipantAbortRecord.java?rev=1035464&r1=1035463&r2=1035464&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/ParticipantAbortRecord.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/ParticipantAbortRecord.java Mon Nov 15 21:32:03 2010
@@ -17,12 +17,6 @@
*/
package com.sun.jini.mahalo;
-import com.sun.jini.mahalo.log.*;
-
-import com.sun.jini.mahalo.ParticipantHandle;
-import net.jini.core.transaction.server.TransactionManager;
-import net.jini.core.transaction.server.TransactionParticipant;
-import java.io.Serializable;
/**
* A <code>LogRecord</code> which encapsulates a participant
* being instructed to roll-back.
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/ParticipantCommitRecord.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/ParticipantCommitRecord.java?rev=1035464&r1=1035463&r2=1035464&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/ParticipantCommitRecord.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/ParticipantCommitRecord.java Mon Nov 15 21:32:03 2010
@@ -17,14 +17,6 @@
*/
package com.sun.jini.mahalo;
-import com.sun.jini.mahalo.log.*;
-
-import com.sun.jini.mahalo.ParticipantHandle;
-import net.jini.core.transaction.server.TransactionManager;
-import net.jini.core.transaction.server.TransactionParticipant;
-import java.io.Serializable;
-
-
/**
* A <code>LogRecord</code> which encapsulates a participant
* being instructed to roll-forward.
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/ParticipantHandle.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/ParticipantHandle.java?rev=1035464&r1=1035463&r2=1035464&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/ParticipantHandle.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/ParticipantHandle.java Mon Nov 15 21:32:03 2010
@@ -17,17 +17,13 @@
*/
package com.sun.jini.mahalo;
-import com.sun.jini.logging.Levels;
-
-import net.jini.core.transaction.*;
-import net.jini.core.transaction.server.*;
import net.jini.security.ProxyPreparer;
-
-
import java.io.Serializable;
import java.rmi.RemoteException;
import java.util.logging.Level;
import java.util.logging.Logger;
+import net.jini.core.transaction.server.TransactionConstants;
+import net.jini.core.transaction.server.TransactionParticipant;
/**
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/ParticipantModRecord.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/ParticipantModRecord.java?rev=1035464&r1=1035463&r2=1035464&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/ParticipantModRecord.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/ParticipantModRecord.java Mon Nov 15 21:32:03 2010
@@ -17,12 +17,7 @@
*/
package com.sun.jini.mahalo;
-import com.sun.jini.mahalo.log.*;
-
-import com.sun.jini.mahalo.ParticipantHandle;
-import net.jini.core.transaction.server.TransactionManager;
-import net.jini.core.transaction.server.TransactionParticipant;
-import java.io.Serializable;
+import com.sun.jini.mahalo.log.CannotRecoverException;
import java.util.logging.Level;
import java.util.logging.Logger;
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/ParticipantTask.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/ParticipantTask.java?rev=1035464&r1=1035463&r2=1035464&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/ParticipantTask.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/ParticipantTask.java Mon Nov 15 21:32:03 2010
@@ -17,11 +17,8 @@
*/
package com.sun.jini.mahalo;
-import net.jini.core.transaction.*;
import net.jini.core.transaction.server.*;
-import com.sun.jini.mahalo.*;
-import com.sun.jini.mahalo.log.*;
import com.sun.jini.thread.*;
import java.util.*;