You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/09/27 04:42:51 UTC
svn commit: r450289 [1/3] - in /incubator/activemq/trunk: activemq-core/
activemq-core/src/main/java/org/apache/activemq/openwire/v2/
activemq-core/src/test/java/org/apache/activemq/openwire/v2/
activemq-openwire-generator/src/main/java/org/apache/acti...
Author: chirino
Date: Tue Sep 26 19:42:47 2006
New Revision: 450289
URL: http://svn.apache.org/viewvc?view=rev&rev=450289
Log:
In an attempt to make the openwire generator easier to maintain and use from the now seperate activemq-cpp and
activemq-dotnet modules, I converted the groovy scripts to plain java and you can now execute them with just plain
Ant.
Added:
incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CGeneratorTask.java
incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CHeadersGenerator.java
incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CSharpClassesGenerator.java
incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CSharpGeneratorTask.java
incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CSharpMarshallingGenerator.java
incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CSourcesGenerator.java
incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CppClassesGenerator.java
- copied, changed from r450087, incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/OpenWireCppClassesScript.java
incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CppGeneratorTask.java
incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CppHeadersGenerator.java
- copied, changed from r450087, incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/OpenWireCppHeadersScript.java
incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CppMarshallingClassesGenerator.java
- copied, changed from r450087, incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/OpenWireCppMarshallingClassesScript.java
incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/CppMarshallingHeadersGenerator.java
- copied, changed from r450087, incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/OpenWireCppMarshallingHeadersScript.java
incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/JavaGeneratorTask.java
incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/JavaMarshallingGenerator.java
incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/JavaTestsGenerator.java
incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/MultiSourceGenerator.java
incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/OpenWireGenerator.java
- copied, changed from r450087, incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/OpenWireScript.java
incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/SingleSourceGenerator.java
Removed:
incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/OpenWireCSharpClassesScript.java
incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/OpenWireCSharpMarshallingScript.java
incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/OpenWireClassesScript.java
incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/OpenWireCppClassesScript.java
incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/OpenWireCppHeadersScript.java
incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/OpenWireCppMarshallingClassesScript.java
incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/OpenWireCppMarshallingHeadersScript.java
incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/OpenWireJavaMarshallingScript.java
incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/OpenWireScript.java
incubator/activemq/trunk/activemq-openwire-generator/src/main/resources/GenerateCMarshalling.groovy
incubator/activemq/trunk/activemq-openwire-generator/src/main/resources/GenerateCSharpClasses.groovy
incubator/activemq/trunk/activemq-openwire-generator/src/main/resources/GenerateCSharpMarshalling.groovy
incubator/activemq/trunk/activemq-openwire-generator/src/main/resources/GenerateCppClasses.groovy
incubator/activemq/trunk/activemq-openwire-generator/src/main/resources/GenerateCppHeaders.groovy
incubator/activemq/trunk/activemq-openwire-generator/src/main/resources/GenerateCppMarshallingClasses.groovy
incubator/activemq/trunk/activemq-openwire-generator/src/main/resources/GenerateCppMarshallingHeaders.groovy
incubator/activemq/trunk/activemq-openwire-generator/src/main/resources/GenerateJavaMarshalling.groovy
incubator/activemq/trunk/activemq-openwire-generator/src/main/resources/GenerateJavaTests.groovy
Modified:
incubator/activemq/trunk/activemq-core/pom.xml
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MarshallerFactory.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/BrokerIdTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/BrokerInfoTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConnectionControlTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConnectionErrorTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConnectionIdTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConnectionInfoTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConsumerControlTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConsumerIdTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConsumerInfoTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ControlCommandTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/DataArrayResponseTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/DataResponseTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/DestinationInfoTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/DiscoveryEventTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ExceptionResponseTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/FlushCommandTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/IntegerResponseTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/JournalQueueAckTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/JournalTopicAckTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/JournalTraceTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/JournalTransactionTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/KeepAliveInfoTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/LastPartialCommandTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/LocalTransactionIdTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/MessageAckTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/MessageDispatchNotificationTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/MessageDispatchTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/MessageIdTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/MessagePullTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/MessageTestSupport.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/NetworkBridgeFilterTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/PartialCommandTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ProducerIdTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ProducerInfoTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/RemoveInfoTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/RemoveSubscriptionInfoTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ReplayCommandTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ResponseTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/SessionIdTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/SessionInfoTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ShutdownInfoTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/SubscriptionInfoTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/TransactionIdTestSupport.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/TransactionInfoTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/XATransactionIdTest.java
Modified: incubator/activemq/trunk/activemq-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/pom.xml?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/pom.xml (original)
+++ incubator/activemq/trunk/activemq-core/pom.xml Tue Sep 26 19:42:47 2006
@@ -287,7 +287,25 @@
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <configuration>
+ <tasks>
+ <taskdef name="generate" classname="org.apache.activemq.openwire.tool.JavaGenerator"/>
+ <generate version="2" basedir="${basedir}"/>
+ </tasks>
+ </configuration>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-openwire-generator</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+
<!-- Use Gram to Gernerate the OpenWire Marshallers -->
+ <!--
<plugin>
<groupId>org.apache.activemq</groupId>
<artifactId>maven-gram-plugin</artifactId>
@@ -310,6 +328,7 @@
</dependency>
</dependencies>
</plugin>
+ -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MarshallerFactory.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MarshallerFactory.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MarshallerFactory.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v2/MarshallerFactory.java Tue Sep 26 19:42:47 2006
@@ -40,67 +40,67 @@
static final private DataStreamMarshaller marshaller[] = new DataStreamMarshaller[256];
static {
- add(new LocalTransactionIdMarshaller());
- add(new PartialCommandMarshaller());
- add(new IntegerResponseMarshaller());
- add(new ActiveMQQueueMarshaller());
+ add(new ActiveMQBytesMessageMarshaller());
+ add(new ActiveMQMapMessageMarshaller());
+ add(new ActiveMQMessageMarshaller());
add(new ActiveMQObjectMessageMarshaller());
- add(new ConnectionIdMarshaller());
- add(new ConnectionInfoMarshaller());
- add(new ProducerInfoMarshaller());
- add(new MessageDispatchNotificationMarshaller());
- add(new SessionInfoMarshaller());
- add(new TransactionInfoMarshaller());
+ add(new ActiveMQQueueMarshaller());
add(new ActiveMQStreamMessageMarshaller());
- add(new MessageAckMarshaller());
- add(new ProducerIdMarshaller());
- add(new MessageIdMarshaller());
add(new ActiveMQTempQueueMarshaller());
- add(new RemoveSubscriptionInfoMarshaller());
- add(new SessionIdMarshaller());
- add(new DataArrayResponseMarshaller());
- add(new JournalQueueAckMarshaller());
- add(new ResponseMarshaller());
- add(new ConnectionErrorMarshaller());
- add(new ConsumerInfoMarshaller());
- add(new XATransactionIdMarshaller());
- add(new JournalTraceMarshaller());
- add(new ConsumerIdMarshaller());
- add(new ActiveMQTextMessageMarshaller());
- add(new SubscriptionInfoMarshaller());
- add(new JournalTransactionMarshaller());
- add(new ControlCommandMarshaller());
- add(new LastPartialCommandMarshaller());
- add(new NetworkBridgeFilterMarshaller());
- add(new MessagePullMarshaller());
- add(new ActiveMQBytesMessageMarshaller());
- add(new WireFormatInfoMarshaller());
add(new ActiveMQTempTopicMarshaller());
- add(new DiscoveryEventMarshaller());
- add(new ReplayCommandMarshaller());
+ add(new ActiveMQTextMessageMarshaller());
add(new ActiveMQTopicMarshaller());
+ add(new BrokerIdMarshaller());
add(new BrokerInfoMarshaller());
- add(new DestinationInfoMarshaller());
- add(new ShutdownInfoMarshaller());
- add(new DataResponseMarshaller());
add(new ConnectionControlMarshaller());
- add(new KeepAliveInfoMarshaller());
- add(new FlushCommandMarshaller());
+ add(new ConnectionErrorMarshaller());
+ add(new ConnectionIdMarshaller());
+ add(new ConnectionInfoMarshaller());
add(new ConsumerControlMarshaller());
+ add(new ConsumerIdMarshaller());
+ add(new ConsumerInfoMarshaller());
+ add(new ControlCommandMarshaller());
+ add(new DataArrayResponseMarshaller());
+ add(new DataResponseMarshaller());
+ add(new DestinationInfoMarshaller());
+ add(new DiscoveryEventMarshaller());
+ add(new ExceptionResponseMarshaller());
+ add(new FlushCommandMarshaller());
+ add(new IntegerResponseMarshaller());
+ add(new JournalQueueAckMarshaller());
add(new JournalTopicAckMarshaller());
- add(new BrokerIdMarshaller());
+ add(new JournalTraceMarshaller());
+ add(new JournalTransactionMarshaller());
+ add(new KeepAliveInfoMarshaller());
+ add(new LastPartialCommandMarshaller());
+ add(new LocalTransactionIdMarshaller());
+ add(new MessageAckMarshaller());
add(new MessageDispatchMarshaller());
- add(new ActiveMQMapMessageMarshaller());
- add(new ActiveMQMessageMarshaller());
+ add(new MessageDispatchNotificationMarshaller());
+ add(new MessageIdMarshaller());
+ add(new MessagePullMarshaller());
+ add(new NetworkBridgeFilterMarshaller());
+ add(new PartialCommandMarshaller());
+ add(new ProducerIdMarshaller());
+ add(new ProducerInfoMarshaller());
add(new RemoveInfoMarshaller());
- add(new ExceptionResponseMarshaller());
+ add(new RemoveSubscriptionInfoMarshaller());
+ add(new ReplayCommandMarshaller());
+ add(new ResponseMarshaller());
+ add(new SessionIdMarshaller());
+ add(new SessionInfoMarshaller());
+ add(new ShutdownInfoMarshaller());
+ add(new SubscriptionInfoMarshaller());
+ add(new TransactionInfoMarshaller());
+ add(new WireFormatInfoMarshaller());
+ add(new XATransactionIdMarshaller());
- }
+ }
- static private void add(DataStreamMarshaller dsm) {
+ static private void add(DataStreamMarshaller dsm) {
marshaller[dsm.getDataStructureType()] = dsm;
}
-
+
static public DataStreamMarshaller[] createMarshallerMap(OpenWireFormat wireFormat) {
return marshaller;
}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/BrokerIdTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/BrokerIdTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/BrokerIdTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/BrokerIdTest.java Tue Sep 26 19:42:47 2006
@@ -42,16 +42,15 @@
public static BrokerIdTest SINGLETON = new BrokerIdTest();
public Object createObject() throws Exception {
- BrokerId info = new BrokerId();
- populateObject(info);
- return info;
+ BrokerId info = new BrokerId();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- BrokerId info = (BrokerId) object;
- info.setValue("Value:1");
+ super.populateObject(object);
+ BrokerId info = (BrokerId) object;
- }
- }
+ info.setValue("Value:1");
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/BrokerInfoTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/BrokerInfoTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/BrokerInfoTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/BrokerInfoTest.java Tue Sep 26 19:42:47 2006
@@ -42,29 +42,27 @@
public static BrokerInfoTest SINGLETON = new BrokerInfoTest();
public Object createObject() throws Exception {
- BrokerInfo info = new BrokerInfo();
- populateObject(info);
- return info;
+ BrokerInfo info = new BrokerInfo();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- BrokerInfo info = (BrokerInfo) object;
+ super.populateObject(object);
+ BrokerInfo info = (BrokerInfo) object;
+
info.setBrokerId(createBrokerId("BrokerId:1"));
info.setBrokerURL("BrokerURL:2");
-
- {
- BrokerInfo value[] = new BrokerInfo[0];
- for( int i=0; i < 0; i++ ) {
- value[i] = createBrokerInfo("PeerBrokerInfos:3");
- }
- info.setPeerBrokerInfos(value);
+ {
+ BrokerInfo value[] = new BrokerInfo[0];
+ for( int i=0; i < 0; i++ ) {
+ value[i] = createBrokerInfo("PeerBrokerInfos:3");
}
+ info.setPeerBrokerInfos(value);
+ }
info.setBrokerName("BrokerName:4");
info.setSlaveBroker(true);
info.setMasterBroker(false);
info.setFaultTolerantConfiguration(true);
-
- }
- }
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConnectionControlTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConnectionControlTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConnectionControlTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConnectionControlTest.java Tue Sep 26 19:42:47 2006
@@ -42,20 +42,19 @@
public static ConnectionControlTest SINGLETON = new ConnectionControlTest();
public Object createObject() throws Exception {
- ConnectionControl info = new ConnectionControl();
- populateObject(info);
- return info;
+ ConnectionControl info = new ConnectionControl();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- ConnectionControl info = (ConnectionControl) object;
+ super.populateObject(object);
+ ConnectionControl info = (ConnectionControl) object;
+
info.setClose(true);
info.setExit(false);
info.setFaultTolerant(true);
info.setResume(false);
info.setSuspend(true);
-
- }
- }
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConnectionErrorTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConnectionErrorTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConnectionErrorTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConnectionErrorTest.java Tue Sep 26 19:42:47 2006
@@ -42,17 +42,16 @@
public static ConnectionErrorTest SINGLETON = new ConnectionErrorTest();
public Object createObject() throws Exception {
- ConnectionError info = new ConnectionError();
- populateObject(info);
- return info;
+ ConnectionError info = new ConnectionError();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- ConnectionError info = (ConnectionError) object;
+ super.populateObject(object);
+ ConnectionError info = (ConnectionError) object;
+
info.setException(createThrowable("Exception:1"));
info.setConnectionId(createConnectionId("ConnectionId:2"));
-
- }
- }
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConnectionIdTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConnectionIdTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConnectionIdTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConnectionIdTest.java Tue Sep 26 19:42:47 2006
@@ -42,16 +42,15 @@
public static ConnectionIdTest SINGLETON = new ConnectionIdTest();
public Object createObject() throws Exception {
- ConnectionId info = new ConnectionId();
- populateObject(info);
- return info;
+ ConnectionId info = new ConnectionId();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- ConnectionId info = (ConnectionId) object;
- info.setValue("Value:1");
+ super.populateObject(object);
+ ConnectionId info = (ConnectionId) object;
- }
- }
+ info.setValue("Value:1");
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConnectionInfoTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConnectionInfoTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConnectionInfoTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConnectionInfoTest.java Tue Sep 26 19:42:47 2006
@@ -42,29 +42,27 @@
public static ConnectionInfoTest SINGLETON = new ConnectionInfoTest();
public Object createObject() throws Exception {
- ConnectionInfo info = new ConnectionInfo();
- populateObject(info);
- return info;
+ ConnectionInfo info = new ConnectionInfo();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- ConnectionInfo info = (ConnectionInfo) object;
+ super.populateObject(object);
+ ConnectionInfo info = (ConnectionInfo) object;
+
info.setConnectionId(createConnectionId("ConnectionId:1"));
info.setClientId("ClientId:2");
info.setPassword("Password:3");
info.setUserName("UserName:4");
-
- {
- BrokerId value[] = new BrokerId[2];
- for( int i=0; i < 2; i++ ) {
- value[i] = createBrokerId("BrokerPath:5");
- }
- info.setBrokerPath(value);
+ {
+ BrokerId value[] = new BrokerId[2];
+ for( int i=0; i < 2; i++ ) {
+ value[i] = createBrokerId("BrokerPath:5");
}
+ info.setBrokerPath(value);
+ }
info.setBrokerMasterConnector(true);
info.setManageable(false);
-
- }
- }
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConsumerControlTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConsumerControlTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConsumerControlTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConsumerControlTest.java Tue Sep 26 19:42:47 2006
@@ -42,18 +42,17 @@
public static ConsumerControlTest SINGLETON = new ConsumerControlTest();
public Object createObject() throws Exception {
- ConsumerControl info = new ConsumerControl();
- populateObject(info);
- return info;
+ ConsumerControl info = new ConsumerControl();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- ConsumerControl info = (ConsumerControl) object;
+ super.populateObject(object);
+ ConsumerControl info = (ConsumerControl) object;
+
info.setClose(true);
info.setConsumerId(createConsumerId("ConsumerId:1"));
info.setPrefetch(1);
-
- }
- }
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConsumerIdTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConsumerIdTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConsumerIdTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConsumerIdTest.java Tue Sep 26 19:42:47 2006
@@ -42,18 +42,17 @@
public static ConsumerIdTest SINGLETON = new ConsumerIdTest();
public Object createObject() throws Exception {
- ConsumerId info = new ConsumerId();
- populateObject(info);
- return info;
+ ConsumerId info = new ConsumerId();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- ConsumerId info = (ConsumerId) object;
+ super.populateObject(object);
+ ConsumerId info = (ConsumerId) object;
+
info.setConnectionId("ConnectionId:1");
info.setSessionId(1);
info.setValue(2);
-
- }
- }
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConsumerInfoTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConsumerInfoTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConsumerInfoTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ConsumerInfoTest.java Tue Sep 26 19:42:47 2006
@@ -42,15 +42,15 @@
public static ConsumerInfoTest SINGLETON = new ConsumerInfoTest();
public Object createObject() throws Exception {
- ConsumerInfo info = new ConsumerInfo();
- populateObject(info);
- return info;
+ ConsumerInfo info = new ConsumerInfo();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- ConsumerInfo info = (ConsumerInfo) object;
+ super.populateObject(object);
+ ConsumerInfo info = (ConsumerInfo) object;
+
info.setConsumerId(createConsumerId("ConsumerId:1"));
info.setBrowser(true);
info.setDestination(createActiveMQDestination("Destination:2"));
@@ -63,18 +63,16 @@
info.setExclusive(false);
info.setRetroactive(true);
info.setPriority((byte) 1);
-
- {
- BrokerId value[] = new BrokerId[2];
- for( int i=0; i < 2; i++ ) {
- value[i] = createBrokerId("BrokerPath:5");
- }
- info.setBrokerPath(value);
+ {
+ BrokerId value[] = new BrokerId[2];
+ for( int i=0; i < 2; i++ ) {
+ value[i] = createBrokerId("BrokerPath:5");
}
+ info.setBrokerPath(value);
+ }
info.setAdditionalPredicate(createBooleanExpression("AdditionalPredicate:6"));
info.setNetworkSubscription(false);
info.setOptimizedAcknowledge(true);
info.setNoRangeAcks(false);
-
- }
- }
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ControlCommandTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ControlCommandTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ControlCommandTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ControlCommandTest.java Tue Sep 26 19:42:47 2006
@@ -42,16 +42,15 @@
public static ControlCommandTest SINGLETON = new ControlCommandTest();
public Object createObject() throws Exception {
- ControlCommand info = new ControlCommand();
- populateObject(info);
- return info;
+ ControlCommand info = new ControlCommand();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- ControlCommand info = (ControlCommand) object;
- info.setCommand("Command:1");
+ super.populateObject(object);
+ ControlCommand info = (ControlCommand) object;
- }
- }
+ info.setCommand("Command:1");
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/DataArrayResponseTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/DataArrayResponseTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/DataArrayResponseTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/DataArrayResponseTest.java Tue Sep 26 19:42:47 2006
@@ -42,23 +42,21 @@
public static DataArrayResponseTest SINGLETON = new DataArrayResponseTest();
public Object createObject() throws Exception {
- DataArrayResponse info = new DataArrayResponse();
- populateObject(info);
- return info;
+ DataArrayResponse info = new DataArrayResponse();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- DataArrayResponse info = (DataArrayResponse) object;
-
- {
- DataStructure value[] = new DataStructure[2];
- for( int i=0; i < 2; i++ ) {
- value[i] = createDataStructure("Data:1");
- }
- info.setData(value);
- }
+ super.populateObject(object);
+ DataArrayResponse info = (DataArrayResponse) object;
+ {
+ DataStructure value[] = new DataStructure[2];
+ for( int i=0; i < 2; i++ ) {
+ value[i] = createDataStructure("Data:1");
}
+ info.setData(value);
}
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/DataResponseTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/DataResponseTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/DataResponseTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/DataResponseTest.java Tue Sep 26 19:42:47 2006
@@ -42,16 +42,15 @@
public static DataResponseTest SINGLETON = new DataResponseTest();
public Object createObject() throws Exception {
- DataResponse info = new DataResponse();
- populateObject(info);
- return info;
+ DataResponse info = new DataResponse();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- DataResponse info = (DataResponse) object;
- info.setData(createDataStructure("Data:1"));
+ super.populateObject(object);
+ DataResponse info = (DataResponse) object;
- }
- }
+ info.setData(createDataStructure("Data:1"));
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/DestinationInfoTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/DestinationInfoTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/DestinationInfoTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/DestinationInfoTest.java Tue Sep 26 19:42:47 2006
@@ -42,27 +42,25 @@
public static DestinationInfoTest SINGLETON = new DestinationInfoTest();
public Object createObject() throws Exception {
- DestinationInfo info = new DestinationInfo();
- populateObject(info);
- return info;
+ DestinationInfo info = new DestinationInfo();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- DestinationInfo info = (DestinationInfo) object;
+ super.populateObject(object);
+ DestinationInfo info = (DestinationInfo) object;
+
info.setConnectionId(createConnectionId("ConnectionId:1"));
info.setDestination(createActiveMQDestination("Destination:2"));
info.setOperationType((byte) 1);
info.setTimeout(1);
-
- {
- BrokerId value[] = new BrokerId[2];
- for( int i=0; i < 2; i++ ) {
- value[i] = createBrokerId("BrokerPath:3");
- }
- info.setBrokerPath(value);
- }
-
+ {
+ BrokerId value[] = new BrokerId[2];
+ for( int i=0; i < 2; i++ ) {
+ value[i] = createBrokerId("BrokerPath:3");
}
+ info.setBrokerPath(value);
}
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/DiscoveryEventTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/DiscoveryEventTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/DiscoveryEventTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/DiscoveryEventTest.java Tue Sep 26 19:42:47 2006
@@ -42,17 +42,16 @@
public static DiscoveryEventTest SINGLETON = new DiscoveryEventTest();
public Object createObject() throws Exception {
- DiscoveryEvent info = new DiscoveryEvent();
- populateObject(info);
- return info;
+ DiscoveryEvent info = new DiscoveryEvent();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- DiscoveryEvent info = (DiscoveryEvent) object;
+ super.populateObject(object);
+ DiscoveryEvent info = (DiscoveryEvent) object;
+
info.setServiceName("ServiceName:1");
info.setBrokerName("BrokerName:2");
-
- }
- }
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ExceptionResponseTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ExceptionResponseTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ExceptionResponseTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ExceptionResponseTest.java Tue Sep 26 19:42:47 2006
@@ -42,16 +42,15 @@
public static ExceptionResponseTest SINGLETON = new ExceptionResponseTest();
public Object createObject() throws Exception {
- ExceptionResponse info = new ExceptionResponse();
- populateObject(info);
- return info;
+ ExceptionResponse info = new ExceptionResponse();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- ExceptionResponse info = (ExceptionResponse) object;
- info.setException(createThrowable("Exception:1"));
+ super.populateObject(object);
+ ExceptionResponse info = (ExceptionResponse) object;
- }
- }
+ info.setException(createThrowable("Exception:1"));
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/FlushCommandTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/FlushCommandTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/FlushCommandTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/FlushCommandTest.java Tue Sep 26 19:42:47 2006
@@ -42,15 +42,14 @@
public static FlushCommandTest SINGLETON = new FlushCommandTest();
public Object createObject() throws Exception {
- FlushCommand info = new FlushCommand();
- populateObject(info);
- return info;
+ FlushCommand info = new FlushCommand();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- FlushCommand info = (FlushCommand) object;
+ super.populateObject(object);
+ FlushCommand info = (FlushCommand) object;
- }
- }
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/IntegerResponseTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/IntegerResponseTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/IntegerResponseTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/IntegerResponseTest.java Tue Sep 26 19:42:47 2006
@@ -42,16 +42,15 @@
public static IntegerResponseTest SINGLETON = new IntegerResponseTest();
public Object createObject() throws Exception {
- IntegerResponse info = new IntegerResponse();
- populateObject(info);
- return info;
+ IntegerResponse info = new IntegerResponse();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- IntegerResponse info = (IntegerResponse) object;
- info.setResult(1);
+ super.populateObject(object);
+ IntegerResponse info = (IntegerResponse) object;
- }
- }
+ info.setResult(1);
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/JournalQueueAckTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/JournalQueueAckTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/JournalQueueAckTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/JournalQueueAckTest.java Tue Sep 26 19:42:47 2006
@@ -42,17 +42,16 @@
public static JournalQueueAckTest SINGLETON = new JournalQueueAckTest();
public Object createObject() throws Exception {
- JournalQueueAck info = new JournalQueueAck();
- populateObject(info);
- return info;
+ JournalQueueAck info = new JournalQueueAck();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- JournalQueueAck info = (JournalQueueAck) object;
+ super.populateObject(object);
+ JournalQueueAck info = (JournalQueueAck) object;
+
info.setDestination(createActiveMQDestination("Destination:1"));
info.setMessageAck(createMessageAck("MessageAck:2"));
-
- }
- }
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/JournalTopicAckTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/JournalTopicAckTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/JournalTopicAckTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/JournalTopicAckTest.java Tue Sep 26 19:42:47 2006
@@ -42,21 +42,20 @@
public static JournalTopicAckTest SINGLETON = new JournalTopicAckTest();
public Object createObject() throws Exception {
- JournalTopicAck info = new JournalTopicAck();
- populateObject(info);
- return info;
+ JournalTopicAck info = new JournalTopicAck();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- JournalTopicAck info = (JournalTopicAck) object;
+ super.populateObject(object);
+ JournalTopicAck info = (JournalTopicAck) object;
+
info.setDestination(createActiveMQDestination("Destination:1"));
info.setMessageId(createMessageId("MessageId:2"));
info.setMessageSequenceId(1);
info.setSubscritionName("SubscritionName:3");
info.setClientId("ClientId:4");
info.setTransactionId(createTransactionId("TransactionId:5"));
-
- }
- }
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/JournalTraceTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/JournalTraceTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/JournalTraceTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/JournalTraceTest.java Tue Sep 26 19:42:47 2006
@@ -42,16 +42,15 @@
public static JournalTraceTest SINGLETON = new JournalTraceTest();
public Object createObject() throws Exception {
- JournalTrace info = new JournalTrace();
- populateObject(info);
- return info;
+ JournalTrace info = new JournalTrace();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- JournalTrace info = (JournalTrace) object;
- info.setMessage("Message:1");
+ super.populateObject(object);
+ JournalTrace info = (JournalTrace) object;
- }
- }
+ info.setMessage("Message:1");
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/JournalTransactionTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/JournalTransactionTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/JournalTransactionTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/JournalTransactionTest.java Tue Sep 26 19:42:47 2006
@@ -42,18 +42,17 @@
public static JournalTransactionTest SINGLETON = new JournalTransactionTest();
public Object createObject() throws Exception {
- JournalTransaction info = new JournalTransaction();
- populateObject(info);
- return info;
+ JournalTransaction info = new JournalTransaction();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- JournalTransaction info = (JournalTransaction) object;
+ super.populateObject(object);
+ JournalTransaction info = (JournalTransaction) object;
+
info.setTransactionId(createTransactionId("TransactionId:1"));
info.setType((byte) 1);
info.setWasPrepared(true);
-
- }
- }
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/KeepAliveInfoTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/KeepAliveInfoTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/KeepAliveInfoTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/KeepAliveInfoTest.java Tue Sep 26 19:42:47 2006
@@ -42,15 +42,14 @@
public static KeepAliveInfoTest SINGLETON = new KeepAliveInfoTest();
public Object createObject() throws Exception {
- KeepAliveInfo info = new KeepAliveInfo();
- populateObject(info);
- return info;
+ KeepAliveInfo info = new KeepAliveInfo();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- KeepAliveInfo info = (KeepAliveInfo) object;
+ super.populateObject(object);
+ KeepAliveInfo info = (KeepAliveInfo) object;
- }
- }
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/LastPartialCommandTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/LastPartialCommandTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/LastPartialCommandTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/LastPartialCommandTest.java Tue Sep 26 19:42:47 2006
@@ -42,15 +42,14 @@
public static LastPartialCommandTest SINGLETON = new LastPartialCommandTest();
public Object createObject() throws Exception {
- LastPartialCommand info = new LastPartialCommand();
- populateObject(info);
- return info;
+ LastPartialCommand info = new LastPartialCommand();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- LastPartialCommand info = (LastPartialCommand) object;
+ super.populateObject(object);
+ LastPartialCommand info = (LastPartialCommand) object;
- }
- }
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/LocalTransactionIdTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/LocalTransactionIdTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/LocalTransactionIdTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/LocalTransactionIdTest.java Tue Sep 26 19:42:47 2006
@@ -42,17 +42,16 @@
public static LocalTransactionIdTest SINGLETON = new LocalTransactionIdTest();
public Object createObject() throws Exception {
- LocalTransactionId info = new LocalTransactionId();
- populateObject(info);
- return info;
+ LocalTransactionId info = new LocalTransactionId();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- LocalTransactionId info = (LocalTransactionId) object;
+ super.populateObject(object);
+ LocalTransactionId info = (LocalTransactionId) object;
+
info.setValue(1);
info.setConnectionId(createConnectionId("ConnectionId:1"));
-
- }
- }
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/MessageAckTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/MessageAckTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/MessageAckTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/MessageAckTest.java Tue Sep 26 19:42:47 2006
@@ -42,15 +42,15 @@
public static MessageAckTest SINGLETON = new MessageAckTest();
public Object createObject() throws Exception {
- MessageAck info = new MessageAck();
- populateObject(info);
- return info;
+ MessageAck info = new MessageAck();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- MessageAck info = (MessageAck) object;
+ super.populateObject(object);
+ MessageAck info = (MessageAck) object;
+
info.setDestination(createActiveMQDestination("Destination:1"));
info.setTransactionId(createTransactionId("TransactionId:2"));
info.setConsumerId(createConsumerId("ConsumerId:3"));
@@ -58,6 +58,5 @@
info.setFirstMessageId(createMessageId("FirstMessageId:4"));
info.setLastMessageId(createMessageId("LastMessageId:5"));
info.setMessageCount(1);
-
- }
- }
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/MessageDispatchNotificationTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/MessageDispatchNotificationTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/MessageDispatchNotificationTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/MessageDispatchNotificationTest.java Tue Sep 26 19:42:47 2006
@@ -42,19 +42,18 @@
public static MessageDispatchNotificationTest SINGLETON = new MessageDispatchNotificationTest();
public Object createObject() throws Exception {
- MessageDispatchNotification info = new MessageDispatchNotification();
- populateObject(info);
- return info;
+ MessageDispatchNotification info = new MessageDispatchNotification();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- MessageDispatchNotification info = (MessageDispatchNotification) object;
+ super.populateObject(object);
+ MessageDispatchNotification info = (MessageDispatchNotification) object;
+
info.setConsumerId(createConsumerId("ConsumerId:1"));
info.setDestination(createActiveMQDestination("Destination:2"));
info.setDeliverySequenceId(1);
info.setMessageId(createMessageId("MessageId:3"));
-
- }
- }
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/MessageDispatchTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/MessageDispatchTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/MessageDispatchTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/MessageDispatchTest.java Tue Sep 26 19:42:47 2006
@@ -42,19 +42,18 @@
public static MessageDispatchTest SINGLETON = new MessageDispatchTest();
public Object createObject() throws Exception {
- MessageDispatch info = new MessageDispatch();
- populateObject(info);
- return info;
+ MessageDispatch info = new MessageDispatch();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- MessageDispatch info = (MessageDispatch) object;
+ super.populateObject(object);
+ MessageDispatch info = (MessageDispatch) object;
+
info.setConsumerId(createConsumerId("ConsumerId:1"));
info.setDestination(createActiveMQDestination("Destination:2"));
info.setMessage(createMessage("Message:3"));
info.setRedeliveryCounter(1);
-
- }
- }
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/MessageIdTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/MessageIdTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/MessageIdTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/MessageIdTest.java Tue Sep 26 19:42:47 2006
@@ -42,18 +42,17 @@
public static MessageIdTest SINGLETON = new MessageIdTest();
public Object createObject() throws Exception {
- MessageId info = new MessageId();
- populateObject(info);
- return info;
+ MessageId info = new MessageId();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- MessageId info = (MessageId) object;
+ super.populateObject(object);
+ MessageId info = (MessageId) object;
+
info.setProducerId(createProducerId("ProducerId:1"));
info.setProducerSequenceId(1);
info.setBrokerSequenceId(2);
-
- }
- }
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/MessagePullTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/MessagePullTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/MessagePullTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/MessagePullTest.java Tue Sep 26 19:42:47 2006
@@ -42,18 +42,17 @@
public static MessagePullTest SINGLETON = new MessagePullTest();
public Object createObject() throws Exception {
- MessagePull info = new MessagePull();
- populateObject(info);
- return info;
+ MessagePull info = new MessagePull();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- MessagePull info = (MessagePull) object;
+ super.populateObject(object);
+ MessagePull info = (MessagePull) object;
+
info.setConsumerId(createConsumerId("ConsumerId:1"));
info.setDestination(createActiveMQDestination("Destination:2"));
info.setTimeout(1);
-
- }
- }
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/MessageTestSupport.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/MessageTestSupport.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/MessageTestSupport.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/MessageTestSupport.java Tue Sep 26 19:42:47 2006
@@ -38,10 +38,11 @@
*/
public abstract class MessageTestSupport extends BaseCommandTestSupport {
-
+
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- Message info = (Message) object;
+ super.populateObject(object);
+ Message info = (Message) object;
+
info.setProducerId(createProducerId("ProducerId:1"));
info.setDestination(createActiveMQDestination("Destination:2"));
info.setTransactionId(createTransactionId("TransactionId:3"));
@@ -57,33 +58,27 @@
info.setReplyTo(createActiveMQDestination("ReplyTo:9"));
info.setTimestamp(2);
info.setType("Type:10");
-
- {
- byte data[] = "Content:11".getBytes();
- info.setContent(new org.apache.activemq.util.ByteSequence(data,0,data.length));
- }
-
-
- {
- byte data[] = "MarshalledProperties:12".getBytes();
- info.setMarshalledProperties(new org.apache.activemq.util.ByteSequence(data,0,data.length));
- }
-
+ {
+ byte data[] = "Content:11".getBytes();
+ info.setContent(new org.apache.activemq.util.ByteSequence(data,0,data.length));
+}
+ {
+ byte data[] = "MarshalledProperties:12".getBytes();
+ info.setMarshalledProperties(new org.apache.activemq.util.ByteSequence(data,0,data.length));
+}
info.setDataStructure(createDataStructure("DataStructure:13"));
info.setTargetConsumerId(createConsumerId("TargetConsumerId:14"));
info.setCompressed(false);
info.setRedeliveryCounter(2);
-
- {
- BrokerId value[] = new BrokerId[2];
- for( int i=0; i < 2; i++ ) {
- value[i] = createBrokerId("BrokerPath:15");
- }
- info.setBrokerPath(value);
+ {
+ BrokerId value[] = new BrokerId[2];
+ for( int i=0; i < 2; i++ ) {
+ value[i] = createBrokerId("BrokerPath:15");
}
+ info.setBrokerPath(value);
+ }
info.setArrival(3);
info.setUserID("UserID:16");
info.setRecievedByDFBridge(true);
-
- }
- }
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/NetworkBridgeFilterTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/NetworkBridgeFilterTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/NetworkBridgeFilterTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/NetworkBridgeFilterTest.java Tue Sep 26 19:42:47 2006
@@ -42,17 +42,16 @@
public static NetworkBridgeFilterTest SINGLETON = new NetworkBridgeFilterTest();
public Object createObject() throws Exception {
- NetworkBridgeFilter info = new NetworkBridgeFilter();
- populateObject(info);
- return info;
+ NetworkBridgeFilter info = new NetworkBridgeFilter();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- NetworkBridgeFilter info = (NetworkBridgeFilter) object;
+ super.populateObject(object);
+ NetworkBridgeFilter info = (NetworkBridgeFilter) object;
+
info.setNetworkTTL(1);
info.setNetworkBrokerId(createBrokerId("NetworkBrokerId:1"));
-
- }
- }
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/PartialCommandTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/PartialCommandTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/PartialCommandTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/PartialCommandTest.java Tue Sep 26 19:42:47 2006
@@ -42,17 +42,16 @@
public static PartialCommandTest SINGLETON = new PartialCommandTest();
public Object createObject() throws Exception {
- PartialCommand info = new PartialCommand();
- populateObject(info);
- return info;
+ PartialCommand info = new PartialCommand();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- PartialCommand info = (PartialCommand) object;
+ super.populateObject(object);
+ PartialCommand info = (PartialCommand) object;
+
info.setCommandId(1);
info.setData("Data:1".getBytes());
-
- }
- }
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ProducerIdTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ProducerIdTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ProducerIdTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ProducerIdTest.java Tue Sep 26 19:42:47 2006
@@ -42,18 +42,17 @@
public static ProducerIdTest SINGLETON = new ProducerIdTest();
public Object createObject() throws Exception {
- ProducerId info = new ProducerId();
- populateObject(info);
- return info;
+ ProducerId info = new ProducerId();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- ProducerId info = (ProducerId) object;
+ super.populateObject(object);
+ ProducerId info = (ProducerId) object;
+
info.setConnectionId("ConnectionId:1");
info.setValue(1);
info.setSessionId(2);
-
- }
- }
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ProducerInfoTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ProducerInfoTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ProducerInfoTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ProducerInfoTest.java Tue Sep 26 19:42:47 2006
@@ -42,25 +42,23 @@
public static ProducerInfoTest SINGLETON = new ProducerInfoTest();
public Object createObject() throws Exception {
- ProducerInfo info = new ProducerInfo();
- populateObject(info);
- return info;
+ ProducerInfo info = new ProducerInfo();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- ProducerInfo info = (ProducerInfo) object;
+ super.populateObject(object);
+ ProducerInfo info = (ProducerInfo) object;
+
info.setProducerId(createProducerId("ProducerId:1"));
info.setDestination(createActiveMQDestination("Destination:2"));
-
- {
- BrokerId value[] = new BrokerId[2];
- for( int i=0; i < 2; i++ ) {
- value[i] = createBrokerId("BrokerPath:3");
- }
- info.setBrokerPath(value);
- }
-
+ {
+ BrokerId value[] = new BrokerId[2];
+ for( int i=0; i < 2; i++ ) {
+ value[i] = createBrokerId("BrokerPath:3");
}
+ info.setBrokerPath(value);
}
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/RemoveInfoTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/RemoveInfoTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/RemoveInfoTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/RemoveInfoTest.java Tue Sep 26 19:42:47 2006
@@ -42,16 +42,15 @@
public static RemoveInfoTest SINGLETON = new RemoveInfoTest();
public Object createObject() throws Exception {
- RemoveInfo info = new RemoveInfo();
- populateObject(info);
- return info;
+ RemoveInfo info = new RemoveInfo();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- RemoveInfo info = (RemoveInfo) object;
- info.setObjectId(createDataStructure("ObjectId:1"));
+ super.populateObject(object);
+ RemoveInfo info = (RemoveInfo) object;
- }
- }
+ info.setObjectId(createDataStructure("ObjectId:1"));
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/RemoveSubscriptionInfoTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/RemoveSubscriptionInfoTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/RemoveSubscriptionInfoTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/RemoveSubscriptionInfoTest.java Tue Sep 26 19:42:47 2006
@@ -42,18 +42,17 @@
public static RemoveSubscriptionInfoTest SINGLETON = new RemoveSubscriptionInfoTest();
public Object createObject() throws Exception {
- RemoveSubscriptionInfo info = new RemoveSubscriptionInfo();
- populateObject(info);
- return info;
+ RemoveSubscriptionInfo info = new RemoveSubscriptionInfo();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- RemoveSubscriptionInfo info = (RemoveSubscriptionInfo) object;
+ super.populateObject(object);
+ RemoveSubscriptionInfo info = (RemoveSubscriptionInfo) object;
+
info.setConnectionId(createConnectionId("ConnectionId:1"));
info.setSubcriptionName("SubcriptionName:2");
info.setClientId("ClientId:3");
-
- }
- }
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ReplayCommandTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ReplayCommandTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ReplayCommandTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ReplayCommandTest.java Tue Sep 26 19:42:47 2006
@@ -42,17 +42,16 @@
public static ReplayCommandTest SINGLETON = new ReplayCommandTest();
public Object createObject() throws Exception {
- ReplayCommand info = new ReplayCommand();
- populateObject(info);
- return info;
+ ReplayCommand info = new ReplayCommand();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- ReplayCommand info = (ReplayCommand) object;
+ super.populateObject(object);
+ ReplayCommand info = (ReplayCommand) object;
+
info.setFirstNakNumber(1);
info.setLastNakNumber(2);
-
- }
- }
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ResponseTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ResponseTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ResponseTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ResponseTest.java Tue Sep 26 19:42:47 2006
@@ -42,16 +42,15 @@
public static ResponseTest SINGLETON = new ResponseTest();
public Object createObject() throws Exception {
- Response info = new Response();
- populateObject(info);
- return info;
+ Response info = new Response();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- Response info = (Response) object;
- info.setCorrelationId(1);
+ super.populateObject(object);
+ Response info = (Response) object;
- }
- }
+ info.setCorrelationId(1);
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/SessionIdTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/SessionIdTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/SessionIdTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/SessionIdTest.java Tue Sep 26 19:42:47 2006
@@ -42,17 +42,16 @@
public static SessionIdTest SINGLETON = new SessionIdTest();
public Object createObject() throws Exception {
- SessionId info = new SessionId();
- populateObject(info);
- return info;
+ SessionId info = new SessionId();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- SessionId info = (SessionId) object;
+ super.populateObject(object);
+ SessionId info = (SessionId) object;
+
info.setConnectionId("ConnectionId:1");
info.setValue(1);
-
- }
- }
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/SessionInfoTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/SessionInfoTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/SessionInfoTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/SessionInfoTest.java Tue Sep 26 19:42:47 2006
@@ -42,16 +42,15 @@
public static SessionInfoTest SINGLETON = new SessionInfoTest();
public Object createObject() throws Exception {
- SessionInfo info = new SessionInfo();
- populateObject(info);
- return info;
+ SessionInfo info = new SessionInfo();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- SessionInfo info = (SessionInfo) object;
- info.setSessionId(createSessionId("SessionId:1"));
+ super.populateObject(object);
+ SessionInfo info = (SessionInfo) object;
- }
- }
+ info.setSessionId(createSessionId("SessionId:1"));
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ShutdownInfoTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ShutdownInfoTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ShutdownInfoTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/ShutdownInfoTest.java Tue Sep 26 19:42:47 2006
@@ -42,15 +42,14 @@
public static ShutdownInfoTest SINGLETON = new ShutdownInfoTest();
public Object createObject() throws Exception {
- ShutdownInfo info = new ShutdownInfo();
- populateObject(info);
- return info;
+ ShutdownInfo info = new ShutdownInfo();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- ShutdownInfo info = (ShutdownInfo) object;
+ super.populateObject(object);
+ ShutdownInfo info = (ShutdownInfo) object;
- }
- }
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/SubscriptionInfoTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/SubscriptionInfoTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/SubscriptionInfoTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/SubscriptionInfoTest.java Tue Sep 26 19:42:47 2006
@@ -42,19 +42,18 @@
public static SubscriptionInfoTest SINGLETON = new SubscriptionInfoTest();
public Object createObject() throws Exception {
- SubscriptionInfo info = new SubscriptionInfo();
- populateObject(info);
- return info;
+ SubscriptionInfo info = new SubscriptionInfo();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- SubscriptionInfo info = (SubscriptionInfo) object;
+ super.populateObject(object);
+ SubscriptionInfo info = (SubscriptionInfo) object;
+
info.setClientId("ClientId:1");
info.setDestination(createActiveMQDestination("Destination:2"));
info.setSelector("Selector:3");
info.setSubcriptionName("SubcriptionName:4");
-
- }
- }
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/TransactionIdTestSupport.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/TransactionIdTestSupport.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/TransactionIdTestSupport.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/TransactionIdTestSupport.java Tue Sep 26 19:42:47 2006
@@ -38,10 +38,10 @@
*/
public abstract class TransactionIdTestSupport extends DataFileGeneratorTestSupport {
-
+
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- TransactionId info = (TransactionId) object;
+ super.populateObject(object);
+ TransactionId info = (TransactionId) object;
- }
- }
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/TransactionInfoTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/TransactionInfoTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/TransactionInfoTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/TransactionInfoTest.java Tue Sep 26 19:42:47 2006
@@ -42,18 +42,17 @@
public static TransactionInfoTest SINGLETON = new TransactionInfoTest();
public Object createObject() throws Exception {
- TransactionInfo info = new TransactionInfo();
- populateObject(info);
- return info;
+ TransactionInfo info = new TransactionInfo();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- TransactionInfo info = (TransactionInfo) object;
+ super.populateObject(object);
+ TransactionInfo info = (TransactionInfo) object;
+
info.setConnectionId(createConnectionId("ConnectionId:1"));
info.setTransactionId(createTransactionId("TransactionId:2"));
info.setType((byte) 1);
-
- }
- }
+ }
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/XATransactionIdTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/XATransactionIdTest.java?view=diff&rev=450289&r1=450288&r2=450289
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/XATransactionIdTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v2/XATransactionIdTest.java Tue Sep 26 19:42:47 2006
@@ -42,18 +42,17 @@
public static XATransactionIdTest SINGLETON = new XATransactionIdTest();
public Object createObject() throws Exception {
- XATransactionId info = new XATransactionId();
- populateObject(info);
- return info;
+ XATransactionId info = new XATransactionId();
+ populateObject(info);
+ return info;
}
-
protected void populateObject(Object object) throws Exception {
- super.populateObject(object);
- XATransactionId info = (XATransactionId) object;
+ super.populateObject(object);
+ XATransactionId info = (XATransactionId) object;
+
info.setFormatId(1);
info.setGlobalTransactionId("GlobalTransactionId:1".getBytes());
info.setBranchQualifier("BranchQualifier:2".getBytes());
-
- }
- }
+ }
+}