JBoss Remoting SVN: r3826 - remoting2/branches/2.x/src/main/org/jboss/remoting/callback.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-04-01 23:29:52 -0400 (Tue, 01 Apr 2008)
New Revision: 3826
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/callback/CallbackStore.java
Log:
JBREM-934: (1) Put File.delete() and new FileOutputStream() in AccessController.doPrivileged() calls; (2) replace System.getProperty() with SystemUtility.getSystemProperty().
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/callback/CallbackStore.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/callback/CallbackStore.java 2008-04-02 03:07:03 UTC (rev 3825)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/callback/CallbackStore.java 2008-04-02 03:29:52 UTC (rev 3826)
@@ -24,8 +24,11 @@
import org.jboss.logging.Logger;
import org.jboss.remoting.InvokerLocator;
import org.jboss.remoting.serialization.SerializationStreamFactory;
+import org.jboss.remoting.util.SystemUtility;
+
import java.io.File;
import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.FilenameFilter;
import java.io.IOException;
@@ -205,9 +208,18 @@
{
try
{
- fileToDelete = filePath + System.getProperty("file.separator") + fileList[x];
- File currentFile = new File(fileToDelete);
- boolean deleted = currentFile.delete();
+ String separator = SystemUtility.getSystemProperty("file.separator");
+ fileToDelete = filePath + separator + fileList[x];
+ final File currentFile = new File(fileToDelete);
+
+ boolean deleted = ((Boolean)AccessController.doPrivileged( new PrivilegedAction()
+ {
+ public Object run()
+ {
+ return new Boolean(currentFile.delete());
+ }
+ })).booleanValue();
+
if (!deleted)
{
log.warn("Error purging file " + fileToDelete);
@@ -346,7 +358,8 @@
{
// only getting the first one, which will be first one entered since the getting
// of the list is automatically ordered by the OS and all file names are numeric by time.
- objectFilePath = filePath + System.getProperty("file.separator") + objectFileList[0];
+ String separator = SystemUtility.getSystemProperty("file.separator");
+ objectFilePath = filePath + separator + objectFileList[0];
inFile = new FileInputStream(objectFilePath);
in = SerializationStreamFactory.getManagerInstance(serializationType).createRegularInput(inFile);
@@ -386,8 +399,14 @@
if (objectFilePath != null)
{
// now remove the file
- File objectFile = new File(objectFilePath);
- boolean isDeleted = objectFile.delete();
+ final File objectFile = new File(objectFilePath);
+ boolean isDeleted = ((Boolean) AccessController.doPrivileged( new PrivilegedAction()
+ {
+ public Object run()
+ {
+ return new Boolean(objectFile.delete());
+ }
+ })).booleanValue();
if (log.isTraceEnabled())
{
log.trace("object file (" + objectFilePath + ") has been deleted - " + isDeleted);
@@ -443,15 +462,30 @@
}
StringBuffer path = new StringBuffer(filePath);
- path.append(System.getProperty("file.separator")).append(String.valueOf(currentTimestamp));
+ String separator = SystemUtility.getSystemProperty("file.separator");
+ path.append(separator).append(String.valueOf(currentTimestamp));
path.append("-").append(timestampCounter).append(".").append(fileSuffix);
- File storeFile = new File(path.toString());
+ final File storeFile = new File(path.toString());
FileOutputStream outFile = null;
ObjectOutputStream out = null;
try
- {
- outFile = new FileOutputStream(storeFile, false);
+ {
+ try
+ {
+ outFile = (FileOutputStream)AccessController.doPrivileged( new PrivilegedExceptionAction()
+ {
+ public Object run() throws FileNotFoundException
+ {
+ return new FileOutputStream(storeFile, false);
+ }
+ });
+ }
+ catch (PrivilegedActionException e)
+ {
+ throw (IOException) e.getCause();
+ }
+
out = SerializationStreamFactory.getManagerInstance(serializationType).createOutput(outFile);
out.writeObject(object);
out.flush();
16 years, 1 month
JBoss Remoting SVN: r3825 - remoting2/branches/2.x/src/main/org/jboss/remoting.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-04-01 23:07:03 -0400 (Tue, 01 Apr 2008)
New Revision: 3825
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/Version.java
Log:
JBREM-934: Use SystemUtility.getSystemProperty() calls.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/Version.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/Version.java 2008-04-02 03:05:55 UTC (rev 3824)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/Version.java 2008-04-02 03:07:03 UTC (rev 3825)
@@ -24,10 +24,8 @@
import java.security.AccessController;
import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import org.jboss.remoting.loading.ClassByteClassLoader;
+import org.jboss.remoting.util.SystemUtility;
/**
* @author <a href="mailto:tom.elrod@jboss.com">Tom Elrod</a>
@@ -55,15 +53,8 @@
static
{
boolean precompatibleFlag = false;
- String precompatible = (String)AccessController.doPrivileged( new PrivilegedAction()
- {
- public Object run()
- {
- return System.getProperty(PRE_2_0_COMPATIBLE);
- }
- });
+ String precompatible = SystemUtility.getSystemProperty(PRE_2_0_COMPATIBLE);
-
if(precompatible != null && precompatible.length() > 0)
{
precompatibleFlag = Boolean.valueOf(precompatible).booleanValue();
@@ -76,15 +67,8 @@
}
else
{
- String userDefinedVersion = (String) AccessController.doPrivileged( new PrivilegedAction()
- {
- public Object run()
- {
- return System.getProperty(REMOTING_VERSION_TO_USE);
- }
- });
-
-
+ String userDefinedVersion = SystemUtility.getSystemProperty(REMOTING_VERSION_TO_USE);
+
if(userDefinedVersion != null && userDefinedVersion.length() > 0)
{
byte userByteVersion = new Byte(userDefinedVersion).byteValue();
16 years, 1 month
JBoss Remoting SVN: r3824 - remoting2/branches/2.x/src/main/org/jboss/remoting.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-04-01 23:05:55 -0400 (Tue, 01 Apr 2008)
New Revision: 3824
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/ServerInvoker.java
Log:
JBREM-934: Put InetAddress.getLocalHost() in AccessController.doPrivileged() call.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/ServerInvoker.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/ServerInvoker.java 2008-04-02 03:04:10 UTC (rev 3823)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/ServerInvoker.java 2008-04-02 03:05:55 UTC (rev 3824)
@@ -57,6 +57,7 @@
import java.net.MalformedURLException;
import java.net.UnknownHostException;
import java.security.AccessController;
+import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
import java.util.Collection;
@@ -1135,16 +1136,30 @@
}
// If no bind address(es) found, try the old way.
- String locatorHost = locator.getHost();
+ final String locatorHost = locator.getHost();
InetAddress addr = null;
- if(locatorHost != null)
+ try
{
- addr = InetAddress.getByName(locator.getHost());
+ addr = (InetAddress)AccessController.doPrivileged( new PrivilegedExceptionAction()
+ {
+ public Object run() throws UnknownHostException
+ {
+ if(locatorHost != null)
+ {
+ return InetAddress.getByName(locator.getHost());
+ }
+ else
+ {
+ return InetAddress.getLocalHost();
+ }
+ }
+ });
}
- else
+ catch (PrivilegedActionException e)
{
- addr = InetAddress.getLocalHost();
+ throw (UnknownHostException) e.getCause();
}
+
int port = locator.getPort();
if(port <= 0)
{
@@ -1159,7 +1174,20 @@
if(clientConnectAddress != null)
{
// can't use uri address, as is for client only
- serverBindAddress = InetAddress.getLocalHost().getHostAddress();
+ try
+ {
+ serverBindAddress = (String)AccessController.doPrivileged( new PrivilegedExceptionAction()
+ {
+ public Object run() throws UnknownHostException
+ {
+ return InetAddress.getLocalHost().getHostAddress();
+ }
+ });
+ }
+ catch (PrivilegedActionException e)
+ {
+ throw (UnknownHostException) e.getCause();
+ }
}
else
{
@@ -1269,41 +1297,30 @@
if(host == null || InvokerLocator.ANY.equals(host))
{
// now need to get some external bindable address
- boolean byHost = true;
- String bindByHost = "True";
-
try
{
- bindByHost = (String)AccessController.doPrivileged( new PrivilegedExceptionAction()
+ newHost = (String)AccessController.doPrivileged( new PrivilegedExceptionAction()
{
public Object run() throws Exception
{
- return System.getProperty(InvokerLocator.BIND_BY_HOST, "True");
+ String bindByHost = System.getProperty(InvokerLocator.BIND_BY_HOST, "True");
+ boolean byHost = Boolean.valueOf(bindByHost).booleanValue();
+ if(byHost)
+ {
+ return InetAddress.getLocalHost().getHostName();
+ }
+ else
+ {
+ return InetAddress.getLocalHost().getHostAddress();
+ }
}
});
}
- catch (Exception e)
+ catch (PrivilegedActionException e)
{
- log.debug("error", e.getCause());
+ log.debug("Could not get host by name or address.", e.getCause());
}
-
- byHost = Boolean.valueOf(bindByHost).booleanValue();
-
- try
- {
- if(byHost)
- {
- newHost = InetAddress.getLocalHost().getHostName();
- }
- else
- {
- newHost = InetAddress.getLocalHost().getHostAddress();
- }
- }
- catch (UnknownHostException e)
- {
- log.debug("Could not get host by name or address.", e);
- }
+
if(newHost == null)
{
// now what? step through network interfaces?
16 years, 1 month
JBoss Remoting SVN: r3823 - remoting2/branches/2.x/src/main/org/jboss/remoting.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-04-01 23:04:10 -0400 (Tue, 01 Apr 2008)
New Revision: 3823
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java
Log:
JBREM-934: Put Thread.currentThread() in AccessController.doPrivileged() call.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java 2008-04-02 03:02:38 UTC (rev 3822)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java 2008-04-02 03:04:10 UTC (rev 3823)
@@ -14,9 +14,6 @@
import java.io.IOException;
import java.security.AccessController;
import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -120,7 +117,13 @@
// class loader. This allows to load remoting classes as well as user's
// classes. If possible, will simply reset context classloader on existing
// RemotingClassLoader.
- final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+ final ClassLoader contextClassLoader = (ClassLoader) AccessController.doPrivileged( new PrivilegedAction()
+ {
+ public Object run()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
if (unmarshaller instanceof UpdateableClassloaderUnMarshaller)
{
UpdateableClassloaderUnMarshaller uclum = (UpdateableClassloaderUnMarshaller) unmarshaller;
@@ -367,12 +370,26 @@
public void setUnMarshaller(UnMarshaller unmarshaller)
{
- unmarshallers.put(Thread.currentThread().getContextClassLoader(), unmarshaller);
+ ClassLoader classLoader = (ClassLoader) AccessController.doPrivileged( new PrivilegedAction()
+ {
+ public Object run()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+ unmarshallers.put(classLoader, unmarshaller);
}
public UnMarshaller getUnMarshaller()
{
- return (UnMarshaller)unmarshallers.get(Thread.currentThread().getContextClassLoader());
+ ClassLoader classLoader = (ClassLoader) AccessController.doPrivileged( new PrivilegedAction()
+ {
+ public Object run()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+ return (UnMarshaller)unmarshallers.get(classLoader);
}
public String getSessionId()
16 years, 1 month
JBoss Remoting SVN: r3822 - remoting2/branches/2.x/src/main/org/jboss/remoting.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-04-01 23:02:38 -0400 (Tue, 01 Apr 2008)
New Revision: 3822
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/InvokerLocator.java
Log:
JBREM-934: Put InetAddress.getLocalHost() in AccessController.doPrivileged() call.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/InvokerLocator.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/InvokerLocator.java 2008-04-02 02:58:42 UTC (rev 3821)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/InvokerLocator.java 2008-04-02 03:02:38 UTC (rev 3822)
@@ -22,7 +22,6 @@
package org.jboss.remoting;
-import java.beans.IntrospectionException;
import java.io.Serializable;
import java.net.InetAddress;
import java.net.MalformedURLException;
@@ -30,7 +29,6 @@
import java.net.URISyntaxException;
import java.net.UnknownHostException;
import java.security.AccessController;
-import java.security.PrivilegedAction;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
@@ -44,6 +42,7 @@
import org.jboss.logging.Logger;
import org.jboss.remoting.serialization.SerializationStreamFactory;
import org.jboss.remoting.transport.ClientInvoker;
+import org.jboss.remoting.util.SystemUtility;
/**
* InvokerLocator is an object that indentifies a specific Invoker on the network, via a unique
@@ -316,13 +315,7 @@
}
else
{
- String s = (String)AccessController.doPrivileged( new PrivilegedAction()
- {
- public Object run()
- {
- return System.getProperty(LEGACY_PARSING);
- }
- });
+ String s = SystemUtility.getSystemProperty(LEGACY_PARSING);
doLegacyParsing = "true".equalsIgnoreCase(s);
}
@@ -487,7 +480,7 @@
}
else
{
- host = host.replaceAll("0\\.0\\.0\\.0", System.getProperty(SERVER_BIND_ADDRESS));
+ host = host.replaceAll("0\\.0\\.0\\.0", SystemUtility.getSystemProperty(SERVER_BIND_ADDRESS));
}
}
return host;
@@ -495,43 +488,34 @@
private static String fixRemoteAddress(String address)
{
- try
+ if(address == null)
{
- if(address == null)
+ try
{
- boolean byHost = true;
- String bindByHost = "True";
-
- try
+ address = (String)AccessController.doPrivileged( new PrivilegedExceptionAction()
{
- bindByHost = (String)AccessController.doPrivileged( new PrivilegedExceptionAction()
+ public Object run() throws UnknownHostException
{
- public Object run() throws Exception
+ String bindByHost = System.getProperty(BIND_BY_HOST, "True");
+ boolean byHost = Boolean.valueOf(bindByHost).booleanValue();
+
+ if(byHost)
{
- return System.getProperty(BIND_BY_HOST, "True");
+ return InetAddress.getLocalHost().getHostName();
}
- });
- }
- catch (Exception e)
- {
- log.debug("error", e.getCause());
- }
-
- byHost = Boolean.valueOf(bindByHost).booleanValue();
-
- if(byHost)
- {
- return InetAddress.getLocalHost().getHostName();
- }
- else
- {
- return InetAddress.getLocalHost().getHostAddress();
- }
+ else
+ {
+ return InetAddress.getLocalHost().getHostAddress();
+ }
+ }
+ });
}
+ catch (PrivilegedActionException e)
+ {
+ log.debug("error", e.getCause());
+ }
}
- catch(UnknownHostException ignored)
- {
- }
+
return address;
}
16 years, 1 month
JBoss Remoting SVN: r3821 - remoting2/branches/2.x/src/main/org/jboss/remoting.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-04-01 22:58:42 -0400 (Tue, 01 Apr 2008)
New Revision: 3821
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/Client.java
Log:
JBREM-934: Put Thread.currentThread() in AccessController.doPrivileged() call.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/Client.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/Client.java 2008-04-02 02:56:49 UTC (rev 3820)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/Client.java 2008-04-02 02:58:42 UTC (rev 3821)
@@ -52,7 +52,12 @@
import java.io.StreamCorruptedException;
import java.net.InetAddress;
import java.net.SocketTimeoutException;
+import java.net.UnknownHostException;
import java.rmi.MarshalException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -252,7 +257,7 @@
*/
public Client(InvokerLocator locator, String subsystem, Map configuration) throws Exception
{
- this(Thread.currentThread().getContextClassLoader(), locator, subsystem, configuration);
+ this(null, locator, subsystem, configuration);
}
/**
@@ -270,7 +275,20 @@
public Client(ClassLoader cl, InvokerLocator locator, String subsystem, Map configuration)
throws Exception
{
- this.classloader = cl;
+ if (cl == null)
+ {
+ this.classloader = (ClassLoader) AccessController.doPrivileged( new PrivilegedAction()
+ {
+ public Object run()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+ }
+ else
+ {
+ this.classloader = cl;
+ }
this.locator = locator;
this.subsystem = subsystem == null ? null : subsystem.toUpperCase();
if (configuration != null)
@@ -312,7 +330,14 @@
this.configuration = (Map) in.readObject();
boolean wasConnected = in.readBoolean();
- this.classloader = Thread.currentThread().getContextClassLoader();
+ this.classloader = (ClassLoader) AccessController.doPrivileged( new PrivilegedAction()
+ {
+ public Object run()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+
try
{
this.invoker = InvokerRegistry.createClientInvoker(locator, configuration);
@@ -916,7 +941,20 @@
}
if (host == null)
{
- host = InetAddress.getLocalHost().getHostAddress();
+ try
+ {
+ host = (String)AccessController.doPrivileged( new PrivilegedExceptionAction()
+ {
+ public Object run() throws UnknownHostException
+ {
+ return InetAddress.getLocalHost().getHostAddress();
+ }
+ });
+ }
+ catch (PrivilegedActionException e)
+ {
+ throw (UnknownHostException) e.getCause();
+ }
metadata.put(CALLBACK_SERVER_HOST, host);
}
if (port == -1)
16 years, 1 month
JBoss Remoting SVN: r3820 - remoting2/branches/2.x/src/main/org/jboss/remoting.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-04-01 22:56:49 -0400 (Tue, 01 Apr 2008)
New Revision: 3820
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/AbstractInvoker.java
Log:
JBREM-934: Avoid this.getClass() inside PrivilegedAction.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/AbstractInvoker.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/AbstractInvoker.java 2008-04-01 13:55:35 UTC (rev 3819)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/AbstractInvoker.java 2008-04-02 02:56:49 UTC (rev 3820)
@@ -83,7 +83,7 @@
{
public Object run() throws Exception
{
- return new ClassByteClassLoader(this.getClass().getClassLoader());
+ return new ClassByteClassLoader(AbstractInvoker.class.getClassLoader());
}
});
}
@@ -271,7 +271,7 @@
{
public Object run() throws Exception
{
- return new ClassByteClassLoader(this.getClass().getClassLoader());
+ return new ClassByteClassLoader(AbstractInvoker.class.getClassLoader());
}
});
}
16 years, 1 month
JBoss Remoting SVN: r3819 - in remoting3/trunk: api/src/main/java/org/jboss/cx/remoting/service and 10 other directories.
by jboss-remoting-commits＠lists.jboss.org
Author: david.lloyd(a)jboss.com
Date: 2008-04-01 09:55:35 -0400 (Tue, 01 Apr 2008)
New Revision: 3819
Modified:
remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/Endpoint.java
remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/service/RemoteResource.java
remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/service/ServiceReply.java
remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/service/ServiceRequest.java
remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/marshal/Marshaller.java
remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/wrapper/ContextSourceWrapper.java
remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/wrapper/ContextWrapper.java
remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/wrapper/EndpointWrapper.java
remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/wrapper/SessionWrapper.java
remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/stream/Streams.java
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/AbstractRealContext.java
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/ContextMarker.java
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/ContextSourceMarker.java
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreEndpoint.java
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreInboundContext.java
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreInboundRequest.java
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreInboundService.java
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreOutboundContext.java
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreOutboundRequest.java
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreOutboundService.java
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreSession.java
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreStream.java
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/RemoteClassLoader.java
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/RequestClient.java
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/RequestServer.java
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/protocol/LocalProtocolHandler.java
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/protocol/LocalProtocolHandlerFactory.java
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/service/ClassLoaderResourceListener.java
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/service/ServiceLocatorListener.java
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/InputStreamStreamSerializerFactory.java
remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppConnection.java
remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppProtocolSupport.java
remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppServer.java
remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/id/JrppContextIdentifier.java
remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/id/JrppStreamIdentifier.java
remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/id/JrppSubChannelIdentifier.java
remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/AtomicStateMachine.java
remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/CollectionUtil.java
remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/SynchronizedQueue.java
Log:
Clean up imports
Modified: remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/Endpoint.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/Endpoint.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/Endpoint.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -2,11 +2,11 @@
import java.net.URI;
import java.util.concurrent.ConcurrentMap;
-import org.jboss.cx.remoting.util.AttributeMap;
+import org.jboss.cx.remoting.spi.Registration;
import org.jboss.cx.remoting.spi.protocol.ProtocolContext;
import org.jboss.cx.remoting.spi.protocol.ProtocolHandler;
import org.jboss.cx.remoting.spi.protocol.ProtocolHandlerFactory;
-import org.jboss.cx.remoting.spi.Registration;
+import org.jboss.cx.remoting.util.AttributeMap;
/**
* A potential participant in a JBoss Remoting communications relationship.
Modified: remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/service/RemoteResource.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/service/RemoteResource.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/service/RemoteResource.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -1,7 +1,7 @@
package org.jboss.cx.remoting.service;
+import java.io.InputStream;
import java.io.Serializable;
-import java.io.InputStream;
/**
*
Modified: remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/service/ServiceReply.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/service/ServiceReply.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/service/ServiceReply.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -1,8 +1,8 @@
package org.jboss.cx.remoting.service;
+import java.io.Serializable;
+import org.jboss.cx.remoting.Context;
import org.jboss.cx.remoting.ContextSource;
-import org.jboss.cx.remoting.Context;
-import java.io.Serializable;
/**
*
Modified: remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/service/ServiceRequest.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/service/ServiceRequest.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/service/ServiceRequest.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -1,7 +1,7 @@
package org.jboss.cx.remoting.service;
+import java.io.Serializable;
import java.net.URI;
-import java.io.Serializable;
/**
*
Modified: remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/marshal/Marshaller.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/marshal/Marshaller.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/marshal/Marshaller.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -1,10 +1,10 @@
package org.jboss.cx.remoting.spi.marshal;
-import org.jboss.cx.remoting.spi.ObjectMessageOutput;
+import java.io.IOException;
+import org.jboss.cx.remoting.spi.DataMessageInput;
import org.jboss.cx.remoting.spi.DataMessageOutput;
import org.jboss.cx.remoting.spi.ObjectMessageInput;
-import org.jboss.cx.remoting.spi.DataMessageInput;
-import java.io.IOException;
+import org.jboss.cx.remoting.spi.ObjectMessageOutput;
/**
*
Modified: remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/wrapper/ContextSourceWrapper.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/wrapper/ContextSourceWrapper.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/wrapper/ContextSourceWrapper.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -1,9 +1,9 @@
package org.jboss.cx.remoting.spi.wrapper;
+import org.jboss.cx.remoting.CloseHandler;
import org.jboss.cx.remoting.Context;
import org.jboss.cx.remoting.ContextSource;
import org.jboss.cx.remoting.RemotingException;
-import org.jboss.cx.remoting.CloseHandler;
/**
*
Modified: remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/wrapper/ContextWrapper.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/wrapper/ContextWrapper.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/wrapper/ContextWrapper.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -1,11 +1,11 @@
package org.jboss.cx.remoting.spi.wrapper;
import java.util.concurrent.ConcurrentMap;
+import org.jboss.cx.remoting.CloseHandler;
import org.jboss.cx.remoting.Context;
import org.jboss.cx.remoting.FutureReply;
import org.jboss.cx.remoting.RemoteExecutionException;
import org.jboss.cx.remoting.RemotingException;
-import org.jboss.cx.remoting.CloseHandler;
/**
*
Modified: remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/wrapper/EndpointWrapper.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/wrapper/EndpointWrapper.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/wrapper/EndpointWrapper.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -2,18 +2,18 @@
import java.net.URI;
import java.util.concurrent.ConcurrentMap;
+import org.jboss.cx.remoting.CloseHandler;
+import org.jboss.cx.remoting.Context;
+import org.jboss.cx.remoting.ContextSource;
import org.jboss.cx.remoting.Endpoint;
import org.jboss.cx.remoting.RemotingException;
+import org.jboss.cx.remoting.RequestListener;
import org.jboss.cx.remoting.Session;
-import org.jboss.cx.remoting.Context;
-import org.jboss.cx.remoting.RequestListener;
-import org.jboss.cx.remoting.ContextSource;
-import org.jboss.cx.remoting.CloseHandler;
-import org.jboss.cx.remoting.util.AttributeMap;
+import org.jboss.cx.remoting.spi.Registration;
import org.jboss.cx.remoting.spi.protocol.ProtocolContext;
import org.jboss.cx.remoting.spi.protocol.ProtocolHandler;
import org.jboss.cx.remoting.spi.protocol.ProtocolHandlerFactory;
-import org.jboss.cx.remoting.spi.Registration;
+import org.jboss.cx.remoting.util.AttributeMap;
/**
*
Modified: remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/wrapper/SessionWrapper.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/wrapper/SessionWrapper.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/wrapper/SessionWrapper.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -1,10 +1,10 @@
package org.jboss.cx.remoting.spi.wrapper;
import java.util.concurrent.ConcurrentMap;
+import org.jboss.cx.remoting.CloseHandler;
+import org.jboss.cx.remoting.Context;
import org.jboss.cx.remoting.RemotingException;
import org.jboss.cx.remoting.Session;
-import org.jboss.cx.remoting.Context;
-import org.jboss.cx.remoting.CloseHandler;
/**
*
Modified: remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/stream/Streams.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/stream/Streams.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/stream/Streams.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -3,9 +3,9 @@
import java.io.EOFException;
import java.io.IOException;
import java.util.Collection;
+import java.util.Enumeration;
import java.util.Iterator;
import java.util.NoSuchElementException;
-import java.util.Enumeration;
/**
*
Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/AbstractRealContext.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/AbstractRealContext.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/AbstractRealContext.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -1,7 +1,6 @@
package org.jboss.cx.remoting.core;
import org.jboss.cx.remoting.Context;
-import java.io.Serializable;
/**
*
Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/ContextMarker.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/ContextMarker.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/ContextMarker.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -1,7 +1,7 @@
package org.jboss.cx.remoting.core;
+import java.io.Serializable;
import org.jboss.cx.remoting.spi.protocol.ContextIdentifier;
-import java.io.Serializable;
/**
*
Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/ContextSourceMarker.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/ContextSourceMarker.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/ContextSourceMarker.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -1,8 +1,7 @@
package org.jboss.cx.remoting.core;
-import org.jboss.cx.remoting.spi.protocol.ContextIdentifier;
-import org.jboss.cx.remoting.spi.protocol.ServiceIdentifier;
import java.io.Serializable;
+import org.jboss.cx.remoting.spi.protocol.ServiceIdentifier;
/**
*
Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreEndpoint.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreEndpoint.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreEndpoint.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -2,31 +2,30 @@
import java.io.IOException;
import java.net.URI;
+import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import java.util.Iterator;
-import java.util.EnumSet;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import org.jboss.cx.remoting.CloseHandler;
+import org.jboss.cx.remoting.Context;
+import org.jboss.cx.remoting.ContextSource;
import org.jboss.cx.remoting.Endpoint;
import org.jboss.cx.remoting.RemotingException;
-import org.jboss.cx.remoting.Session;
-import org.jboss.cx.remoting.Context;
import org.jboss.cx.remoting.RequestListener;
-import org.jboss.cx.remoting.ContextSource;
-import org.jboss.cx.remoting.CloseHandler;
+import org.jboss.cx.remoting.Session;
import org.jboss.cx.remoting.core.util.OrderedExecutorFactory;
-import org.jboss.cx.remoting.util.CollectionUtil;
-import org.jboss.cx.remoting.version.Version;
import org.jboss.cx.remoting.log.Logger;
-import org.jboss.cx.remoting.util.AtomicStateMachine;
-import org.jboss.cx.remoting.util.AttributeMap;
+import org.jboss.cx.remoting.spi.Registration;
import org.jboss.cx.remoting.spi.protocol.ProtocolContext;
import org.jboss.cx.remoting.spi.protocol.ProtocolHandler;
import org.jboss.cx.remoting.spi.protocol.ProtocolHandlerFactory;
-import org.jboss.cx.remoting.spi.Registration;
+import org.jboss.cx.remoting.util.AtomicStateMachine;
+import org.jboss.cx.remoting.util.AttributeMap;
+import org.jboss.cx.remoting.util.CollectionUtil;
+import org.jboss.cx.remoting.version.Version;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreInboundContext.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreInboundContext.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreInboundContext.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -1,15 +1,13 @@
package org.jboss.cx.remoting.core;
-import java.util.concurrent.Executor;
import java.util.Set;
-import org.jboss.cx.remoting.RequestListener;
+import java.util.concurrent.Executor;
import org.jboss.cx.remoting.RemotingException;
+import org.jboss.cx.remoting.RequestListener;
import org.jboss.cx.remoting.log.Logger;
import org.jboss.cx.remoting.util.AtomicStateMachine;
-import org.jboss.cx.remoting.util.State;
-
-import static org.jboss.cx.remoting.util.CollectionUtil.synchronizedHashSet;
import static org.jboss.cx.remoting.util.AtomicStateMachine.start;
+import static org.jboss.cx.remoting.util.CollectionUtil.synchronizedHashSet;
/**
*
Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreInboundRequest.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreInboundRequest.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreInboundRequest.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -1,19 +1,18 @@
package org.jboss.cx.remoting.core;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.Executor;
import org.jboss.cx.remoting.RemoteExecutionException;
import org.jboss.cx.remoting.RemotingException;
import org.jboss.cx.remoting.RequestCancelHandler;
import org.jboss.cx.remoting.RequestContext;
import org.jboss.cx.remoting.RequestListener;
-import org.jboss.cx.remoting.util.AtomicStateMachine;
-import org.jboss.cx.remoting.util.State;
import org.jboss.cx.remoting.log.Logger;
-import java.util.concurrent.Executor;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Iterator;
-import java.util.LinkedList;
+import org.jboss.cx.remoting.util.AtomicStateMachine;
/**
*
Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreInboundService.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreInboundService.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreInboundService.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -1,11 +1,10 @@
package org.jboss.cx.remoting.core;
-import static org.jboss.cx.remoting.util.AtomicStateMachine.start;
-import org.jboss.cx.remoting.RequestListener;
+import java.util.concurrent.Executor;
import org.jboss.cx.remoting.RemotingException;
+import org.jboss.cx.remoting.RequestListener;
import org.jboss.cx.remoting.util.AtomicStateMachine;
-import org.jboss.cx.remoting.util.State;
-import java.util.concurrent.Executor;
+import static org.jboss.cx.remoting.util.AtomicStateMachine.start;
/**
*
Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreOutboundContext.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreOutboundContext.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreOutboundContext.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -2,18 +2,16 @@
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.Executor;
-import java.io.Serializable;
+import org.jboss.cx.remoting.CloseHandler;
import org.jboss.cx.remoting.Context;
import org.jboss.cx.remoting.FutureReply;
import org.jboss.cx.remoting.RemoteExecutionException;
import org.jboss.cx.remoting.RemotingException;
import org.jboss.cx.remoting.RequestCompletionHandler;
-import org.jboss.cx.remoting.CloseHandler;
import org.jboss.cx.remoting.core.util.QueueExecutor;
+import org.jboss.cx.remoting.log.Logger;
import org.jboss.cx.remoting.util.AtomicStateMachine;
import org.jboss.cx.remoting.util.CollectionUtil;
-import org.jboss.cx.remoting.util.State;
-import org.jboss.cx.remoting.log.Logger;
/**
*
Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreOutboundRequest.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreOutboundRequest.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreOutboundRequest.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -9,11 +9,10 @@
import org.jboss.cx.remoting.FutureReply;
import org.jboss.cx.remoting.IndeterminateOutcomeException;
import org.jboss.cx.remoting.RemoteExecutionException;
-import org.jboss.cx.remoting.RequestCompletionHandler;
import org.jboss.cx.remoting.RemotingException;
-import org.jboss.cx.remoting.util.AtomicStateMachine;
-import org.jboss.cx.remoting.util.State;
+import org.jboss.cx.remoting.RequestCompletionHandler;
import org.jboss.cx.remoting.log.Logger;
+import org.jboss.cx.remoting.util.AtomicStateMachine;
/**
*
Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreOutboundService.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreOutboundService.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreOutboundService.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -1,14 +1,12 @@
package org.jboss.cx.remoting.core;
+import java.util.concurrent.Executor;
+import org.jboss.cx.remoting.CloseHandler;
import org.jboss.cx.remoting.Context;
import org.jboss.cx.remoting.ContextSource;
import org.jboss.cx.remoting.RemotingException;
-import org.jboss.cx.remoting.CloseHandler;
-import org.jboss.cx.remoting.util.AtomicStateMachine;
-import org.jboss.cx.remoting.util.State;
import org.jboss.cx.remoting.log.Logger;
-import java.util.concurrent.Executor;
-import java.io.Serializable;
+import org.jboss.cx.remoting.util.AtomicStateMachine;
/**
*
Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreSession.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreSession.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreSession.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -2,8 +2,6 @@
import java.io.IOException;
import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.io.ObjectStreamClass;
import java.io.OutputStream;
import java.lang.ref.WeakReference;
@@ -14,21 +12,18 @@
import java.util.Map;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.Executor;
+import org.jboss.cx.remoting.CloseHandler;
+import org.jboss.cx.remoting.Context;
import org.jboss.cx.remoting.RemoteExecutionException;
import org.jboss.cx.remoting.RemotingException;
import org.jboss.cx.remoting.Session;
-import org.jboss.cx.remoting.Context;
-import org.jboss.cx.remoting.CloseHandler;
import org.jboss.cx.remoting.core.stream.DefaultStreamDetector;
import org.jboss.cx.remoting.core.util.DelegatingObjectInput;
-import org.jboss.cx.remoting.util.AtomicStateMachine;
-import org.jboss.cx.remoting.util.AttributeMap;
+import org.jboss.cx.remoting.log.Logger;
import org.jboss.cx.remoting.spi.ByteMessageInput;
import org.jboss.cx.remoting.spi.ByteMessageOutput;
import org.jboss.cx.remoting.spi.ObjectMessageInput;
-import org.jboss.cx.remoting.util.CollectionUtil;
import org.jboss.cx.remoting.spi.ObjectMessageOutput;
-import org.jboss.cx.remoting.log.Logger;
import org.jboss.cx.remoting.spi.protocol.ContextIdentifier;
import org.jboss.cx.remoting.spi.protocol.ProtocolContext;
import org.jboss.cx.remoting.spi.protocol.ProtocolHandler;
@@ -39,10 +34,11 @@
import org.jboss.cx.remoting.spi.stream.StreamDetector;
import org.jboss.cx.remoting.spi.stream.StreamSerializer;
import org.jboss.cx.remoting.spi.stream.StreamSerializerFactory;
-import org.jboss.serial.io.JBossObjectOutputStream;
+import org.jboss.cx.remoting.util.AtomicStateMachine;
+import org.jboss.cx.remoting.util.AttributeMap;
+import org.jboss.cx.remoting.util.CollectionUtil;
import org.jboss.serial.io.JBossObjectInputStream;
-import org.jboss.serial.io.JBossObjectOutputStreamSharedTree;
-import org.jboss.serial.io.JBossObjectInputStreamSharedTree;
+import org.jboss.serial.io.JBossObjectOutputStream;
/**
Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreStream.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreStream.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreStream.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -2,9 +2,9 @@
import java.io.IOException;
import java.util.concurrent.Executor;
+import org.jboss.cx.remoting.log.Logger;
import org.jboss.cx.remoting.spi.ObjectMessageInput;
import org.jboss.cx.remoting.spi.ObjectMessageOutput;
-import org.jboss.cx.remoting.log.Logger;
import org.jboss.cx.remoting.spi.protocol.ProtocolHandler;
import org.jboss.cx.remoting.spi.protocol.StreamIdentifier;
import org.jboss.cx.remoting.spi.stream.RemoteStreamSerializer;
Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/RemoteClassLoader.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/RemoteClassLoader.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/RemoteClassLoader.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -6,8 +6,8 @@
import org.jboss.cx.remoting.RemoteExecutionException;
import org.jboss.cx.remoting.RemotingException;
import org.jboss.cx.remoting.log.Logger;
+import org.jboss.cx.remoting.service.ClassLoaderResourceReply;
import org.jboss.cx.remoting.service.ClassLoaderResourceRequest;
-import org.jboss.cx.remoting.service.ClassLoaderResourceReply;
import org.jboss.cx.remoting.service.RemoteResource;
import org.jboss.cx.remoting.stream.ObjectSource;
Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/RequestClient.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/RequestClient.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/RequestClient.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -1,7 +1,7 @@
package org.jboss.cx.remoting.core;
+import org.jboss.cx.remoting.RemoteExecutionException;
import org.jboss.cx.remoting.RemotingException;
-import org.jboss.cx.remoting.RemoteExecutionException;
/**
*
Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/RequestServer.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/RequestServer.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/RequestServer.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -1,7 +1,7 @@
package org.jboss.cx.remoting.core;
+import java.util.concurrent.Executor;
import org.jboss.cx.remoting.RemotingException;
-import java.util.concurrent.Executor;
/**
*
Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/protocol/LocalProtocolHandler.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/protocol/LocalProtocolHandler.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/protocol/LocalProtocolHandler.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -1,19 +1,17 @@
package org.jboss.cx.remoting.core.protocol;
-import org.jboss.cx.remoting.spi.protocol.ProtocolHandler;
-import org.jboss.cx.remoting.spi.protocol.ProtocolContext;
+import java.io.IOException;
+import java.util.concurrent.Executor;
+import org.jboss.cx.remoting.RemoteExecutionException;
+import org.jboss.cx.remoting.spi.ObjectMessageOutput;
import org.jboss.cx.remoting.spi.protocol.ContextIdentifier;
+import org.jboss.cx.remoting.spi.protocol.ProtocolContext;
+import org.jboss.cx.remoting.spi.protocol.ProtocolHandler;
import org.jboss.cx.remoting.spi.protocol.RequestIdentifier;
import org.jboss.cx.remoting.spi.protocol.ServiceIdentifier;
-import org.jboss.cx.remoting.spi.protocol.StreamIdentifier;
import org.jboss.cx.remoting.spi.protocol.SimpleContextIdentifier;
import org.jboss.cx.remoting.spi.protocol.SimpleRequestIdentifier;
-import org.jboss.cx.remoting.spi.ObjectMessageOutput;
-import org.jboss.cx.remoting.util.AttributeMap;
-import org.jboss.cx.remoting.RemoteExecutionException;
-import java.net.URI;
-import java.io.IOException;
-import java.util.concurrent.Executor;
+import org.jboss.cx.remoting.spi.protocol.StreamIdentifier;
/**
*
Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/protocol/LocalProtocolHandlerFactory.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/protocol/LocalProtocolHandlerFactory.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/protocol/LocalProtocolHandlerFactory.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -1,16 +1,16 @@
package org.jboss.cx.remoting.core.protocol;
+import java.io.IOException;
+import java.net.URI;
+import java.util.concurrent.ConcurrentMap;
+import org.jboss.cx.remoting.Endpoint;
+import org.jboss.cx.remoting.RemotingException;
+import org.jboss.cx.remoting.spi.Registration;
+import org.jboss.cx.remoting.spi.protocol.ProtocolContext;
+import org.jboss.cx.remoting.spi.protocol.ProtocolHandler;
import org.jboss.cx.remoting.spi.protocol.ProtocolHandlerFactory;
-import org.jboss.cx.remoting.spi.protocol.ProtocolHandler;
-import org.jboss.cx.remoting.spi.protocol.ProtocolContext;
-import org.jboss.cx.remoting.spi.Registration;
import org.jboss.cx.remoting.util.AttributeMap;
import org.jboss.cx.remoting.util.CollectionUtil;
-import org.jboss.cx.remoting.Endpoint;
-import org.jboss.cx.remoting.RemotingException;
-import java.net.URI;
-import java.io.IOException;
-import java.util.concurrent.ConcurrentMap;
/**
*
Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/service/ClassLoaderResourceListener.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/service/ClassLoaderResourceListener.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/service/ClassLoaderResourceListener.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -1,21 +1,21 @@
package org.jboss.cx.remoting.core.service;
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Enumeration;
+import org.jboss.cx.remoting.IOExceptionCarrier;
+import org.jboss.cx.remoting.RemoteExecutionException;
+import org.jboss.cx.remoting.RequestContext;
import org.jboss.cx.remoting.RequestListener;
-import org.jboss.cx.remoting.RequestContext;
-import org.jboss.cx.remoting.RemoteExecutionException;
-import org.jboss.cx.remoting.IOExceptionCarrier;
-import org.jboss.cx.remoting.stream.Streams;
+import org.jboss.cx.remoting.service.ClassLoaderResourceReply;
+import org.jboss.cx.remoting.service.ClassLoaderResourceRequest;
+import org.jboss.cx.remoting.service.RemoteResource;
import org.jboss.cx.remoting.stream.ObjectSource;
import org.jboss.cx.remoting.stream.ObjectSourceWrapper;
+import org.jboss.cx.remoting.stream.Streams;
import org.jboss.cx.remoting.util.CollectionUtil;
import org.jboss.cx.remoting.util.Translator;
-import org.jboss.cx.remoting.service.ClassLoaderResourceRequest;
-import org.jboss.cx.remoting.service.ClassLoaderResourceReply;
-import org.jboss.cx.remoting.service.RemoteResource;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Enumeration;
-import java.io.IOException;
/**
*
Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/service/ServiceLocatorListener.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/service/ServiceLocatorListener.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/service/ServiceLocatorListener.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -1,17 +1,17 @@
package org.jboss.cx.remoting.core.service;
+import java.net.URI;
+import java.util.SortedMap;
+import java.util.concurrent.ConcurrentMap;
+import org.jboss.cx.remoting.Context;
+import org.jboss.cx.remoting.ContextSource;
+import org.jboss.cx.remoting.RemoteExecutionException;
+import org.jboss.cx.remoting.RequestContext;
import org.jboss.cx.remoting.RequestListener;
-import org.jboss.cx.remoting.RequestContext;
-import org.jboss.cx.remoting.RemoteExecutionException;
-import org.jboss.cx.remoting.ContextSource;
-import org.jboss.cx.remoting.Context;
+import org.jboss.cx.remoting.service.ServiceReply;
+import org.jboss.cx.remoting.service.ServiceRequest;
+import org.jboss.cx.remoting.util.CollectionUtil;
import org.jboss.cx.remoting.util.ServiceURI;
-import org.jboss.cx.remoting.util.CollectionUtil;
-import org.jboss.cx.remoting.service.ServiceRequest;
-import org.jboss.cx.remoting.service.ServiceReply;
-import java.net.URI;
-import java.util.concurrent.ConcurrentMap;
-import java.util.SortedMap;
/**
*
Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/InputStreamStreamSerializerFactory.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/InputStreamStreamSerializerFactory.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/InputStreamStreamSerializerFactory.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -3,9 +3,9 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.LinkedList;
+import org.jboss.cx.remoting.log.Logger;
import org.jboss.cx.remoting.spi.ObjectMessageInput;
import org.jboss.cx.remoting.spi.ObjectMessageOutput;
-import org.jboss.cx.remoting.log.Logger;
import org.jboss.cx.remoting.spi.stream.RemoteStreamSerializer;
import org.jboss.cx.remoting.spi.stream.StreamContext;
import org.jboss.cx.remoting.spi.stream.StreamSerializer;
Modified: remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppConnection.java
===================================================================
--- remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppConnection.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppConnection.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -9,8 +9,6 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.EnumMap;
-import java.util.EnumSet;
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.mina.common.AttributeKey;
@@ -22,13 +20,6 @@
import org.apache.mina.handler.multiton.SingleSessionIoHandler;
import org.jboss.cx.remoting.CommonKeys;
import org.jboss.cx.remoting.RemoteExecutionException;
-import org.jboss.cx.remoting.util.AtomicStateMachine;
-import org.jboss.cx.remoting.util.AttributeMap;
-import org.jboss.cx.remoting.spi.ObjectMessageOutput;
-import org.jboss.cx.remoting.spi.ObjectMessageInput;
-import org.jboss.cx.remoting.util.CollectionUtil;
-import org.jboss.cx.remoting.util.WeakHashSet;
-import org.jboss.cx.remoting.util.State;
import org.jboss.cx.remoting.jrpp.id.JrppContextIdentifier;
import org.jboss.cx.remoting.jrpp.id.JrppRequestIdentifier;
import org.jboss.cx.remoting.jrpp.id.JrppServiceIdentifier;
@@ -36,12 +27,18 @@
import org.jboss.cx.remoting.jrpp.mina.IoBufferByteMessageInput;
import org.jboss.cx.remoting.jrpp.mina.IoBufferByteMessageOutput;
import org.jboss.cx.remoting.log.Logger;
+import org.jboss.cx.remoting.spi.ObjectMessageInput;
+import org.jboss.cx.remoting.spi.ObjectMessageOutput;
import org.jboss.cx.remoting.spi.protocol.ContextIdentifier;
import org.jboss.cx.remoting.spi.protocol.ProtocolContext;
import org.jboss.cx.remoting.spi.protocol.ProtocolHandler;
import org.jboss.cx.remoting.spi.protocol.RequestIdentifier;
import org.jboss.cx.remoting.spi.protocol.ServiceIdentifier;
import org.jboss.cx.remoting.spi.protocol.StreamIdentifier;
+import org.jboss.cx.remoting.util.AtomicStateMachine;
+import org.jboss.cx.remoting.util.AttributeMap;
+import org.jboss.cx.remoting.util.CollectionUtil;
+import org.jboss.cx.remoting.util.WeakHashSet;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
Modified: remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppProtocolSupport.java
===================================================================
--- remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppProtocolSupport.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppProtocolSupport.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -6,11 +6,11 @@
import java.net.URI;
import java.util.concurrent.Executor;
import org.apache.mina.common.ConnectFuture;
+import org.apache.mina.common.ExceptionMonitor;
import org.apache.mina.common.IoConnector;
import org.apache.mina.common.IoProcessor;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionInitializer;
-import org.apache.mina.common.ExceptionMonitor;
import org.apache.mina.filter.logging.LoggingFilter;
import org.apache.mina.filter.sasl.SaslClientFilter;
import org.apache.mina.filter.sasl.SaslMessageSender;
@@ -21,12 +21,12 @@
import org.apache.mina.transport.socket.nio.NioSocketConnector;
import org.jboss.cx.remoting.Endpoint;
import org.jboss.cx.remoting.RemotingException;
-import org.jboss.cx.remoting.util.AttributeMap;
import org.jboss.cx.remoting.jrpp.mina.FramingIoFilter;
+import org.jboss.cx.remoting.spi.Registration;
import org.jboss.cx.remoting.spi.protocol.ProtocolContext;
import org.jboss.cx.remoting.spi.protocol.ProtocolHandler;
import org.jboss.cx.remoting.spi.protocol.ProtocolHandlerFactory;
-import org.jboss.cx.remoting.spi.Registration;
+import org.jboss.cx.remoting.util.AttributeMap;
/**
*
Modified: remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppServer.java
===================================================================
--- remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppServer.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppServer.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -14,10 +14,10 @@
import org.apache.mina.handler.multiton.SingleSessionIoHandlerDelegate;
import org.apache.mina.handler.multiton.SingleSessionIoHandlerFactory;
import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
-import org.jboss.cx.remoting.util.AttributeMap;
+import org.jboss.cx.remoting.Endpoint;
import org.jboss.cx.remoting.jrpp.mina.FramingIoFilter;
-import org.jboss.cx.remoting.Endpoint;
import org.jboss.cx.remoting.spi.protocol.ProtocolContext;
+import org.jboss.cx.remoting.util.AttributeMap;
/**
*
Modified: remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/id/JrppContextIdentifier.java
===================================================================
--- remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/id/JrppContextIdentifier.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/id/JrppContextIdentifier.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -1,7 +1,5 @@
package org.jboss.cx.remoting.jrpp.id;
-import java.io.IOException;
-import java.io.ObjectInputStream;
import org.jboss.cx.remoting.spi.protocol.ContextIdentifier;
/**
Modified: remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/id/JrppStreamIdentifier.java
===================================================================
--- remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/id/JrppStreamIdentifier.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/id/JrppStreamIdentifier.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -1,7 +1,5 @@
package org.jboss.cx.remoting.jrpp.id;
-import java.io.IOException;
-import java.io.ObjectInput;
import org.jboss.cx.remoting.spi.protocol.StreamIdentifier;
/**
Modified: remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/id/JrppSubChannelIdentifier.java
===================================================================
--- remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/id/JrppSubChannelIdentifier.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/id/JrppSubChannelIdentifier.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -1,8 +1,8 @@
package org.jboss.cx.remoting.jrpp.id;
+import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
-import java.io.Externalizable;
import java.io.ObjectOutput;
/**
Modified: remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/AtomicStateMachine.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/AtomicStateMachine.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/AtomicStateMachine.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -1,11 +1,6 @@
package org.jboss.cx.remoting.util;
-import java.util.Date;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
/**
*
Modified: remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/CollectionUtil.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/CollectionUtil.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/CollectionUtil.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -1,21 +1,21 @@
package org.jboss.cx.remoting.util;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumMap;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Queue;
import java.util.Set;
import java.util.WeakHashMap;
-import java.util.Collections;
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.EnumMap;
-import java.util.Arrays;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ConcurrentHashMap;
Modified: remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/SynchronizedQueue.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/SynchronizedQueue.java 2008-04-01 13:32:43 UTC (rev 3818)
+++ remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/SynchronizedQueue.java 2008-04-01 13:55:35 UTC (rev 3819)
@@ -9,7 +9,7 @@
/**
*
*/
-public final class SynchronizedQueue<T> implements BlockingQueue<T> {
+public class SynchronizedQueue<T> implements BlockingQueue<T> {
private final Queue<T> delegate;
private final Object monitor;
16 years, 1 month
JBoss Remoting SVN: r3818 - in remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core: stream and 1 other directory.
by jboss-remoting-commits＠lists.jboss.org
Author: david.lloyd(a)jboss.com
Date: 2008-04-01 09:32:43 -0400 (Tue, 01 Apr 2008)
New Revision: 3818
Modified:
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreSession.java
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/DefaultStreamDetector.java
Log:
Minor code cleanup
Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreSession.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreSession.java 2008-04-01 13:32:30 UTC (rev 3817)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreSession.java 2008-04-01 13:32:43 UTC (rev 3818)
@@ -96,7 +96,7 @@
this.endpoint = endpoint;
executor = endpoint.getExecutor();
// todo - make stream detectors pluggable
- streamDetectors = java.util.Collections.<StreamDetector>singletonList(new DefaultStreamDetector());
+ streamDetectors = java.util.Collections.singletonList(DefaultStreamDetector.INSTANCE);
}
UserSession getUserSession() {
Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/DefaultStreamDetector.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/DefaultStreamDetector.java 2008-04-01 13:32:30 UTC (rev 3817)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/DefaultStreamDetector.java 2008-04-01 13:32:43 UTC (rev 3818)
@@ -12,6 +12,8 @@
*
*/
public final class DefaultStreamDetector implements StreamDetector {
+ public static final StreamDetector INSTANCE = new DefaultStreamDetector();
+
public StreamSerializerFactory detectStream(Object candidate) {
if (candidate instanceof InputStream) {
return new InputStreamStreamSerializerFactory();
16 years, 1 month
JBoss Remoting SVN: r3817 - remoting3/trunk.
by jboss-remoting-commits＠lists.jboss.org
Author: david.lloyd(a)jboss.com
Date: 2008-04-01 09:32:30 -0400 (Tue, 01 Apr 2008)
New Revision: 3817
Modified:
remoting3/trunk/build.xml
Log:
Add testing support module to build process
Modified: remoting3/trunk/build.xml
===================================================================
--- remoting3/trunk/build.xml 2008-04-01 13:29:07 UTC (rev 3816)
+++ remoting3/trunk/build.xml 2008-04-01 13:32:30 UTC (rev 3817)
@@ -893,6 +893,42 @@
</path>
</target>
+ <!-- testing-support module -->
+
+ <target name="testing-support.compile.depcheck">
+ <mkdir dir="testing-support/target/main"/>
+ <uptodate property="testing-support.compile.uptodate" targetfile="testing-support/target/main/.lastcompile">
+ <srcfiles dir="testing-support/src/main/java">
+ <include name="**/"/>
+ <include name="**/*.java"/>
+ <exclude name="**/.*"/>
+ </srcfiles>
+ </uptodate>
+ </target>
+
+ <target name="testing-support.compile" depends="testing-support.compile.depcheck" unless="testing-support.compile.uptodate">
+ <mkdir dir="testing-support/target/main/classes"/>
+ <javac
+ source="${javac.source}"
+ target="${javac.target}"
+ srcdir="testing-support/src/main/java"
+ destdir="testing-support/target/main/classes"
+ debug="true">
+ <compilerarg value="-Xlint:unchecked"/>
+ </javac>
+ <touch file="testing-support/target/main/.lastcompile" verbose="false"/>
+ </target>
+
+ <target name="testing-support.clean">
+ <delete dir="testing-support/target"/>
+ </target>
+
+ <target name="testing-support" description="Build the testing-support module" depends="testing-support.compile">
+ <path id="testing-support.classpath">
+ <pathelement location="testing-support/target/main/classes"/>
+ </path>
+ </target>
+
<!-- tools module -->
<target name="tools.compile.depcheck">
@@ -1195,9 +1231,9 @@
<!-- core -->
- <target name="all-core" description="Build all core targets" depends="api,compat,core,mc-deployers,samples,standalone,tools,util"/>
+ <target name="all-core" description="Build all core targets" depends="api,compat,core,mc-deployers,samples,standalone,testing-support,tools,util"/>
- <target name="clean-core" description="Clean all core targets" depends="api.clean,compat.clean,core.clean,mc-deployers.clean,samples.clean,standalone.clean,tools.clean,util.clean"/>
+ <target name="clean-core" description="Clean all core targets" depends="api.clean,compat.clean,core.clean,mc-deployers.clean,samples.clean,standalone.clean,testing-support.clean,tools.clean,util.clean"/>
<!-- http -->
16 years, 1 month