[jboss-cvs] JBoss Messaging SVN: r2301 - in trunk: src/main/org/jboss/jms/wireformat and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Feb 13 15:23:51 EST 2007
Author: ovidiu.feodorov at jboss.com
Date: 2007-02-13 15:23:51 -0500 (Tue, 13 Feb 2007)
New Revision: 2301
Modified:
trunk/docs/examples/queue/etc/log4j.xml
trunk/src/main/org/jboss/jms/wireformat/ConnectionFactoryGetClientAOPStackRequest.java
trunk/src/main/org/jboss/jms/wireformat/ConnectionFactoryGetClientAOPStackResponse.java
trunk/src/main/org/jboss/jms/wireformat/SerializedPacket.java
trunk/src/main/org/jboss/messaging/core/plugin/JDBCSupport.java
trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java
Log:
minor reformatting, refactoring
Modified: trunk/docs/examples/queue/etc/log4j.xml
===================================================================
--- trunk/docs/examples/queue/etc/log4j.xml 2007-02-13 18:58:52 UTC (rev 2300)
+++ trunk/docs/examples/queue/etc/log4j.xml 2007-02-13 20:23:51 UTC (rev 2301)
@@ -13,8 +13,86 @@
</layout>
</appender>
- <root>
+ <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <!--
+ Normally "test.logfile.suffix" takes on of the values: "invm", "remote-client",
+ "remote-server", "clustering-client", "clustering-server<index>", "crash-client",
+ "crash-server", etc.
+ -->
+ <param name="File" value="./client.trace.log"/>
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+ <param name="Threshold" value="TRACE#org.jboss.logging.XLevel"/>
+
+ <!-- since majority of the tests are ran in fork mode by ant, the log file is overwritten
+ for each test. We need to append if we want to preserve a full testsuite run log.
+ Make sure the build script clears this log at the beginning of each run.
+ -->
+ <param name="Append" value="true"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p @%t [%c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+ <category name="org.apache">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="org.jgroups">
+ <priority value="WARN"/>
+ </category>
+
+ <category name="org.jboss.remoting">
+ <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ <!-- <priority value="DEBUG"/> -->
+ </category>
+
+ <category name="org.jboss">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="org.jboss.messaging">
+ <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ <!-- <priority value="DEBUG"/> -->
+ </category>
+
+ <category name="org.jboss.jms">
+ <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ <!-- <priority value="DEBUG"/> -->
+ </category>
+
+ <category name="org.jboss.test">
+ <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ <!-- <priority value="DEBUG"/> -->
+ </category>
+
+ <!-- Ignoring trace from these: -->
+
+ <category name="org.jboss.jms.server.remoting.JMSServerInvocationHandler">
+ <priority value="DEBUG"/>
+ </category>
+
+ <category name="org.jboss.messaging.core.plugin.JDBCSupport">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="org.jboss.test.messaging.tools.jmx.MockJBossSecurityManager">
+ <priority value="DEBUG"/>
+ </category>
+
+ <category name="org.jboss.jms.server.remoting.JMSWireFormat">
+ <!-- <priority value="TRACE" class="org.jboss.logging.XLevel"/> -->
+ <priority value="DEBUG"/>
+ </category>
+
+
+
+
+ <root>
<appender-ref ref="CONSOLE"/>
+ <appender-ref ref="FILE"/>
</root>
</log4j:configuration>
Modified: trunk/src/main/org/jboss/jms/wireformat/ConnectionFactoryGetClientAOPStackRequest.java
===================================================================
--- trunk/src/main/org/jboss/jms/wireformat/ConnectionFactoryGetClientAOPStackRequest.java 2007-02-13 18:58:52 UTC (rev 2300)
+++ trunk/src/main/org/jboss/jms/wireformat/ConnectionFactoryGetClientAOPStackRequest.java 2007-02-13 20:23:51 UTC (rev 2301)
@@ -27,8 +27,6 @@
import org.jboss.jms.server.endpoint.ConnectionFactoryEndpoint;
/**
- * A ConnectionFactoryCreateConnectionDelegateRequest
- *
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
* @version <tt>$Revision: 1.1 $</tt>
*
@@ -37,40 +35,64 @@
*/
public class ConnectionFactoryGetClientAOPStackRequest extends RequestSupport
{
+ // Constants ------------------------------------------------------------------------------------
+
+ // Static ---------------------------------------------------------------------------------------
+
+ // Attributes -----------------------------------------------------------------------------------
+
+ // Constructors ---------------------------------------------------------------------------------
+
public ConnectionFactoryGetClientAOPStackRequest()
- {
+ {
}
-
- public ConnectionFactoryGetClientAOPStackRequest(int objectId,
- byte version)
+
+ public ConnectionFactoryGetClientAOPStackRequest(int objectId, byte version)
{
super(objectId, PacketSupport.REQ_CONNECTIONFACTORY_GETCLIENTAOPSTACK, version);
}
+ // RequestSupport overrides ---------------------------------------------------------------------
+
public void read(DataInputStream is) throws Exception
{
- super.read(is);
+ super.read(is);
}
+ public void write(DataOutputStream os) throws Exception
+ {
+ super.write(os);
+ os.flush();
+ }
+
public ResponseSupport serverInvoke() throws Exception
{
- ConnectionFactoryEndpoint endpoint =
+ ConnectionFactoryEndpoint endpoint =
(ConnectionFactoryEndpoint)Dispatcher.instance.getTarget(objectId);
-
+
if (endpoint == null)
{
- throw new IllegalStateException("Cannot find object in dispatcher with id " + objectId);
+ throw new IllegalStateException("Cannot find object with ID " + objectId + " in dispatcher");
}
-
- return new ConnectionFactoryGetClientAOPStackResponse(endpoint.getClientAOPStack());
+
+ return new ConnectionFactoryGetClientAOPStackResponse(endpoint.getClientAOPStack());
}
- public void write(DataOutputStream os) throws Exception
+ // Public ---------------------------------------------------------------------------------------
+
+ public String toString()
{
- super.write(os);
-
- os.flush();
+ return "ConnectionFactoryGetClientAOPStackRequest[" +
+ Integer.toHexString(System.identityHashCode(this)) + "]";
}
+ // Package protected ----------------------------------------------------------------------------
+
+ // Protected ------------------------------------------------------------------------------------
+
+ // Private --------------------------------------------------------------------------------------
+
+ // Inner classes --------------------------------------------------------------------------------
+
}
Modified: trunk/src/main/org/jboss/jms/wireformat/ConnectionFactoryGetClientAOPStackResponse.java
===================================================================
--- trunk/src/main/org/jboss/jms/wireformat/ConnectionFactoryGetClientAOPStackResponse.java 2007-02-13 18:58:52 UTC (rev 2300)
+++ trunk/src/main/org/jboss/jms/wireformat/ConnectionFactoryGetClientAOPStackResponse.java 2007-02-13 20:23:51 UTC (rev 2301)
@@ -36,43 +36,64 @@
*/
public class ConnectionFactoryGetClientAOPStackResponse extends ResponseSupport
{
+ // Constants ------------------------------------------------------------------------------------
+
+ // Static ---------------------------------------------------------------------------------------
+
+ // Attributes -----------------------------------------------------------------------------------
+
private byte[] stack;
-
+
+ // Constructors ---------------------------------------------------------------------------------
+
public ConnectionFactoryGetClientAOPStackResponse()
- {
- }
-
- public Object getResponse()
{
- return stack;
}
-
+
public ConnectionFactoryGetClientAOPStackResponse(byte[] stack)
{
super(PacketSupport.RESP_CONNECTIONFACTORY_GETCLIENTAOPSTACK);
-
this.stack = stack;
}
-
+
+ // ResponseSupport overrides --------------------------------------------------------------------
+
public void write(DataOutputStream os) throws Exception
{
super.write(os);
-
+
os.writeInt(stack.length);
-
os.write(stack);
-
os.flush();
}
-
+
public void read(DataInputStream is) throws Exception
{
- int len = is.readInt();
-
- stack = new byte[len];
-
+ int len = is.readInt();
+ stack = new byte[len];
is.readFully(stack);
}
+ public Object getResponse()
+ {
+ return stack;
+ }
+
+ // Public ---------------------------------------------------------------------------------------
+
+ public String toString()
+ {
+ return "ConnectionFactoryGetClientAOPStackResponse[" +
+ (stack == null ? "null" : stack.length + " bytes") + "]";
+ }
+
+ // Package protected ----------------------------------------------------------------------------
+
+ // Protected ------------------------------------------------------------------------------------
+
+ // Private --------------------------------------------------------------------------------------
+
+ // Inner classes --------------------------------------------------------------------------------
+
}
Modified: trunk/src/main/org/jboss/jms/wireformat/SerializedPacket.java
===================================================================
--- trunk/src/main/org/jboss/jms/wireformat/SerializedPacket.java 2007-02-13 18:58:52 UTC (rev 2300)
+++ trunk/src/main/org/jboss/jms/wireformat/SerializedPacket.java 2007-02-13 20:23:51 UTC (rev 2301)
@@ -26,60 +26,81 @@
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import org.jboss.logging.Logger;
import org.jboss.remoting.loading.ObjectInputStreamWithClassLoader;
/**
- * For carrying a remoting non JBM invocation across the wire
- *
- * Also used for internal invocation request return values e.g. PONG
+ * For carrying a remoting non JBM invocation across the wire. Also used for internal invocation
+ * request return values e.g. PONG. This would be used for pings, disconnect, addlistener,
+ * removelistener etc.
*
- * This would be used for pings, disconnect, addlistener, removelistener etc
- *
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
* @version <tt>$Revision: 1.1 $</tt>
*
* $Id$
- *
*/
public class SerializedPacket extends PacketSupport
{
- private static final Logger log = Logger.getLogger(SerializedPacket.class);
-
+ // Constants ------------------------------------------------------------------------------------
+
+ // Static ---------------------------------------------------------------------------------------
+
+ // Attributes -----------------------------------------------------------------------------------
+
private Object payload;
-
+
+ // Constructors ---------------------------------------------------------------------------------
+
public SerializedPacket()
- {
+ {
}
-
+
public SerializedPacket(Object payload)
{
super(PacketSupport.SERIALIZED);
-
this.payload = payload;
}
-
- public Object getPayload()
- {
- return payload;
- }
+ // Streamable implementation --------------------------------------------------------------------
+
public void read(DataInputStream is) throws Exception
{
- ObjectInputStream ois = new ObjectInputStreamWithClassLoader(is, Thread.currentThread().getContextClassLoader());
-
+ // need to use the thread context class loader, otherwise deserialization of various
+ // remoting and messaging things will fail in a scoped domain
+ ObjectInputStream ois =
+ new ObjectInputStreamWithClassLoader(is, Thread.currentThread().getContextClassLoader());
+
payload = ois.readObject();
}
public void write(DataOutputStream os) throws Exception
{
super.write(os);
-
+
ObjectOutputStream oos = new ObjectOutputStream(os);
-
oos.writeObject(payload);
-
os.flush();
}
+ // PacketSupport overrides ----------------------------------------------------------------------
+
+ public Object getPayload()
+ {
+ return payload;
+ }
+
+ // Public ---------------------------------------------------------------------------------------
+
+ public String toString()
+ {
+ return "SerializedPacket[" + payload + "]";
+ }
+
+ // Package protected ----------------------------------------------------------------------------
+
+ // Protected ------------------------------------------------------------------------------------
+
+ // Private --------------------------------------------------------------------------------------
+
+ // Inner classes --------------------------------------------------------------------------------
+
}
Modified: trunk/src/main/org/jboss/messaging/core/plugin/JDBCSupport.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/JDBCSupport.java 2007-02-13 18:58:52 UTC (rev 2300)
+++ trunk/src/main/org/jboss/messaging/core/plugin/JDBCSupport.java 2007-02-13 20:23:51 UTC (rev 2301)
@@ -200,14 +200,12 @@
private void createSchema() throws Exception
{
- // Postgresql will not process any further commands in a transaction
- // after a create table fails:
- // org.postgresql.util.PSQLException: ERROR: current transaction is aborted, commands ignored until end of transaction block
- // Therefore we need to ensure each CREATE is executed in its own transaction
+ // Postgresql will not process any further commands in a transaction after a create table
+ // fails: org.postgresql.util.PSQLException: ERROR: current transaction is aborted, commands
+ // ignored until end of transaction block. Therefore we need to ensure each CREATE is executed
+ // in its own transaction
- Iterator iter = defaultDDLStatements.keySet().iterator();
-
- while (iter.hasNext())
+ for(Iterator i = defaultDDLStatements.keySet().iterator(); i.hasNext(); )
{
Connection conn = null;
@@ -217,7 +215,7 @@
{
conn = ds.getConnection();
- String statementName = (String)iter.next();
+ String statementName = (String)i.next();
String statement = getSQLStatement(statementName);
Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java 2007-02-13 18:58:52 UTC (rev 2300)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java 2007-02-13 20:23:51 UTC (rev 2301)
@@ -1468,20 +1468,20 @@
conn = ds.getConnection();
- log.debug("Dropping table:" + statement);
+ log.debug("executing " + statement);
PreparedStatement ps = conn.prepareStatement(statement);
ps.executeUpdate();
- log.debug(statement + ": dropped ");
+ log.debug(statement + " executed");
ps.close();
}
catch (SQLException e)
{
- //Ignore
- log.debug("Failed to drop table:", e);
+ // Ignore
+ log.debug("Failed to execute statement", e);
exception = true;
}
}
@@ -1511,8 +1511,8 @@
InitialContext ctx = new InitialContext();
- //We need to execute each drop in its own transaction otherwise postgresql will
- //not execute further commands after one fails
+ // We need to execute each drop in its own transaction otherwise postgresql will not execute
+ // further commands after one fails
TransactionManager mgr = (TransactionManager)ctx.lookup(TransactionManagerService.JNDI_NAME);
DataSource ds = (DataSource)ctx.lookup("java:/DefaultDS");
More information about the jboss-cvs-commits
mailing list