river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sijs...@apache.org
Subject svn commit: r1035468 - /incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/
Date Mon, 15 Nov 2010 21:42:32 GMT
Author: sijskes
Date: Mon Nov 15 21:42:31 2010
New Revision: 1035468

URL: http://svn.apache.org/viewvc?rev=1035468&view=rev
Log:
fixed imports

Modified:
    incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/ParticipantTask.java
    incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/PrepareAndCommitJob.java
    incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/PrepareAndCommitRecord.java
    incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/PrepareJob.java
    incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/PrepareRecord.java
    incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/ProxyVerifier.java
    incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/SettlerTask.java
    incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/StorableObject.java
    incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/TxnLogRecord.java
    incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/TxnManager.java
    incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/TxnManagerImpl.java
    incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/TxnManagerTransaction.java

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=1035468&r1=1035467&r2=1035468&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:42:31
2010
@@ -17,13 +17,13 @@
  */
 package com.sun.jini.mahalo;
 
-import net.jini.core.transaction.server.*;
-
-import com.sun.jini.thread.*;
-
-import java.util.*;
+import com.sun.jini.thread.RetryTask;
+import com.sun.jini.thread.TaskManager;
+import com.sun.jini.thread.WakeupManager;
+import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import net.jini.core.transaction.server.TransactionParticipant;
 
 /**
  * A <code>ParticipantTask</code> is a general task which

Modified: incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/PrepareAndCommitJob.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/PrepareAndCommitJob.java?rev=1035468&r1=1035467&r2=1035468&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/PrepareAndCommitJob.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/PrepareAndCommitJob.java Mon Nov 15
21:42:31 2010
@@ -17,17 +17,18 @@
  */
 package com.sun.jini.mahalo;
 
-import net.jini.core.transaction.*;
-import net.jini.core.transaction.server.*;
-
 import com.sun.jini.logging.Levels;
-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.RemoteException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import net.jini.core.transaction.Transaction;
+import net.jini.core.transaction.UnknownTransactionException;
+import net.jini.core.transaction.server.ServerTransaction;
+import net.jini.core.transaction.server.TransactionConstants;
+import net.jini.core.transaction.server.TransactionParticipant;
 
 
 /**

Modified: incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/PrepareAndCommitRecord.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/PrepareAndCommitRecord.java?rev=1035468&r1=1035467&r2=1035468&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/PrepareAndCommitRecord.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/PrepareAndCommitRecord.java Mon Nov
15 21:42:31 2010
@@ -15,14 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.sun.jini.mahalo;
 
-import com.sun.jini.mahalo.log.*;
+package com.sun.jini.mahalo;
 
-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 perform the prepareAndCommit optimization.

Modified: incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/PrepareJob.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/PrepareJob.java?rev=1035468&r1=1035467&r2=1035468&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/PrepareJob.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/PrepareJob.java Mon Nov 15 21:42:31
2010
@@ -15,19 +15,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.sun.jini.mahalo;
-
-import net.jini.core.transaction.*;
-import net.jini.core.transaction.server.*;
 
-import com.sun.jini.logging.Levels;
-import com.sun.jini.mahalo.*;
-import com.sun.jini.mahalo.log.*;
-import com.sun.jini.thread.*;
+package com.sun.jini.mahalo;
 
+import com.sun.jini.mahalo.log.ClientLog;
+import com.sun.jini.thread.TaskManager;
+import com.sun.jini.thread.WakeupManager;
 import java.rmi.RemoteException;
 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/PrepareRecord.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/PrepareRecord.java?rev=1035468&r1=1035467&r2=1035468&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/PrepareRecord.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/PrepareRecord.java Mon Nov 15 21:42:31
2010
@@ -15,14 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.sun.jini.mahalo;
 
-import com.sun.jini.mahalo.log.*;
+package com.sun.jini.mahalo;
 
-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 vote.

Modified: incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/ProxyVerifier.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/ProxyVerifier.java?rev=1035468&r1=1035467&r2=1035468&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/ProxyVerifier.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/ProxyVerifier.java Mon Nov 15 21:42:31
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 com.sun.jini.landlord.ConstrainableLandlordLease;

Modified: incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/SettlerTask.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/SettlerTask.java?rev=1035468&r1=1035467&r2=1035468&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/SettlerTask.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/SettlerTask.java Mon Nov 15 21:42:31
2010
@@ -17,19 +17,18 @@
  */
 package com.sun.jini.mahalo;
 
-import net.jini.core.transaction.*;
-import net.jini.core.transaction.server.*;
-
 import com.sun.jini.logging.Levels;
-import com.sun.jini.mahalo.*;
-import com.sun.jini.mahalo.log.*;
-import com.sun.jini.thread.*;
-
+import com.sun.jini.thread.RetryTask;
+import com.sun.jini.thread.TaskManager;
+import com.sun.jini.thread.WakeupManager;
 import java.rmi.RemoteException;
 import java.rmi.NoSuchObjectException;
-import java.util.*;
+import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import net.jini.core.transaction.TransactionException;
+import net.jini.core.transaction.server.TransactionConstants;
+import net.jini.core.transaction.server.TransactionManager;
 
 /**
  * A <code>SettlerTask</code> is scheduled task, which

Modified: incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/StorableObject.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/StorableObject.java?rev=1035468&r1=1035467&r2=1035468&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/StorableObject.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/StorableObject.java Mon Nov 15 21:42:31
2010
@@ -15,10 +15,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.sun.jini.mahalo;
 
 import java.io.IOException;
-import java.rmi.*;
+import java.rmi.MarshalledObject;
+import java.rmi.RemoteException;
+
 
 /**
  * This class holds a <code>MarshalledObject</code> that can be stored

Modified: incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/TxnLogRecord.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/TxnLogRecord.java?rev=1035468&r1=1035467&r2=1035468&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/TxnLogRecord.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/TxnLogRecord.java Mon Nov 15 21:42:31
2010
@@ -17,12 +17,10 @@
  */
 package com.sun.jini.mahalo;
 
-import com.sun.jini.mahalo.log.*;
-
-import net.jini.core.transaction.server.TransactionManager;
+import com.sun.jini.mahalo.log.CannotRecoverException;
+import com.sun.jini.mahalo.log.LogRecord;
 import net.jini.core.transaction.server.TransactionConstants;
 
-import java.rmi.RemoteException;
 /**
  * A <code>LogRecord</code> which encapsulates a generic
  * transactional logging information.

Modified: incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/TxnManager.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/TxnManager.java?rev=1035468&r1=1035467&r2=1035468&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/TxnManager.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/TxnManager.java Mon Nov 15 21:42:31
2010
@@ -19,16 +19,14 @@ package com.sun.jini.mahalo;
 
 import net.jini.admin.Administrable;
 import net.jini.admin.JoinAdmin;
-import net.jini.core.transaction.*;
-import net.jini.core.transaction.server.*;
-
 import com.sun.jini.admin.DestroyAdmin;
 import com.sun.jini.landlord.Landlord;
 import com.sun.jini.start.ServiceProxyAccessor;
-
-import java.rmi.*;
-import java.util.logging.Logger;
-import java.security.AccessController;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+import net.jini.core.transaction.Transaction;
+import net.jini.core.transaction.UnknownTransactionException;
+import net.jini.core.transaction.server.TransactionManager;
 
 /**
  * Encapsulates the interface of an implementation of

Modified: incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/TxnManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/TxnManagerImpl.java?rev=1035468&r1=1035467&r2=1035468&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/TxnManagerImpl.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mahalo/TxnManagerImpl.java Mon Nov 15 21:42:31
2010
@@ -27,31 +27,37 @@ import com.sun.jini.landlord.LeasePeriod
 import com.sun.jini.landlord.LeasePeriodPolicy.Result;
 import com.sun.jini.landlord.LocalLandlord;
 import com.sun.jini.logging.Levels;
-import com.sun.jini.mahalo.log.*;
+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.mahalo.log.LogRecord;
+import com.sun.jini.mahalo.log.LogRecovery;
+import com.sun.jini.mahalo.log.MultiLogManager;
+import com.sun.jini.mahalo.log.MultiLogManagerAdmin;
 import com.sun.jini.start.LifeCycle;
 import com.sun.jini.thread.InterruptedStatusThread;
 import com.sun.jini.thread.ReadyState;
 import com.sun.jini.thread.TaskManager;
 import com.sun.jini.thread.WakeupManager;
 
-import net.jini.core.discovery.LookupLocator;
-import net.jini.core.entry.*;
-import net.jini.core.lease.*;
-import net.jini.id.Uuid;
-import net.jini.id.UuidFactory;
-import net.jini.lookup.entry.*;
-import net.jini.core.transaction.*;
-import net.jini.core.transaction.server.*;
-
-
-import java.util.*;
 import java.io.File;
 import java.io.IOException;
-import java.rmi.*;
-import java.rmi.activation.*;
+import java.rmi.MarshalledObject;
+import java.rmi.RemoteException;
+import java.rmi.activation.Activatable;
+import java.rmi.activation.ActivationException;
+import java.rmi.activation.ActivationGroup;
+import java.rmi.activation.ActivationID;
+import java.rmi.activation.ActivationSystem;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 import java.security.SecureRandom;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Vector;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -63,12 +69,32 @@ import net.jini.activation.ActivationExp
 import net.jini.config.Configuration;
 import net.jini.config.ConfigurationProvider;
 import net.jini.core.constraint.RemoteMethodControl;
+import net.jini.core.discovery.LookupLocator;
+import net.jini.core.entry.Entry;
+import net.jini.core.lease.Lease;
+import net.jini.core.lease.LeaseDeniedException;
+import net.jini.core.lease.UnknownLeaseException;
 import net.jini.core.lookup.ServiceID;
+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.UnknownTransactionException;
+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.export.Exporter;
 import net.jini.export.ProxyAccessor;
+import net.jini.id.Uuid;
+import net.jini.id.UuidFactory;
 import net.jini.jeri.BasicILFactory;
 import net.jini.jeri.BasicJeriExporter;
 import net.jini.jeri.tcp.TcpServerEndpoint;
+import net.jini.lookup.entry.ServiceInfo;
 import net.jini.security.BasicProxyPreparer;
 import net.jini.security.ProxyPreparer;
 import net.jini.security.proxytrust.ServerProxyTrust;

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=1035468&r1=1035467&r2=1035468&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:42:31 2010
@@ -18,7 +18,6 @@
 package com.sun.jini.mahalo;
 
 import net.jini.id.Uuid;
-import net.jini.core.lease.Lease;
 import net.jini.core.transaction.*;
 import net.jini.core.transaction.server.*;
 import net.jini.security.ProxyPreparer;
@@ -32,18 +31,13 @@ import com.sun.jini.logging.Levels;
 import com.sun.jini.thread.TaskManager;
 import com.sun.jini.thread.WakeupManager;
 
-import java.rmi.MarshalledObject;
 import java.rmi.RemoteException;
 import java.util.Enumeration;
 
-import java.util.Collections;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.Map;
 import java.util.Vector;
 
 /**



Mime
View raw message