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 21:49:26 UTC
svn commit: r1035442 - /incubator/river/jtsk/trunk/src/com/sun/jini/start/
Author: sijskes
Date: Mon Nov 15 20:49:25 2010
New Revision: 1035442
URL: http://svn.apache.org/viewvc?rev=1035442&view=rev
Log:
fixed imports
Modified:
incubator/river/jtsk/trunk/src/com/sun/jini/start/ActivateWrapper.java
incubator/river/jtsk/trunk/src/com/sun/jini/start/ClassLoaderUtil.java
incubator/river/jtsk/trunk/src/com/sun/jini/start/DestroySharedGroup.java
incubator/river/jtsk/trunk/src/com/sun/jini/start/HTTPDStatus.java
incubator/river/jtsk/trunk/src/com/sun/jini/start/NonActivatableServiceDescriptor.java
incubator/river/jtsk/trunk/src/com/sun/jini/start/ServiceStarter.java
incubator/river/jtsk/trunk/src/com/sun/jini/start/SharedActivationGroupDescriptor.java
incubator/river/jtsk/trunk/src/com/sun/jini/start/SharedActivationPolicyPermission.java
incubator/river/jtsk/trunk/src/com/sun/jini/start/SharedGroupImpl.java
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/start/ActivateWrapper.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/start/ActivateWrapper.java?rev=1035442&r1=1035441&r2=1035442&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/start/ActivateWrapper.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/start/ActivateWrapper.java Mon Nov 15 20:49:25 2010
@@ -18,8 +18,6 @@
package com.sun.jini.start;
-import net.jini.config.Configuration;
-import net.jini.config.ConfigurationException;
import net.jini.export.ProxyAccessor;
import net.jini.id.Uuid;
import net.jini.id.UuidFactory;
@@ -30,49 +28,31 @@ import net.jini.security.policy.PolicyFi
import java.io.InvalidObjectException;
import java.io.ObjectStreamException;
-import java.io.PrintWriter;
import java.io.Serializable;
import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
import java.net.URL;
-import java.net.URLClassLoader;
import java.rmi.MarshalException;
import java.rmi.MarshalledObject;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import java.rmi.StubNotFoundException;
-import java.rmi.UnmarshalException;
import java.rmi.activation.Activatable;
import java.rmi.activation.ActivationDesc;
import java.rmi.activation.ActivationException;
-import java.rmi.activation.ActivationGroup;
import java.rmi.activation.ActivationGroupID;
import java.rmi.activation.ActivationID;
import java.rmi.activation.ActivationSystem;
-import java.rmi.server.RMIClassLoader;
-import java.rmi.server.RemoteObject;
-import java.rmi.server.RemoteRef;
import java.security.AccessController;
import java.security.AllPermission;
import java.security.cert.Certificate;
import java.security.CodeSource;
import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
import java.security.Policy;
-import java.security.Principal;
import java.security.PrivilegedAction;
import java.security.ProtectionDomain;
import java.security.Security;
import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
-import java.util.Map;
-import java.util.StringTokenizer;
-import java.util.WeakHashMap;
/**
* A wrapper for activatable objects, providing separation of the import
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/start/ClassLoaderUtil.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/start/ClassLoaderUtil.java?rev=1035442&r1=1035441&r2=1035442&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/start/ClassLoaderUtil.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/start/ClassLoaderUtil.java Mon Nov 15 20:49:25 2010
@@ -20,28 +20,17 @@ package com.sun.jini.start;
import java.io.File;
import java.io.IOException;
-import java.lang.reflect.Method;
-
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.rmi.activation.ActivationException;
-import java.rmi.activation.ActivationID;
-
import java.security.SecureClassLoader;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
-import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.StringTokenizer;
-import net.jini.loader.ClassAnnotation;
-
/**
* This class provides useful utilities for creating and
* manipulating class loaders.
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/start/DestroySharedGroup.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/start/DestroySharedGroup.java?rev=1035442&r1=1035441&r2=1035442&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/start/DestroySharedGroup.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/start/DestroySharedGroup.java Mon Nov 15 20:49:25 2010
@@ -15,32 +15,28 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package com.sun.jini.start;
-import com.sun.jini.start.ServiceStarter;
-import com.sun.jini.start.ServiceDescriptor;
-import com.sun.jini.start.SharedActivatableServiceDescriptor;
import com.sun.jini.start.SharedActivatableServiceDescriptor.Created;
import net.jini.config.Configuration;
import net.jini.config.ConfigurationProvider;
import net.jini.config.ConfigurationException;
import java.io.File;
-import java.rmi.activation.ActivationException;
import java.rmi.activation.ActivationSystem;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.Arrays;
-import java.util.Iterator;
import java.util.logging.Level;
import java.util.logging.Logger;
-import java.util.MissingResourceException;
import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
import javax.security.auth.Subject;
import com.sun.jini.system.FileSystem;
+
/**
* This class contains the command-line interface for
* destroying an instance of a shared activation group.
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/start/HTTPDStatus.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/start/HTTPDStatus.java?rev=1035442&r1=1035441&r2=1035442&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/start/HTTPDStatus.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/start/HTTPDStatus.java Mon Nov 15 20:49:25 2010
@@ -15,27 +15,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package com.sun.jini.start;
-import java.net.ConnectException;
-import java.net.InetAddress;
import java.net.MalformedURLException;
-import java.net.Socket;
-import java.net.SocketException;
-import java.net.UnknownHostException;
import java.net.URL;
import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.DataOutputStream;
-import java.io.File;
import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.InterruptedIOException;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
-import java.util.MissingResourceException;
import java.util.StringTokenizer;
/**
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/start/NonActivatableServiceDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/start/NonActivatableServiceDescriptor.java?rev=1035442&r1=1035441&r2=1035442&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/start/NonActivatableServiceDescriptor.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/start/NonActivatableServiceDescriptor.java Mon Nov 15 20:49:25 2010
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package com.sun.jini.start;
import com.sun.jini.config.Config;
@@ -33,7 +34,6 @@ import java.io.ObjectInputStream;
import java.io.ObjectStreamException;
import java.io.Serializable;
import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
import java.net.URLClassLoader;
import java.rmi.MarshalledObject;
import java.security.Permission;
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/start/ServiceStarter.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/start/ServiceStarter.java?rev=1035442&r1=1035441&r2=1035442&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/start/ServiceStarter.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/start/ServiceStarter.java Mon Nov 15 20:49:25 2010
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package com.sun.jini.start;
import com.sun.jini.config.Config;
@@ -22,16 +23,12 @@ import com.sun.jini.config.Config;
import net.jini.config.Configuration;
import net.jini.config.ConfigurationException;
import net.jini.config.ConfigurationProvider;
-import net.jini.config.NoSuchEntryException;
import net.jini.security.BasicProxyPreparer;
import net.jini.security.ProxyPreparer;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
import java.rmi.activation.ActivationException;
import java.rmi.activation.ActivationSystem;
import java.rmi.Naming;
-import java.rmi.RemoteException;
import java.rmi.RMISecurityManager;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/start/SharedActivationGroupDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/start/SharedActivationGroupDescriptor.java?rev=1035442&r1=1035441&r2=1035442&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/start/SharedActivationGroupDescriptor.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/start/SharedActivationGroupDescriptor.java Mon Nov 15 20:49:25 2010
@@ -15,13 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.sun.jini.start;
-import com.sun.jini.config.Config;
+package com.sun.jini.start;
import net.jini.config.Configuration;
-import net.jini.security.BasicProxyPreparer;
-import net.jini.security.ProxyPreparer;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
@@ -34,7 +31,6 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.ObjectStreamException;
import java.io.Serializable;
-import java.rmi.activation.ActivationDesc;
import java.rmi.activation.ActivationException;
import java.rmi.activation.ActivationGroupDesc;
import java.rmi.activation.ActivationGroupDesc.CommandEnvironment;
@@ -43,7 +39,6 @@ import java.rmi.activation.ActivationSys
import java.rmi.MarshalledObject;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.Properties;
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/start/SharedActivationPolicyPermission.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/start/SharedActivationPolicyPermission.java?rev=1035442&r1=1035441&r2=1035442&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/start/SharedActivationPolicyPermission.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/start/SharedActivationPolicyPermission.java Mon Nov 15 20:49:25 2010
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package com.sun.jini.start;
import java.io.File;
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/start/SharedGroupImpl.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/start/SharedGroupImpl.java?rev=1035442&r1=1035441&r2=1035442&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/start/SharedGroupImpl.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/start/SharedGroupImpl.java Mon Nov 15 20:49:25 2010
@@ -17,8 +17,6 @@
*/
package com.sun.jini.start;
-import com.sun.jini.constants.TimeConstants;
-import com.sun.jini.system.FileSystem;
import net.jini.activation.ActivationExporter;
import net.jini.config.Configuration;
import net.jini.config.ConfigurationProvider;
@@ -34,21 +32,13 @@ import net.jini.security.ProxyPreparer;
import net.jini.security.TrustVerifier;
import net.jini.security.proxytrust.ServerProxyTrust;
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
import java.rmi.MarshalledObject;
-import java.rmi.NoSuchObjectException;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import java.rmi.activation.Activatable;
import java.rmi.activation.ActivationGroup;
-import java.rmi.activation.ActivationGroupID;
import java.rmi.activation.ActivationID;
import java.rmi.activation.ActivationSystem;
import java.rmi.activation.ActivationException;
-import java.rmi.server.UnicastRemoteObject;
-import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.logging.Level;
@@ -56,7 +46,6 @@ import java.util.logging.Logger;
import javax.security.auth.Subject;
import javax.security.auth.login.LoginContext;
-import javax.security.auth.login.LoginException;
/**
* The provided implementation