You can subscribe to this list here.
2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
(7) |
Dec
(18) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2008 |
Jan
(20) |
Feb
(7) |
Mar
|
Apr
(8) |
May
(9) |
Jun
(7) |
Jul
(23) |
Aug
(3) |
Sep
|
Oct
(16) |
Nov
|
Dec
(3) |
2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
2010 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
(6) |
Jun
(8) |
Jul
|
Aug
|
Sep
|
Oct
(5) |
Nov
(2) |
Dec
|
2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
(1) |
Oct
(30) |
Nov
|
Dec
|
2012 |
Jan
(4) |
Feb
(2) |
Mar
(1) |
Apr
(23) |
May
(4) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
2013 |
Jan
|
Feb
|
Mar
(7) |
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
From: <ope...@li...> - 2013-08-08 20:17:34
|
Revision: 308 http://sourceforge.net/p/openfast/code/308 Author: joshseidel Date: 2013-08-08 20:17:31 +0000 (Thu, 08 Aug 2013) Log Message: ----------- Modified Paths: -------------- branches/generics-cleanup/src/main/java/org/openfast/Context.java branches/generics-cleanup/src/main/java/org/openfast/DecimalValue.java branches/generics-cleanup/src/main/java/org/openfast/GlobalDictionary.java branches/generics-cleanup/src/main/java/org/openfast/IntegerValue.java branches/generics-cleanup/src/main/java/org/openfast/MessageOutputStream.java branches/generics-cleanup/src/main/java/org/openfast/SequenceValue.java branches/generics-cleanup/src/main/java/org/openfast/StringValue.java branches/generics-cleanup/src/main/java/org/openfast/TemplateDictionary.java branches/generics-cleanup/src/main/java/org/openfast/debug/BasicDecodeTrace.java branches/generics-cleanup/src/main/java/org/openfast/error/ErrorCode.java branches/generics-cleanup/src/main/java/org/openfast/examples/MessageBlockReaderFactory.java branches/generics-cleanup/src/main/java/org/openfast/examples/MessageBlockWriterFactory.java branches/generics-cleanup/src/main/java/org/openfast/examples/OpenFastExample.java branches/generics-cleanup/src/main/java/org/openfast/examples/decoder/FastMessageDecoder.java branches/generics-cleanup/src/main/java/org/openfast/examples/decoder/Main.java branches/generics-cleanup/src/main/java/org/openfast/examples/interpret/FastMessageInterpreter.java branches/generics-cleanup/src/main/java/org/openfast/examples/interpret/Main.java branches/generics-cleanup/src/main/java/org/openfast/examples/performance/Main.java branches/generics-cleanup/src/main/java/org/openfast/examples/performance/PerformanceRunner.java branches/generics-cleanup/src/main/java/org/openfast/examples/producer/Main.java branches/generics-cleanup/src/main/java/org/openfast/examples/producer/XmlCompressedMessageConverter.java branches/generics-cleanup/src/main/java/org/openfast/examples/scp10/Main.java branches/generics-cleanup/src/main/java/org/openfast/examples/scp10/ScpMessageProducer.java branches/generics-cleanup/src/main/java/org/openfast/examples/tmplexch/DecodeMain.java branches/generics-cleanup/src/main/java/org/openfast/examples/tmplexch/EncodeMain.java branches/generics-cleanup/src/main/java/org/openfast/examples/tmplexch/TemplateExchangeDefinitionDecoder.java branches/generics-cleanup/src/main/java/org/openfast/examples/tmplexch/TemplateExchangeDefinitionEncoder.java branches/generics-cleanup/src/main/java/org/openfast/examples/xml/FastToXmlConverter.java branches/generics-cleanup/src/main/java/org/openfast/examples/xml/XmlToFastConverter.java branches/generics-cleanup/src/main/java/org/openfast/extensions/MapScalar.java branches/generics-cleanup/src/main/java/org/openfast/impl/CmeMessageBlockReader.java branches/generics-cleanup/src/main/java/org/openfast/logging/FileFastMessageLogger.java branches/generics-cleanup/src/main/java/org/openfast/session/RecordingEndpoint.java branches/generics-cleanup/src/main/java/org/openfast/session/Session.java branches/generics-cleanup/src/main/java/org/openfast/session/SessionControlProtocol_1_1.java branches/generics-cleanup/src/main/java/org/openfast/session/multicast/MulticastOutputStream.java branches/generics-cleanup/src/main/java/org/openfast/session/tcp/TcpEndpoint.java branches/generics-cleanup/src/main/java/org/openfast/session/template/exchange/AbstractFieldInstructionConverter.java branches/generics-cleanup/src/main/java/org/openfast/session/template/exchange/ConversionContext.java branches/generics-cleanup/src/main/java/org/openfast/session/template/exchange/ScalarConverter.java branches/generics-cleanup/src/main/java/org/openfast/template/AbstractTemplateRegistry.java branches/generics-cleanup/src/main/java/org/openfast/template/BasicTemplateRegistry.java branches/generics-cleanup/src/main/java/org/openfast/template/ComposedScalar.java branches/generics-cleanup/src/main/java/org/openfast/template/ComposedValueConverter.java branches/generics-cleanup/src/main/java/org/openfast/template/DynamicTemplateReference.java branches/generics-cleanup/src/main/java/org/openfast/template/Field.java branches/generics-cleanup/src/main/java/org/openfast/template/Group.java branches/generics-cleanup/src/main/java/org/openfast/template/MessageTemplate.java branches/generics-cleanup/src/main/java/org/openfast/template/NullTemplateRegistry.java branches/generics-cleanup/src/main/java/org/openfast/template/Sequence.java branches/generics-cleanup/src/main/java/org/openfast/template/StaticTemplateReference.java branches/generics-cleanup/src/main/java/org/openfast/template/loader/GroupParser.java branches/generics-cleanup/src/main/java/org/openfast/template/loader/MessageTemplateLoader.java branches/generics-cleanup/src/main/java/org/openfast/template/loader/ParsingContext.java branches/generics-cleanup/src/main/java/org/openfast/template/operator/OperatorCodec.java branches/generics-cleanup/src/main/java/org/openfast/template/operator/OptionallyPresentOperatorCodec.java branches/generics-cleanup/src/main/java/org/openfast/template/serializer/AbstractFieldSerializer.java branches/generics-cleanup/src/main/java/org/openfast/template/serializer/MessageTemplateSerializer.java branches/generics-cleanup/src/main/java/org/openfast/template/serializer/SerializerRegistry.java branches/generics-cleanup/src/main/java/org/openfast/template/type/Type.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/DateString.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/EpochTimestamp.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/MillisecondsSinceMidnight.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableByteVector.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableSignedInteger.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableSingleFieldDecimal.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableStringDelta.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableUnicodeString.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableUnsignedInteger.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/SingleFieldDecimal.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/StringDelta.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/TimeInteger.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/TimestampInteger.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/TypeCodec.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/UnicodeString.java branches/generics-cleanup/src/main/java/org/openfast/util/RecordingInputStream.java branches/generics-cleanup/src/main/java/org/openfast/util/RecordingOutputStream.java branches/generics-cleanup/src/main/java/org/openfast/util/UnboundedCache.java branches/generics-cleanup/src/main/java/org/openfast/util/Util.java branches/generics-cleanup/src/test/java/org/openfast/BitVectorTest.java branches/generics-cleanup/src/test/java/org/openfast/DecimalValueTest.java branches/generics-cleanup/src/test/java/org/openfast/EncodeDecodeTest.java branches/generics-cleanup/src/test/java/org/openfast/GroupValueTest.java branches/generics-cleanup/src/test/java/org/openfast/IntegerValueTest.java branches/generics-cleanup/src/test/java/org/openfast/acceptance/EncodingDecodingAcceptanceTest.java branches/generics-cleanup/src/test/java/org/openfast/session/multicast/MulticastOutputStreamTest.java branches/generics-cleanup/src/test/java/org/openfast/session/template/exchange/ComposedDecimalConverterTest.java branches/generics-cleanup/src/test/java/org/openfast/session/template/exchange/GroupConverterTest.java branches/generics-cleanup/src/test/java/org/openfast/session/template/exchange/ScalarConverterTest.java branches/generics-cleanup/src/test/java/org/openfast/session/template/exchange/SequenceConverterTest.java branches/generics-cleanup/src/test/java/org/openfast/session/template/exchange/VariableLengthInstructionConverterTest.java branches/generics-cleanup/src/test/java/org/openfast/submitted/IcapSecurityListTest.java branches/generics-cleanup/src/test/java/org/openfast/submitted/TemplateDictionaryScopeTest.java branches/generics-cleanup/src/test/java/org/openfast/template/BasicTemplateRegistryTest.java branches/generics-cleanup/src/test/java/org/openfast/template/serializer/ComposedDecimalSerializerTest.java branches/generics-cleanup/src/test/java/org/openfast/template/serializer/DynamicTemplateReferenceSerializerTest.java branches/generics-cleanup/src/test/java/org/openfast/template/serializer/GroupSerializerTest.java branches/generics-cleanup/src/test/java/org/openfast/template/serializer/ScalarSerializerTest.java branches/generics-cleanup/src/test/java/org/openfast/template/serializer/SequenceSerializerTest.java branches/generics-cleanup/src/test/java/org/openfast/template/serializer/StaticTemplateReferenceSerializerTest.java branches/generics-cleanup/src/test/java/org/openfast/template/serializer/TemplateSerializerTest.java branches/generics-cleanup/src/test/java/org/openfast/template/serializer/VariableLengthScalarSerializerTest.java branches/generics-cleanup/src/test/java/org/openfast/template/serializer/XMLMessageTemplateSerializerTest.java branches/generics-cleanup/src/test/java/org/openfast/template/type/codec/EpochTimestampTest.java branches/generics-cleanup/src/test/java/org/openfast/template/type/codec/NullableByteVectorTest.java branches/generics-cleanup/src/test/java/org/openfast/template/type/codec/NullableStringDeltaTest.java branches/generics-cleanup/src/test/java/org/openfast/template/type/codec/NullableUnicodeStringTest.java branches/generics-cleanup/src/test/java/org/openfast/template/type/codec/SingleFieldDecimalTest.java branches/generics-cleanup/src/test/java/org/openfast/template/type/codec/UnicodeStringTest.java branches/generics-cleanup/src/test/java/org/openfast/test/OpenFastTestCase.java branches/generics-cleanup/src/test/java/org/openfast/util/UtilTest.java branches/generics-cleanup/src/test/java/org/openfast/util/XmlWriterTest.java Modified: branches/generics-cleanup/src/main/java/org/openfast/Context.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/Context.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/Context.java 2013-08-08 20:17:31 UTC (rev 308) @@ -25,6 +25,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; + import org.openfast.debug.BasicDecodeTrace; import org.openfast.debug.BasicEncodeTrace; import org.openfast.debug.Trace; Modified: branches/generics-cleanup/src/main/java/org/openfast/DecimalValue.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/DecimalValue.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/DecimalValue.java 2013-08-08 20:17:31 UTC (rev 308) @@ -23,6 +23,7 @@ import java.math.BigDecimal; import java.math.BigInteger; + import org.openfast.error.FastConstants; public class DecimalValue extends NumericValue { Modified: branches/generics-cleanup/src/main/java/org/openfast/GlobalDictionary.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/GlobalDictionary.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/GlobalDictionary.java 2013-08-08 20:17:31 UTC (rev 308) @@ -20,13 +20,13 @@ */ package org.openfast; -import org.openfast.template.Group; - import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import org.openfast.template.Group; + public class GlobalDictionary implements Dictionary { protected Map<QName, ScalarValue> table = new HashMap<>(); Modified: branches/generics-cleanup/src/main/java/org/openfast/IntegerValue.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/IntegerValue.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/IntegerValue.java 2013-08-08 20:17:31 UTC (rev 308) @@ -21,6 +21,7 @@ package org.openfast; import java.math.BigDecimal; + import org.openfast.error.FastConstants; import org.openfast.template.LongValue; Modified: branches/generics-cleanup/src/main/java/org/openfast/MessageOutputStream.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/MessageOutputStream.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/MessageOutputStream.java 2013-08-08 20:17:31 UTC (rev 308) @@ -27,6 +27,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + import org.openfast.codec.FastEncoder; import org.openfast.error.FastConstants; import org.openfast.logging.FastMessageLogger.Direction; Modified: branches/generics-cleanup/src/main/java/org/openfast/SequenceValue.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/SequenceValue.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/SequenceValue.java 2013-08-08 20:17:31 UTC (rev 308) @@ -20,12 +20,13 @@ */ package org.openfast; -import org.openfast.template.Sequence; import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; +import org.openfast.template.Sequence; + public class SequenceValue implements FieldValue { private static final long serialVersionUID = 1L; private List<GroupValue> elements = Collections.emptyList(); Modified: branches/generics-cleanup/src/main/java/org/openfast/StringValue.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/StringValue.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/StringValue.java 2013-08-08 20:17:31 UTC (rev 308) @@ -21,6 +21,7 @@ package org.openfast; import java.math.BigDecimal; + import org.openfast.error.FastConstants; public class StringValue extends ScalarValue { Modified: branches/generics-cleanup/src/main/java/org/openfast/TemplateDictionary.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/TemplateDictionary.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/TemplateDictionary.java 2013-08-08 20:17:31 UTC (rev 308) @@ -20,13 +20,13 @@ */ package org.openfast; -import org.openfast.template.Group; - import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import org.openfast.template.Group; + public class TemplateDictionary implements Dictionary { protected Map<Group, Map<QName, ScalarValue>> table = new HashMap<>(); Modified: branches/generics-cleanup/src/main/java/org/openfast/debug/BasicDecodeTrace.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/debug/BasicDecodeTrace.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/debug/BasicDecodeTrace.java 2013-08-08 20:17:31 UTC (rev 308) @@ -21,6 +21,7 @@ package org.openfast.debug; import java.io.PrintWriter; + import org.openfast.ByteUtil; import org.openfast.FieldValue; import org.openfast.template.Field; Modified: branches/generics-cleanup/src/main/java/org/openfast/error/ErrorCode.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/error/ErrorCode.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/error/ErrorCode.java 2013-08-08 20:17:31 UTC (rev 308) @@ -22,6 +22,7 @@ import java.util.HashMap; import java.util.Map; + import org.openfast.Message; public class ErrorCode { Modified: branches/generics-cleanup/src/main/java/org/openfast/examples/MessageBlockReaderFactory.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/examples/MessageBlockReaderFactory.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/examples/MessageBlockReaderFactory.java 2013-08-08 20:17:31 UTC (rev 308) @@ -1,11 +1,13 @@ package org.openfast.examples; +import java.io.IOException; import java.io.InputStream; -import java.io.IOException; + import org.openfast.Message; import org.openfast.MessageBlockReader; import org.openfast.examples.OpenFastExample.Variant; -import org.openfast.impl.*; +import org.openfast.impl.CmeMessageBlockReader; +import org.openfast.impl.CmeTcpReplayMessageBlockReader; public class MessageBlockReaderFactory { final Variant variant; Modified: branches/generics-cleanup/src/main/java/org/openfast/examples/MessageBlockWriterFactory.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/examples/MessageBlockWriterFactory.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/examples/MessageBlockWriterFactory.java 2013-08-08 20:17:31 UTC (rev 308) @@ -1,11 +1,13 @@ package org.openfast.examples; +import java.io.IOException; import java.io.OutputStream; -import java.io.IOException; + import org.openfast.Message; import org.openfast.MessageBlockWriter; import org.openfast.examples.OpenFastExample.Variant; -import org.openfast.impl.*; +import org.openfast.impl.CmeMessageBlockWriter; +import org.openfast.impl.CmeTcpReplayMessageBlockWriter; public class MessageBlockWriterFactory { final Variant variant; Modified: branches/generics-cleanup/src/main/java/org/openfast/examples/OpenFastExample.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/examples/OpenFastExample.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/examples/OpenFastExample.java 2013-08-08 20:17:31 UTC (rev 308) @@ -1,6 +1,7 @@ package org.openfast.examples; import java.io.File; + import org.apache.commons.cli.BasicParser; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.HelpFormatter; Modified: branches/generics-cleanup/src/main/java/org/openfast/examples/decoder/FastMessageDecoder.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/examples/decoder/FastMessageDecoder.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/examples/decoder/FastMessageDecoder.java 2013-08-08 20:17:31 UTC (rev 308) @@ -5,6 +5,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; + import org.openfast.Context; import org.openfast.Global; import org.openfast.Message; Modified: branches/generics-cleanup/src/main/java/org/openfast/examples/decoder/Main.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/examples/decoder/Main.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/examples/decoder/Main.java 2013-08-08 20:17:31 UTC (rev 308) @@ -3,6 +3,7 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; + import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Options; import org.openfast.Message; Modified: branches/generics-cleanup/src/main/java/org/openfast/examples/interpret/FastMessageInterpreter.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/examples/interpret/FastMessageInterpreter.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/examples/interpret/FastMessageInterpreter.java 2013-08-08 20:17:31 UTC (rev 308) @@ -3,6 +3,9 @@ */ package org.openfast.examples.interpret; +import java.io.OutputStream; +import java.io.PrintStream; + import org.openfast.FieldValue; import org.openfast.GroupValue; import org.openfast.Message; @@ -13,9 +16,6 @@ import org.openfast.template.MessageTemplate; import org.openfast.template.Sequence; -import java.io.OutputStream; -import java.io.PrintStream; - /** * Accept incoming, decoded FAST messages and display them on an outputStream. * The field names, tags (ID's) and structure of the messages come from the Modified: branches/generics-cleanup/src/main/java/org/openfast/examples/interpret/Main.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/examples/interpret/Main.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/examples/interpret/Main.java 2013-08-08 20:17:31 UTC (rev 308) @@ -8,6 +8,7 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; + import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Options; import org.openfast.examples.Assert; Modified: branches/generics-cleanup/src/main/java/org/openfast/examples/performance/Main.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/examples/performance/Main.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/examples/performance/Main.java 2013-08-08 20:17:31 UTC (rev 308) @@ -1,6 +1,7 @@ package org.openfast.examples.performance; import java.io.File; + import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Options; import org.openfast.examples.Assert; Modified: branches/generics-cleanup/src/main/java/org/openfast/examples/performance/PerformanceRunner.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/examples/performance/PerformanceRunner.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/examples/performance/PerformanceRunner.java 2013-08-08 20:17:31 UTC (rev 308) @@ -10,6 +10,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; + import org.openfast.Context; import org.openfast.Message; import org.openfast.codec.FastDecoder; Modified: branches/generics-cleanup/src/main/java/org/openfast/examples/producer/Main.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/examples/producer/Main.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/examples/producer/Main.java 2013-08-08 20:17:31 UTC (rev 308) @@ -2,15 +2,16 @@ import java.io.File; import java.io.IOException; + import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Options; import org.openfast.examples.Assert; +import org.openfast.examples.MessageBlockWriterFactory; import org.openfast.examples.OpenFastExample; -import org.openfast.examples.MessageBlockWriterFactory; +import org.openfast.session.Endpoint; import org.openfast.session.FastConnectionException; -import org.openfast.session.Endpoint; +import org.openfast.session.multicast.MulticastServerEndpoint; import org.openfast.session.tcp.TcpEndpoint; -import org.openfast.session.multicast.MulticastServerEndpoint; public class Main extends OpenFastExample { private static Options options = new Options(); Modified: branches/generics-cleanup/src/main/java/org/openfast/examples/producer/XmlCompressedMessageConverter.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/examples/producer/XmlCompressedMessageConverter.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/examples/producer/XmlCompressedMessageConverter.java 2013-08-08 20:17:31 UTC (rev 308) @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; + import org.openfast.FieldValue; import org.openfast.GroupValue; import org.openfast.Message; @@ -16,6 +17,7 @@ import org.openfast.template.MessageTemplate; import org.openfast.template.Sequence; import org.openfast.template.TemplateRegistry; + import com.thoughtworks.xstream.converters.MarshallingContext; import com.thoughtworks.xstream.io.HierarchicalStreamDriver; import com.thoughtworks.xstream.io.HierarchicalStreamReader; Modified: branches/generics-cleanup/src/main/java/org/openfast/examples/scp10/Main.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/examples/scp10/Main.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/examples/scp10/Main.java 2013-08-08 20:17:31 UTC (rev 308) @@ -2,6 +2,7 @@ import java.io.File; import java.io.IOException; + import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Options; import org.openfast.examples.Assert; Modified: branches/generics-cleanup/src/main/java/org/openfast/examples/scp10/ScpMessageProducer.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/examples/scp10/ScpMessageProducer.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/examples/scp10/ScpMessageProducer.java 2013-08-08 20:17:31 UTC (rev 308) @@ -5,6 +5,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.util.List; + import org.openfast.Global; import org.openfast.Message; import org.openfast.MessageOutputStream; Modified: branches/generics-cleanup/src/main/java/org/openfast/examples/tmplexch/DecodeMain.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/examples/tmplexch/DecodeMain.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/examples/tmplexch/DecodeMain.java 2013-08-08 20:17:31 UTC (rev 308) @@ -2,11 +2,11 @@ import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; + import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Options; import org.openfast.examples.Assert; Modified: branches/generics-cleanup/src/main/java/org/openfast/examples/tmplexch/EncodeMain.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/examples/tmplexch/EncodeMain.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/examples/tmplexch/EncodeMain.java 2013-08-08 20:17:31 UTC (rev 308) @@ -1,10 +1,10 @@ package org.openfast.examples.tmplexch; import java.io.File; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; + import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Options; import org.openfast.examples.Assert; Modified: branches/generics-cleanup/src/main/java/org/openfast/examples/tmplexch/TemplateExchangeDefinitionDecoder.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/examples/tmplexch/TemplateExchangeDefinitionDecoder.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/examples/tmplexch/TemplateExchangeDefinitionDecoder.java 2013-08-08 20:17:31 UTC (rev 308) @@ -5,6 +5,7 @@ import java.io.OutputStream; import java.util.ArrayList; import java.util.List; + import org.openfast.Context; import org.openfast.Message; import org.openfast.codec.FastDecoder; Modified: branches/generics-cleanup/src/main/java/org/openfast/examples/tmplexch/TemplateExchangeDefinitionEncoder.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/examples/tmplexch/TemplateExchangeDefinitionEncoder.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/examples/tmplexch/TemplateExchangeDefinitionEncoder.java 2013-08-08 20:17:31 UTC (rev 308) @@ -5,6 +5,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.OutputStream; + import org.openfast.Context; import org.openfast.Message; import org.openfast.codec.FastEncoder; Modified: branches/generics-cleanup/src/main/java/org/openfast/examples/xml/FastToXmlConverter.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/examples/xml/FastToXmlConverter.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/examples/xml/FastToXmlConverter.java 2013-08-08 20:17:31 UTC (rev 308) @@ -4,6 +4,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.Iterator; + import org.openfast.Context; import org.openfast.GroupValue; import org.openfast.Message; @@ -14,6 +15,7 @@ import org.openfast.template.Sequence; import org.openfast.template.TemplateRegistry; import org.openfast.template.loader.XMLMessageTemplateLoader; + import com.thoughtworks.xstream.io.HierarchicalStreamWriter; import com.thoughtworks.xstream.io.xml.XppDriver; Modified: branches/generics-cleanup/src/main/java/org/openfast/examples/xml/XmlToFastConverter.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/examples/xml/XmlToFastConverter.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/examples/xml/XmlToFastConverter.java 2013-08-08 20:17:31 UTC (rev 308) @@ -3,6 +3,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; + import org.openfast.Context; import org.openfast.GroupValue; import org.openfast.Message; @@ -13,6 +14,7 @@ import org.openfast.template.Sequence; import org.openfast.template.TemplateRegistry; import org.openfast.template.loader.XMLMessageTemplateLoader; + import com.thoughtworks.xstream.io.HierarchicalStreamReader; import com.thoughtworks.xstream.io.xml.XppDriver; Modified: branches/generics-cleanup/src/main/java/org/openfast/extensions/MapScalar.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/extensions/MapScalar.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/extensions/MapScalar.java 2013-08-08 20:17:31 UTC (rev 308) @@ -1,6 +1,7 @@ package org.openfast.extensions; import java.io.InputStream; + import org.openfast.BitVectorBuilder; import org.openfast.BitVectorReader; import org.openfast.ByteUtil; Modified: branches/generics-cleanup/src/main/java/org/openfast/impl/CmeMessageBlockReader.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/impl/CmeMessageBlockReader.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/impl/CmeMessageBlockReader.java 2013-08-08 20:17:31 UTC (rev 308) @@ -2,6 +2,7 @@ import java.io.IOException; import java.io.InputStream; + import org.openfast.Message; import org.openfast.MessageBlockReader; Modified: branches/generics-cleanup/src/main/java/org/openfast/logging/FileFastMessageLogger.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/logging/FileFastMessageLogger.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/logging/FileFastMessageLogger.java 2013-08-08 20:17:31 UTC (rev 308) @@ -5,6 +5,7 @@ import java.io.IOException; import java.io.OutputStream; import java.util.Date; + import org.openfast.Message; import org.openfast.template.MessageTemplate; Modified: branches/generics-cleanup/src/main/java/org/openfast/session/RecordingEndpoint.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/session/RecordingEndpoint.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/session/RecordingEndpoint.java 2013-08-08 20:17:31 UTC (rev 308) @@ -23,6 +23,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; + import org.openfast.util.RecordingInputStream; import org.openfast.util.RecordingOutputStream; Modified: branches/generics-cleanup/src/main/java/org/openfast/session/Session.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/session/Session.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/session/Session.java 2013-08-08 20:17:31 UTC (rev 308) @@ -163,7 +163,7 @@ } } catch (Exception e) { Throwable cause = e.getCause(); - if (cause != null && cause.getClass().equals(SocketException.class)) { + if (cause != null && SocketException.class.equals(cause.getClass())) { notifySessionClosed(); errorHandler.error(FastConstants.IO_ERROR, cause.getMessage(), cause); } else if (e instanceof FastException) { Modified: branches/generics-cleanup/src/main/java/org/openfast/session/SessionControlProtocol_1_1.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/session/SessionControlProtocol_1_1.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/session/SessionControlProtocol_1_1.java 2013-08-08 20:17:31 UTC (rev 308) @@ -22,6 +22,7 @@ import java.util.HashMap; import java.util.Map; + import org.openfast.Context; import org.openfast.Dictionary; import org.openfast.FieldValue; Modified: branches/generics-cleanup/src/main/java/org/openfast/session/multicast/MulticastOutputStream.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/session/multicast/MulticastOutputStream.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/session/multicast/MulticastOutputStream.java 2013-08-08 20:17:31 UTC (rev 308) @@ -22,10 +22,10 @@ import java.io.IOException; import java.io.OutputStream; -import java.nio.ByteBuffer; import java.net.DatagramPacket; import java.net.InetAddress; import java.net.MulticastSocket; +import java.nio.ByteBuffer; public class MulticastOutputStream extends OutputStream { public final static int BUFFER_SIZE = 2048; Modified: branches/generics-cleanup/src/main/java/org/openfast/session/tcp/TcpEndpoint.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/session/tcp/TcpEndpoint.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/session/tcp/TcpEndpoint.java 2013-08-08 20:17:31 UTC (rev 308) @@ -23,7 +23,6 @@ import java.io.IOException; import java.net.ServerSocket; import java.net.Socket; -import java.net.UnknownHostException; import org.openfast.session.Connection; import org.openfast.session.ConnectionListener; Modified: branches/generics-cleanup/src/main/java/org/openfast/session/template/exchange/AbstractFieldInstructionConverter.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/session/template/exchange/AbstractFieldInstructionConverter.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/session/template/exchange/AbstractFieldInstructionConverter.java 2013-08-08 20:17:31 UTC (rev 308) @@ -22,6 +22,7 @@ import java.util.HashMap; import java.util.Map; + import org.openfast.Dictionary; import org.openfast.GroupValue; import org.openfast.Message; Modified: branches/generics-cleanup/src/main/java/org/openfast/session/template/exchange/ConversionContext.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/session/template/exchange/ConversionContext.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/session/template/exchange/ConversionContext.java 2013-08-08 20:17:31 UTC (rev 308) @@ -24,6 +24,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + import org.openfast.template.Field; import org.openfast.template.Group; Modified: branches/generics-cleanup/src/main/java/org/openfast/session/template/exchange/ScalarConverter.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/session/template/exchange/ScalarConverter.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/session/template/exchange/ScalarConverter.java 2013-08-08 20:17:31 UTC (rev 308) @@ -22,6 +22,7 @@ import java.util.HashMap; import java.util.Map; + import org.openfast.FieldValue; import org.openfast.GroupValue; import org.openfast.Message; Modified: branches/generics-cleanup/src/main/java/org/openfast/template/AbstractTemplateRegistry.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/AbstractTemplateRegistry.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/template/AbstractTemplateRegistry.java 2013-08-08 20:17:31 UTC (rev 308) @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; + import org.openfast.QName; public abstract class AbstractTemplateRegistry implements TemplateRegistry { Modified: branches/generics-cleanup/src/main/java/org/openfast/template/BasicTemplateRegistry.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/BasicTemplateRegistry.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/template/BasicTemplateRegistry.java 2013-08-08 20:17:31 UTC (rev 308) @@ -25,6 +25,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; + import org.openfast.QName; import org.openfast.util.IntegerMap; import org.openfast.util.SimpleIntegerMap; Modified: branches/generics-cleanup/src/main/java/org/openfast/template/ComposedScalar.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/ComposedScalar.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/template/ComposedScalar.java 2013-08-08 20:17:31 UTC (rev 308) @@ -24,6 +24,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.Arrays; + import org.openfast.BitVectorBuilder; import org.openfast.BitVectorReader; import org.openfast.Context; Modified: branches/generics-cleanup/src/main/java/org/openfast/template/ComposedValueConverter.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/ComposedValueConverter.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/template/ComposedValueConverter.java 2013-08-08 20:17:31 UTC (rev 308) @@ -21,6 +21,7 @@ package org.openfast.template; import java.io.Serializable; + import org.openfast.FieldValue; public interface ComposedValueConverter extends Serializable { Modified: branches/generics-cleanup/src/main/java/org/openfast/template/DynamicTemplateReference.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/DynamicTemplateReference.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/template/DynamicTemplateReference.java 2013-08-08 20:17:31 UTC (rev 308) @@ -21,6 +21,7 @@ package org.openfast.template; import java.io.InputStream; + import org.openfast.BitVectorBuilder; import org.openfast.BitVectorReader; import org.openfast.Context; Modified: branches/generics-cleanup/src/main/java/org/openfast/template/Field.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/Field.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/template/Field.java 2013-08-08 20:17:31 UTC (rev 308) @@ -22,6 +22,7 @@ import java.io.InputStream; import java.io.Serializable; + import org.openfast.BitVectorBuilder; import org.openfast.BitVectorReader; import org.openfast.Context; Modified: branches/generics-cleanup/src/main/java/org/openfast/template/Group.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/Group.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/template/Group.java 2013-08-08 20:17:31 UTC (rev 308) @@ -28,6 +28,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + import org.openfast.BitVector; import org.openfast.BitVectorBuilder; import org.openfast.BitVectorReader; Modified: branches/generics-cleanup/src/main/java/org/openfast/template/MessageTemplate.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/MessageTemplate.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/template/MessageTemplate.java 2013-08-08 20:17:31 UTC (rev 308) @@ -21,6 +21,7 @@ package org.openfast.template; import java.io.InputStream; + import org.openfast.BitVectorReader; import org.openfast.Context; import org.openfast.FieldValue; Modified: branches/generics-cleanup/src/main/java/org/openfast/template/NullTemplateRegistry.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/NullTemplateRegistry.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/template/NullTemplateRegistry.java 2013-08-08 20:17:31 UTC (rev 308) @@ -22,6 +22,7 @@ import java.util.Collections; import java.util.Iterator; + import org.openfast.QName; final class NullTemplateRegistry implements TemplateRegistry { Modified: branches/generics-cleanup/src/main/java/org/openfast/template/Sequence.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/Sequence.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/template/Sequence.java 2013-08-08 20:17:31 UTC (rev 308) @@ -24,14 +24,15 @@ import java.io.IOException; import java.io.InputStream; import java.util.Iterator; + +import org.openfast.BitVectorBuilder; import org.openfast.BitVectorReader; -import org.openfast.QName; -import org.openfast.BitVectorBuilder; import org.openfast.Context; import org.openfast.FieldValue; import org.openfast.Global; import org.openfast.GroupValue; import org.openfast.IntegerValue; +import org.openfast.QName; import org.openfast.ScalarValue; import org.openfast.SequenceValue; import org.openfast.error.FastConstants; Modified: branches/generics-cleanup/src/main/java/org/openfast/template/StaticTemplateReference.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/StaticTemplateReference.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/template/StaticTemplateReference.java 2013-08-08 20:17:31 UTC (rev 308) @@ -21,6 +21,7 @@ package org.openfast.template; import java.io.InputStream; + import org.openfast.BitVectorBuilder; import org.openfast.BitVectorReader; import org.openfast.Context; Modified: branches/generics-cleanup/src/main/java/org/openfast/template/loader/GroupParser.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/loader/GroupParser.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/template/loader/GroupParser.java 2013-08-08 20:17:31 UTC (rev 308) @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.List; + import org.openfast.QName; import org.openfast.error.FastConstants; import org.openfast.template.Field; Modified: branches/generics-cleanup/src/main/java/org/openfast/template/loader/MessageTemplateLoader.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/loader/MessageTemplateLoader.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/template/loader/MessageTemplateLoader.java 2013-08-08 20:17:31 UTC (rev 308) @@ -21,6 +21,7 @@ package org.openfast.template.loader; import java.io.InputStream; + import org.openfast.template.MessageTemplate; import org.openfast.template.TemplateRegistry; Modified: branches/generics-cleanup/src/main/java/org/openfast/template/loader/ParsingContext.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/loader/ParsingContext.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/template/loader/ParsingContext.java 2013-08-08 20:17:31 UTC (rev 308) @@ -22,6 +22,7 @@ import java.util.List; import java.util.Map; + import org.openfast.QName; import org.openfast.error.ErrorHandler; import org.openfast.template.TemplateRegistry; Modified: branches/generics-cleanup/src/main/java/org/openfast/template/operator/OperatorCodec.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/operator/OperatorCodec.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/template/operator/OperatorCodec.java 2013-08-08 20:17:31 UTC (rev 308) @@ -23,6 +23,7 @@ import java.io.Serializable; import java.util.HashMap; import java.util.Map; + import org.openfast.BitVectorBuilder; import org.openfast.FieldValue; import org.openfast.Global; Modified: branches/generics-cleanup/src/main/java/org/openfast/template/operator/OptionallyPresentOperatorCodec.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/operator/OptionallyPresentOperatorCodec.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/template/operator/OptionallyPresentOperatorCodec.java 2013-08-08 20:17:31 UTC (rev 308) @@ -22,9 +22,7 @@ import org.openfast.Global; import org.openfast.ScalarValue; - import org.openfast.error.FastConstants; - import org.openfast.template.Scalar; import org.openfast.template.type.Type; Modified: branches/generics-cleanup/src/main/java/org/openfast/template/serializer/AbstractFieldSerializer.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/serializer/AbstractFieldSerializer.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/template/serializer/AbstractFieldSerializer.java 2013-08-08 20:17:31 UTC (rev 308) @@ -1,6 +1,7 @@ package org.openfast.template.serializer; import java.util.List; + import org.openfast.Node; import org.openfast.QName; import org.openfast.ScalarValue; Modified: branches/generics-cleanup/src/main/java/org/openfast/template/serializer/MessageTemplateSerializer.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/serializer/MessageTemplateSerializer.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/template/serializer/MessageTemplateSerializer.java 2013-08-08 20:17:31 UTC (rev 308) @@ -1,6 +1,7 @@ package org.openfast.template.serializer; import java.io.OutputStream; + import org.openfast.template.MessageTemplate; public interface MessageTemplateSerializer { Modified: branches/generics-cleanup/src/main/java/org/openfast/template/serializer/SerializerRegistry.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/serializer/SerializerRegistry.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/template/serializer/SerializerRegistry.java 2013-08-08 20:17:31 UTC (rev 308) @@ -2,6 +2,7 @@ import java.util.ArrayList; import java.util.List; + import org.openfast.template.Field; public class SerializerRegistry { Modified: branches/generics-cleanup/src/main/java/org/openfast/template/type/Type.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/type/Type.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/template/type/Type.java 2013-08-08 20:17:31 UTC (rev 308) @@ -24,6 +24,7 @@ import java.io.UnsupportedEncodingException; import java.util.LinkedHashMap; import java.util.Map; + import org.openfast.ScalarValue; import org.openfast.StringValue; import org.openfast.template.operator.Operator; Modified: branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/DateString.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/DateString.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/DateString.java 2013-08-08 20:17:31 UTC (rev 308) @@ -25,6 +25,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.TimeZone; + import org.openfast.DateValue; import org.openfast.Global; import org.openfast.ScalarValue; Modified: branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/EpochTimestamp.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/EpochTimestamp.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/EpochTimestamp.java 2013-08-08 20:17:31 UTC (rev 308) @@ -22,6 +22,7 @@ import java.io.InputStream; import java.util.Date; + import org.openfast.DateValue; import org.openfast.ScalarValue; import org.openfast.template.LongValue; Modified: branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/MillisecondsSinceMidnight.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/MillisecondsSinceMidnight.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/MillisecondsSinceMidnight.java 2013-08-08 20:17:31 UTC (rev 308) @@ -24,6 +24,7 @@ import java.util.Calendar; import java.util.Date; import java.util.TimeZone; + import org.openfast.DateValue; import org.openfast.IntegerValue; import org.openfast.ScalarValue; Modified: branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableByteVector.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableByteVector.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableByteVector.java 2013-08-08 20:17:31 UTC (rev 308) @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.InputStream; + import org.openfast.ByteVectorValue; import org.openfast.Global; import org.openfast.IntegerValue; Modified: branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableSignedInteger.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableSignedInteger.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableSignedInteger.java 2013-08-08 20:17:31 UTC (rev 308) @@ -24,6 +24,7 @@ package org.openfast.template.type.codec; import java.io.InputStream; + import org.openfast.NumericValue; import org.openfast.ScalarValue; Modified: branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableSingleFieldDecimal.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableSingleFieldDecimal.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableSingleFieldDecimal.java 2013-08-08 20:17:31 UTC (rev 308) @@ -26,6 +26,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; + import org.openfast.DecimalValue; import org.openfast.Global; import org.openfast.IntegerValue; Modified: branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableStringDelta.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableStringDelta.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableStringDelta.java 2013-08-08 20:17:31 UTC (rev 308) @@ -20,10 +20,11 @@ */ package org.openfast.template.type.codec; +import java.io.InputStream; + import org.openfast.ScalarValue; import org.openfast.StringValue; import org.openfast.template.TwinValue; -import java.io.InputStream; public class NullableStringDelta extends TypeCodec { private static final long serialVersionUID = 1L; Modified: branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableUnicodeString.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableUnicodeString.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableUnicodeString.java 2013-08-08 20:17:31 UTC (rev 308) @@ -25,6 +25,7 @@ import java.io.InputStream; import java.io.UnsupportedEncodingException; + import org.openfast.ByteVectorValue; import org.openfast.ScalarValue; import org.openfast.StringValue; Modified: branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableUnsignedInteger.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableUnsignedInteger.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableUnsignedInteger.java 2013-08-08 20:17:31 UTC (rev 308) @@ -24,6 +24,7 @@ package org.openfast.template.type.codec; import java.io.InputStream; + import org.openfast.NumericValue; import org.openfast.ScalarValue; Modified: branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/SingleFieldDecimal.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/SingleFieldDecimal.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/SingleFieldDecimal.java 2013-08-08 20:17:31 UTC (rev 308) @@ -26,6 +26,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; + import org.openfast.DecimalValue; import org.openfast.Global; import org.openfast.IntegerValue; Modified: branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/StringDelta.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/StringDelta.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/StringDelta.java 2013-08-08 20:17:31 UTC (rev 308) @@ -20,10 +20,11 @@ */ package org.openfast.template.type.codec; +import java.io.InputStream; + import org.openfast.ScalarValue; import org.openfast.StringValue; import org.openfast.template.TwinValue; -import java.io.InputStream; public class StringDelta extends TypeCodec { private static final long serialVersionUID = 1L; Modified: branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/TimeInteger.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/TimeInteger.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/TimeInteger.java 2013-08-08 20:17:31 UTC (rev 308) @@ -22,6 +22,7 @@ import java.io.InputStream; import java.util.Date; + import org.openfast.DateValue; import org.openfast.IntegerValue; import org.openfast.ScalarValue; Modified: branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/TimestampInteger.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/TimestampInteger.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/TimestampInteger.java 2013-08-08 20:17:31 UTC (rev 308) @@ -22,6 +22,7 @@ import java.io.InputStream; import java.util.Date; + import org.openfast.DateValue; import org.openfast.IntegerValue; import org.openfast.ScalarValue; Modified: branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/TypeCodec.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/TypeCodec.java 2013-05-01 11:06:58 UTC (rev 307) +++ branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/TypeCodec.java 2013-08-08 20:17:31 UTC (rev 308) @@ -22,6 +22,7 @@ import java.io.InputStream; import java.io.Serializable; + import org.openfast.Sca... [truncated message content] |
From: <ope...@li...> - 2013-05-01 11:07:13
|
Revision: 307 http://sourceforge.net/p/openfast/code/307 Author: joshseidel Date: 2013-05-01 11:06:58 +0000 (Wed, 01 May 2013) Log Message: ----------- Add annotations and other various Java 7 features. Modified Paths: -------------- branches/generics-cleanup/src/main/java/org/openfast/ApplicationTypeDictionary.java branches/generics-cleanup/src/main/java/org/openfast/BitVector.java branches/generics-cleanup/src/main/java/org/openfast/BitVectorReader.java branches/generics-cleanup/src/main/java/org/openfast/BitVectorValue.java branches/generics-cleanup/src/main/java/org/openfast/ByteUtil.java branches/generics-cleanup/src/main/java/org/openfast/ByteVectorValue.java branches/generics-cleanup/src/main/java/org/openfast/Context.java branches/generics-cleanup/src/main/java/org/openfast/Global.java branches/generics-cleanup/src/main/java/org/openfast/GlobalDictionary.java branches/generics-cleanup/src/main/java/org/openfast/GroupValue.java branches/generics-cleanup/src/main/java/org/openfast/MessageBlockReader.java branches/generics-cleanup/src/main/java/org/openfast/MessageBlockWriter.java branches/generics-cleanup/src/main/java/org/openfast/MessageInputStream.java branches/generics-cleanup/src/main/java/org/openfast/MessageOutputStream.java branches/generics-cleanup/src/main/java/org/openfast/NullOpenFastContext.java branches/generics-cleanup/src/main/java/org/openfast/NumericValue.java branches/generics-cleanup/src/main/java/org/openfast/QName.java branches/generics-cleanup/src/main/java/org/openfast/ScalarValue.java branches/generics-cleanup/src/main/java/org/openfast/SequenceValue.java branches/generics-cleanup/src/main/java/org/openfast/SimpleNode.java branches/generics-cleanup/src/main/java/org/openfast/TemplateDictionary.java branches/generics-cleanup/src/main/java/org/openfast/codec/FastDecoder.java branches/generics-cleanup/src/main/java/org/openfast/codec/FastEncoder.java branches/generics-cleanup/src/main/java/org/openfast/debug/BasicDecodeTrace.java branches/generics-cleanup/src/main/java/org/openfast/debug/BasicEncodeTrace.java branches/generics-cleanup/src/main/java/org/openfast/error/ErrorCode.java branches/generics-cleanup/src/main/java/org/openfast/error/ErrorHandler.java branches/generics-cleanup/src/main/java/org/openfast/error/FastConstants.java branches/generics-cleanup/src/main/java/org/openfast/examples/MessageBlockReaderFactory.java branches/generics-cleanup/src/main/java/org/openfast/examples/MessageBlockWriterFactory.java branches/generics-cleanup/src/main/java/org/openfast/examples/consumer/FastMessageConsumer.java branches/generics-cleanup/src/main/java/org/openfast/examples/consumer/Main.java branches/generics-cleanup/src/main/java/org/openfast/examples/decoder/Main.java branches/generics-cleanup/src/main/java/org/openfast/examples/interpret/FastMessageInterpreter.java branches/generics-cleanup/src/main/java/org/openfast/examples/performance/HexadecimalInputStream.java branches/generics-cleanup/src/main/java/org/openfast/examples/performance/PerformanceRunner.java branches/generics-cleanup/src/main/java/org/openfast/examples/producer/FastMessageProducer.java branches/generics-cleanup/src/main/java/org/openfast/examples/producer/Main.java branches/generics-cleanup/src/main/java/org/openfast/examples/producer/MulticastFastMessageProducer.java branches/generics-cleanup/src/main/java/org/openfast/examples/producer/XmlCompressedMessageConverter.java branches/generics-cleanup/src/main/java/org/openfast/examples/scp10/Main.java branches/generics-cleanup/src/main/java/org/openfast/examples/scp10/ScpMessageProducer.java branches/generics-cleanup/src/main/java/org/openfast/examples/tmplexch/DecodeMain.java branches/generics-cleanup/src/main/java/org/openfast/examples/tmplexch/EncodeMain.java branches/generics-cleanup/src/main/java/org/openfast/examples/tmplexch/TemplateExchangeDefinitionDecoder.java branches/generics-cleanup/src/main/java/org/openfast/extensions/MapFieldParser.java branches/generics-cleanup/src/main/java/org/openfast/extensions/MapScalar.java branches/generics-cleanup/src/main/java/org/openfast/impl/CmeMessageBlockReader.java branches/generics-cleanup/src/main/java/org/openfast/impl/CmeMessageBlockWriter.java branches/generics-cleanup/src/main/java/org/openfast/impl/CmeTcpReplayMessageBlockReader.java branches/generics-cleanup/src/main/java/org/openfast/impl/CmeTcpReplayMessageBlockWriter.java branches/generics-cleanup/src/main/java/org/openfast/logging/FastMessageLogger.java branches/generics-cleanup/src/main/java/org/openfast/logging/FileFastMessageLogger.java branches/generics-cleanup/src/main/java/org/openfast/logging/Loggers.java branches/generics-cleanup/src/main/java/org/openfast/session/AbstractSessionControlProtocol.java branches/generics-cleanup/src/main/java/org/openfast/session/BasicClient.java branches/generics-cleanup/src/main/java/org/openfast/session/BasicOpenFastContext.java branches/generics-cleanup/src/main/java/org/openfast/session/ConnectionListener.java branches/generics-cleanup/src/main/java/org/openfast/session/FastServer.java branches/generics-cleanup/src/main/java/org/openfast/session/LocalConnection.java branches/generics-cleanup/src/main/java/org/openfast/session/LocalEndpoint.java branches/generics-cleanup/src/main/java/org/openfast/session/MessageListener.java branches/generics-cleanup/src/main/java/org/openfast/session/RecordingEndpoint.java branches/generics-cleanup/src/main/java/org/openfast/session/Session.java branches/generics-cleanup/src/main/java/org/openfast/session/SessionControlProtocol_1_0.java branches/generics-cleanup/src/main/java/org/openfast/session/SessionControlProtocol_1_1.java branches/generics-cleanup/src/main/java/org/openfast/session/SessionFactory.java branches/generics-cleanup/src/main/java/org/openfast/session/SessionHandler.java branches/generics-cleanup/src/main/java/org/openfast/session/SessionListener.java branches/generics-cleanup/src/main/java/org/openfast/session/multicast/MulticastClientEndpoint.java branches/generics-cleanup/src/main/java/org/openfast/session/multicast/MulticastConnection.java branches/generics-cleanup/src/main/java/org/openfast/session/multicast/MulticastEndpoint.java branches/generics-cleanup/src/main/java/org/openfast/session/multicast/MulticastOutputStream.java branches/generics-cleanup/src/main/java/org/openfast/session/multicast/MulticastServerEndpoint.java branches/generics-cleanup/src/main/java/org/openfast/session/tcp/TcpConnection.java branches/generics-cleanup/src/main/java/org/openfast/session/tcp/TcpEndpoint.java branches/generics-cleanup/src/main/java/org/openfast/session/template/exchange/AbstractFieldInstructionConverter.java branches/generics-cleanup/src/main/java/org/openfast/session/template/exchange/ComposedDecimalConverter.java branches/generics-cleanup/src/main/java/org/openfast/session/template/exchange/ConversionContext.java branches/generics-cleanup/src/main/java/org/openfast/session/template/exchange/DynamicTemplateReferenceConverter.java branches/generics-cleanup/src/main/java/org/openfast/session/template/exchange/GroupConverter.java branches/generics-cleanup/src/main/java/org/openfast/session/template/exchange/ScalarConverter.java branches/generics-cleanup/src/main/java/org/openfast/session/template/exchange/SequenceConverter.java branches/generics-cleanup/src/main/java/org/openfast/session/template/exchange/StaticTemplateReferenceConverter.java branches/generics-cleanup/src/main/java/org/openfast/session/template/exchange/VariableLengthInstructionConverter.java branches/generics-cleanup/src/main/java/org/openfast/template/AbstractTemplateRegistry.java branches/generics-cleanup/src/main/java/org/openfast/template/BasicTemplateRegistry.java branches/generics-cleanup/src/main/java/org/openfast/template/ComposedScalar.java branches/generics-cleanup/src/main/java/org/openfast/template/DynamicTemplateReference.java branches/generics-cleanup/src/main/java/org/openfast/template/Group.java branches/generics-cleanup/src/main/java/org/openfast/template/MessageTemplate.java branches/generics-cleanup/src/main/java/org/openfast/template/NullTemplateRegistry.java branches/generics-cleanup/src/main/java/org/openfast/template/Scalar.java branches/generics-cleanup/src/main/java/org/openfast/template/Sequence.java branches/generics-cleanup/src/main/java/org/openfast/template/StaticTemplateReference.java branches/generics-cleanup/src/main/java/org/openfast/template/TwinValue.java branches/generics-cleanup/src/main/java/org/openfast/template/loader/AbstractFieldParser.java branches/generics-cleanup/src/main/java/org/openfast/template/loader/ByteVectorParser.java branches/generics-cleanup/src/main/java/org/openfast/template/loader/ComposedDecimalParser.java branches/generics-cleanup/src/main/java/org/openfast/template/loader/GroupParser.java branches/generics-cleanup/src/main/java/org/openfast/template/loader/ScalarParser.java branches/generics-cleanup/src/main/java/org/openfast/template/loader/SequenceParser.java branches/generics-cleanup/src/main/java/org/openfast/template/loader/StringParser.java branches/generics-cleanup/src/main/java/org/openfast/template/loader/TemplateParser.java branches/generics-cleanup/src/main/java/org/openfast/template/loader/TemplateRefParser.java branches/generics-cleanup/src/main/java/org/openfast/template/loader/VariableLengthScalarParser.java branches/generics-cleanup/src/main/java/org/openfast/template/loader/XMLMessageTemplateLoader.java branches/generics-cleanup/src/main/java/org/openfast/template/operator/AlwaysPresentOperatorCodec.java branches/generics-cleanup/src/main/java/org/openfast/template/operator/ConstantOperatorCodec.java branches/generics-cleanup/src/main/java/org/openfast/template/operator/CopyOperatorCodec.java branches/generics-cleanup/src/main/java/org/openfast/template/operator/DefaultOperatorCodec.java branches/generics-cleanup/src/main/java/org/openfast/template/operator/DeltaDecimalOperatorCodec.java branches/generics-cleanup/src/main/java/org/openfast/template/operator/DeltaIntegerOperatorCodec.java branches/generics-cleanup/src/main/java/org/openfast/template/operator/DeltaStringOperatorCodec.java branches/generics-cleanup/src/main/java/org/openfast/template/operator/IncrementIntegerOperatorCodec.java branches/generics-cleanup/src/main/java/org/openfast/template/operator/NoneOperatorCodec.java branches/generics-cleanup/src/main/java/org/openfast/template/operator/Operator.java branches/generics-cleanup/src/main/java/org/openfast/template/operator/OperatorCodec.java branches/generics-cleanup/src/main/java/org/openfast/template/operator/OptionallyPresentOperatorCodec.java branches/generics-cleanup/src/main/java/org/openfast/template/operator/TailOperatorCodec.java branches/generics-cleanup/src/main/java/org/openfast/template/serializer/ComposedDecimalSerializer.java branches/generics-cleanup/src/main/java/org/openfast/template/serializer/DynamicTemplateReferenceSerializer.java branches/generics-cleanup/src/main/java/org/openfast/template/serializer/GroupSerializer.java branches/generics-cleanup/src/main/java/org/openfast/template/serializer/ScalarSerializer.java branches/generics-cleanup/src/main/java/org/openfast/template/serializer/SequenceSerializer.java branches/generics-cleanup/src/main/java/org/openfast/template/serializer/SerializerRegistry.java branches/generics-cleanup/src/main/java/org/openfast/template/serializer/SerializingContext.java branches/generics-cleanup/src/main/java/org/openfast/template/serializer/StaticTemplateReferenceSerializer.java branches/generics-cleanup/src/main/java/org/openfast/template/serializer/TemplateSerializer.java branches/generics-cleanup/src/main/java/org/openfast/template/serializer/VariableLengthScalarSerializer.java branches/generics-cleanup/src/main/java/org/openfast/template/serializer/XMLMessageTemplateSerializer.java branches/generics-cleanup/src/main/java/org/openfast/template/type/ByteVectorType.java branches/generics-cleanup/src/main/java/org/openfast/template/type/DateType.java branches/generics-cleanup/src/main/java/org/openfast/template/type/DecimalConverter.java branches/generics-cleanup/src/main/java/org/openfast/template/type/DecimalType.java branches/generics-cleanup/src/main/java/org/openfast/template/type/IntegerType.java branches/generics-cleanup/src/main/java/org/openfast/template/type/SimpleType.java branches/generics-cleanup/src/main/java/org/openfast/template/type/StringType.java branches/generics-cleanup/src/main/java/org/openfast/template/type/Type.java branches/generics-cleanup/src/main/java/org/openfast/template/type/UnsignedIntegerType.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/AsciiString.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/BitVectorType.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/ByteVectorType.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/DateInteger.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/DateString.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/EpochTimestamp.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/IntegerCodec.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/MillisecondsSinceMidnight.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NotStopBitEncodedTypeCodec.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableAsciiString.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableByteVector.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableSignedInteger.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableSingleFieldDecimal.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableStringDelta.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableUnicodeString.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/NullableUnsignedInteger.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/SignedInteger.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/SingleFieldDecimal.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/StringDelta.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/TimeInteger.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/TimestampInteger.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/UnicodeString.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/UnsignedInteger.java branches/generics-cleanup/src/main/java/org/openfast/util/ArrayIterator.java branches/generics-cleanup/src/main/java/org/openfast/util/Key.java branches/generics-cleanup/src/main/java/org/openfast/util/RecordingInputStream.java branches/generics-cleanup/src/main/java/org/openfast/util/RecordingOutputStream.java branches/generics-cleanup/src/main/java/org/openfast/util/SimpleIntegerMap.java branches/generics-cleanup/src/main/java/org/openfast/util/UnboundedCache.java branches/generics-cleanup/src/main/java/org/openfast/util/Util.java branches/generics-cleanup/src/main/java/org/openfast/util/XmlWriter.java branches/generics-cleanup/src/test/java/org/openfast/DictionaryTest.java branches/generics-cleanup/src/test/java/org/openfast/ExhaustiveOperatorTest.java branches/generics-cleanup/src/test/java/org/openfast/TemplateTest.java branches/generics-cleanup/src/test/java/org/openfast/acceptance/EncodingDecodingAcceptanceTest.java branches/generics-cleanup/src/test/java/org/openfast/codec/FastDecoderTest.java branches/generics-cleanup/src/test/java/org/openfast/impl/CmeMessageBlockReaderWriterTest.java branches/generics-cleanup/src/test/java/org/openfast/impl/CmeTcpReplayMessageBlockReaderWriterTest.java branches/generics-cleanup/src/test/java/org/openfast/session/SCP_1_1_Test.java branches/generics-cleanup/src/test/java/org/openfast/session/SessionControlProtocol_1_1Test.java branches/generics-cleanup/src/test/java/org/openfast/session/multicast/MulticastOutputStreamTest.java branches/generics-cleanup/src/test/java/org/openfast/session/template/exchange/ComposedDecimalConverterTest.java branches/generics-cleanup/src/test/java/org/openfast/session/template/exchange/ScalarConverterTest.java branches/generics-cleanup/src/test/java/org/openfast/session/template/exchange/SequenceConverterTest.java branches/generics-cleanup/src/test/java/org/openfast/session/template/exchange/TemplateDefinitionTest.java branches/generics-cleanup/src/test/java/org/openfast/session/template/exchange/VariableLengthInstructionConverterTest.java branches/generics-cleanup/src/test/java/org/openfast/submitted/BitVectorOobExceptionTest.java branches/generics-cleanup/src/test/java/org/openfast/submitted/EbsDecodingErrorTest.java branches/generics-cleanup/src/test/java/org/openfast/submitted/OpraFeedTest.java branches/generics-cleanup/src/test/java/org/openfast/submitted/TemplateDictionaryScopeTest.java branches/generics-cleanup/src/test/java/org/openfast/template/BasicTemplateRegistryTest.java branches/generics-cleanup/src/test/java/org/openfast/template/DynamicTemplateReferenceTest.java branches/generics-cleanup/src/test/java/org/openfast/template/GroupTest.java branches/generics-cleanup/src/test/java/org/openfast/template/ScalarTest.java branches/generics-cleanup/src/test/java/org/openfast/template/SequenceTest.java branches/generics-cleanup/src/test/java/org/openfast/template/loader/Array.java branches/generics-cleanup/src/test/java/org/openfast/template/loader/ComposedDecimalParserTest.java branches/generics-cleanup/src/test/java/org/openfast/template/loader/ScalarParserTest.java branches/generics-cleanup/src/test/java/org/openfast/template/loader/SequenceParserTest.java branches/generics-cleanup/src/test/java/org/openfast/template/loader/StringParserTest.java branches/generics-cleanup/src/test/java/org/openfast/template/loader/TemplateRefParserTest.java branches/generics-cleanup/src/test/java/org/openfast/template/loader/XMLMessageTemplateLoaderTest.java branches/generics-cleanup/src/test/java/org/openfast/template/operator/DeltaByteVectorOperatorTest.java branches/generics-cleanup/src/test/java/org/openfast/template/operator/DeltaStringOperatorTest.java branches/generics-cleanup/src/test/java/org/openfast/template/operator/DeltaUnicodeOperatorTest.java branches/generics-cleanup/src/test/java/org/openfast/template/type/codec/ComposedDecimalTest.java branches/generics-cleanup/src/test/java/org/openfast/template/type/codec/SingleFieldDecimalTest.java branches/generics-cleanup/src/test/java/org/openfast/test/IOExceptionOnCloseStream.java branches/generics-cleanup/src/test/java/org/openfast/test/IOExceptionThrowingStream.java branches/generics-cleanup/src/test/java/org/openfast/test/OpenFastTestCase.java branches/generics-cleanup/src/test/java/org/openfast/test/TestUtil.java branches/generics-cleanup/src/test/java/org/openfast/util/ArrayIteratorTest.java branches/generics-cleanup/src/test/java/org/openfast/util/SimpleIntegerMapTest.java branches/generics-cleanup/src/test/java/org/openfast/util/UtilTest.java Property Changed: ---------------- branches/generics-cleanup/ Index: branches/generics-cleanup =================================================================== --- branches/generics-cleanup 2013-03-11 16:57:11 UTC (rev 306) +++ branches/generics-cleanup 2013-05-01 11:06:58 UTC (rev 307) Property changes on: branches/generics-cleanup ___________________________________________________________________ Modified: svn:mergeinfo ## -1 +1,2 ## -/trunk:267-298 +/branches/generics-cleanup:300-306 +/trunk:267-299 \ No newline at end of property Modified: branches/generics-cleanup/src/main/java/org/openfast/ApplicationTypeDictionary.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/ApplicationTypeDictionary.java 2013-03-11 16:57:11 UTC (rev 306) +++ branches/generics-cleanup/src/main/java/org/openfast/ApplicationTypeDictionary.java 2013-05-01 11:06:58 UTC (rev 307) @@ -28,9 +28,10 @@ public class ApplicationTypeDictionary implements Dictionary { - private Map<QName, Map<QName, ScalarValue>> dictionary = new HashMap<QName, Map<QName, ScalarValue>>(); + private Map<QName, Map<QName, ScalarValue>> dictionary = new HashMap<>(); - public ScalarValue lookup(Group template, QName key, QName applicationType) { + @Override + public ScalarValue lookup(Group template, QName key, QName applicationType) { if (dictionary.containsKey(template.getTypeReference())) { Map<QName, ScalarValue> applicationTypeMap = dictionary.get(template.getTypeReference()); if (applicationTypeMap.containsKey(key)) @@ -39,11 +40,13 @@ return ScalarValue.UNDEFINED; } - public void reset() { - dictionary = new HashMap<QName, Map<QName, ScalarValue>>(); + @Override + public void reset() { + dictionary = new HashMap<>(); } - public void store(Group group, QName applicationType, QName key, ScalarValue value) { + @Override + public void store(Group group, QName applicationType, QName key, ScalarValue value) { if (!dictionary.containsKey(group.getTypeReference())) { dictionary.put(group.getTypeReference(), new HashMap<QName, ScalarValue>()); } @@ -51,7 +54,8 @@ applicationTypeDictionary.put(key, value); } - public String toString() { + @Override + public String toString() { StringBuilder builder = new StringBuilder(); Iterator<QName> templateIterator = dictionary.keySet().iterator(); while (templateIterator.hasNext()) { Modified: branches/generics-cleanup/src/main/java/org/openfast/BitVector.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/BitVector.java 2013-03-11 16:57:11 UTC (rev 306) +++ branches/generics-cleanup/src/main/java/org/openfast/BitVector.java 2013-05-01 11:06:58 UTC (rev 307) @@ -67,7 +67,8 @@ return ((bytes[fieldIndex / 7] & (1 << (6 - (fieldIndex % 7)))) > 0); } - public boolean equals(Object obj) { + @Override + public boolean equals(Object obj) { if ((obj == null) || !(obj instanceof BitVector)) { return false; } @@ -86,7 +87,8 @@ return true; } - public int hashCode() { + @Override + public int hashCode() { return bytes.hashCode(); } @@ -94,7 +96,8 @@ return (bytes.length > 1) && ((bytes[bytes.length - 1] & VALUE_BITS_SET) == 0); } - public String toString() { + @Override + public String toString() { return "BitVector [" + ByteUtil.convertByteArrayToBitString(bytes) + "]"; } Modified: branches/generics-cleanup/src/main/java/org/openfast/BitVectorReader.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/BitVectorReader.java 2013-03-11 16:57:11 UTC (rev 306) +++ branches/generics-cleanup/src/main/java/org/openfast/BitVectorReader.java 2013-05-01 11:06:58 UTC (rev 307) @@ -22,16 +22,19 @@ public class BitVectorReader { public static final BitVectorReader NULL = new BitVectorReader(null) { - public boolean read() { + @Override + public boolean read() { throw new IllegalStateException(); } - public boolean hasMoreBitsSet() { + @Override + public boolean hasMoreBitsSet() { return false; } }; public static final BitVectorReader INFINITE_TRUE = new BitVectorReader(null) { - public boolean read() { + @Override + public boolean read() { return true; } }; @@ -54,7 +57,8 @@ return vector.indexOfLastSet() > index; } - public String toString() { + @Override + public String toString() { return vector.toString(); } Modified: branches/generics-cleanup/src/main/java/org/openfast/BitVectorValue.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/BitVectorValue.java 2013-03-11 16:57:11 UTC (rev 306) +++ branches/generics-cleanup/src/main/java/org/openfast/BitVectorValue.java 2013-05-01 11:06:58 UTC (rev 307) @@ -28,7 +28,8 @@ this.value = value; } - public boolean equals(Object obj) { + @Override + public boolean equals(Object obj) { if ((obj == null) || !(obj instanceof BitVectorValue)) { return false; } @@ -40,7 +41,8 @@ return other.value.equals(this.value); } - public int hashCode() { + @Override + public int hashCode() { return value.hashCode(); } } Modified: branches/generics-cleanup/src/main/java/org/openfast/ByteUtil.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/ByteUtil.java 2013-03-11 16:57:11 UTC (rev 306) +++ branches/generics-cleanup/src/main/java/org/openfast/ByteUtil.java 2013-05-01 11:06:58 UTC (rev 307) @@ -47,13 +47,13 @@ } public static byte[] convertHexStringToByteArray(String hexString) { - if (hexString == null) { + if (hexString == null) { return new byte[0]; } - hexString = hexString.replaceAll(" ", ""); - byte[] bytes = new byte[hexString.length() / 2]; - for (int i = 0; i < hexString.length(); i += 2) { - bytes[i / 2] = (byte) Integer.parseInt(hexString.substring(i, i + 2), 16); + String hexStringReplaced = hexString.replaceAll(" ", ""); + byte[] bytes = new byte[hexStringReplaced.length() / 2]; + for (int i = 0; i < hexStringReplaced.length(); i += 2) { + bytes[i / 2] = (byte) Integer.parseInt(hexStringReplaced.substring(i, i + 2), 16); } return bytes; } Modified: branches/generics-cleanup/src/main/java/org/openfast/ByteVectorValue.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/ByteVectorValue.java 2013-03-11 16:57:11 UTC (rev 306) +++ branches/generics-cleanup/src/main/java/org/openfast/ByteVectorValue.java 2013-05-01 11:06:58 UTC (rev 307) @@ -37,11 +37,13 @@ this.length = length; } - public byte[] getBytes() { + @Override + public byte[] getBytes() { return value; } - public String serialize() { + @Override + public String serialize() { StringBuffer builder = new StringBuffer(value.length * 2); for (byte v : value) { String hex = Integer.toHexString(v & 0xff); @@ -50,11 +52,13 @@ return builder.toString(); } - public String toString() { + @Override + public String toString() { return new String(value, offset, length); } - public boolean equals(Object obj) { + @Override + public boolean equals(Object obj) { if ((obj == null) || !(obj instanceof ByteVectorValue)) { return false; } @@ -73,7 +77,8 @@ return true; } - public int hashCode() { + @Override + public int hashCode() { return value.hashCode(); } } Modified: branches/generics-cleanup/src/main/java/org/openfast/Context.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/Context.java 2013-03-11 16:57:11 UTC (rev 306) +++ branches/generics-cleanup/src/main/java/org/openfast/Context.java 2013-05-01 11:06:58 UTC (rev 307) @@ -47,14 +47,14 @@ public class Context implements OpenFastContext { private TemplateRegistry templateRegistry = new BasicTemplateRegistry(); private int lastTemplateId; - private final Map<String, Dictionary> dictionaries = new HashMap<String, Dictionary>(); + private final Map<String, Dictionary> dictionaries = new HashMap<>(); private ErrorHandler errorHandler = ErrorHandler.DEFAULT; private QName currentApplicationType; private final List<TemplateRegisteredListener> listeners = Collections.emptyList(); private boolean traceEnabled; private Trace encodeTrace; private Trace decodeTrace; - private final Map<QName, Cache> caches = new HashMap<QName, Cache>(); + private final Map<QName, Cache> caches = new HashMap<>(); private final OpenFastContext parentContext; private FastMessageLogger logger = null; @@ -67,14 +67,16 @@ dictionaries.put("template", new TemplateDictionary()); dictionaries.put("type", new ApplicationTypeDictionary()); } - public int getTemplateId(MessageTemplate template) { + @Override + public int getTemplateId(MessageTemplate template) { if (!templateRegistry.isRegistered(template)) { errorHandler.error(FastConstants.D9_TEMPLATE_NOT_REGISTERED, "The template " + template + " has not been registered."); return 0; } return templateRegistry.getId(template); } - public MessageTemplate getTemplate(int templateId) { + @Override + public MessageTemplate getTemplate(int templateId) { if (!templateRegistry.isRegistered(templateId)) { errorHandler.error(FastConstants.D9_TEMPLATE_NOT_REGISTERED, "The template with id " + templateId + " has not been registered."); @@ -82,7 +84,8 @@ } return templateRegistry.get(templateId); } - public void registerTemplate(int templateId, MessageTemplate template) { + @Override + public void registerTemplate(int templateId, MessageTemplate template) { templateRegistry.register(templateId, template); Iterator<TemplateRegisteredListener> iter = listeners.iterator(); while (iter.hasNext()) { @@ -116,7 +119,8 @@ dict.reset(); } } - public void setErrorHandler(ErrorHandler errorHandler) { + @Override + public void setErrorHandler(ErrorHandler errorHandler) { this.errorHandler = errorHandler; } public void newMessage(MessageTemplate template) { @@ -125,10 +129,12 @@ public void setCurrentApplicationType(QName name) { currentApplicationType = name; } - public TemplateRegistry getTemplateRegistry() { + @Override + public TemplateRegistry getTemplateRegistry() { return templateRegistry; } - public void setTemplateRegistry(TemplateRegistry registry) { + @Override + public void setTemplateRegistry(TemplateRegistry registry) { this.templateRegistry = registry; } public boolean isTraceEnabled() { @@ -171,14 +177,16 @@ } caches.get(key).store(index, value); } - public FastMessageLogger getLogger() { + @Override + public FastMessageLogger getLogger() { if (logger == null) { return parentContext.getLogger(); } return logger; } - public void setLogger(FastMessageLogger logger) { + @Override + public void setLogger(FastMessageLogger logger) { this.logger = logger; } } Modified: branches/generics-cleanup/src/main/java/org/openfast/Global.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/Global.java 2013-03-11 16:57:11 UTC (rev 306) +++ branches/generics-cleanup/src/main/java/org/openfast/Global.java 2013-05-01 11:06:58 UTC (rev 307) @@ -28,7 +28,7 @@ public final class Global { private static ErrorHandler errorHandler = ErrorHandler.DEFAULT; private static int currentImplicitId = (int) (System.currentTimeMillis() % 10000); - private static final ThreadLocal<ByteArrayOutputStream> buffers = new ThreadLocal<ByteArrayOutputStream>(); + private static final ThreadLocal<ByteArrayOutputStream> buffers = new ThreadLocal<>(); public static void setErrorHandler(ErrorHandler handler) { if (handler == null) { Modified: branches/generics-cleanup/src/main/java/org/openfast/GlobalDictionary.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/GlobalDictionary.java 2013-03-11 16:57:11 UTC (rev 306) +++ branches/generics-cleanup/src/main/java/org/openfast/GlobalDictionary.java 2013-05-01 11:06:58 UTC (rev 307) @@ -28,9 +28,10 @@ public class GlobalDictionary implements Dictionary { - protected Map<QName, ScalarValue> table = new HashMap<QName, ScalarValue>(); + protected Map<QName, ScalarValue> table = new HashMap<>(); - public ScalarValue lookup(Group template, QName key, QName applicationType) { + @Override + public ScalarValue lookup(Group template, QName key, QName applicationType) { if (!table.containsKey(key)) { return ScalarValue.UNDEFINED; } @@ -38,15 +39,18 @@ return table.get(key); } - public void store(Group group, QName applicationType, QName key, ScalarValue value) { + @Override + public void store(Group group, QName applicationType, QName key, ScalarValue value) { table.put(key, value); } - public void reset() { + @Override + public void reset() { table.clear(); } - public String toString() { + @Override + public String toString() { StringBuilder builder = new StringBuilder(); Iterator<QName> keyIterator = table.keySet().iterator(); while (keyIterator.hasNext()) { Modified: branches/generics-cleanup/src/main/java/org/openfast/GroupValue.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/GroupValue.java 2013-03-11 16:57:11 UTC (rev 306) +++ branches/generics-cleanup/src/main/java/org/openfast/GroupValue.java 2013-05-01 11:06:58 UTC (rev 307) @@ -61,7 +61,7 @@ } public Iterator<FieldValue> iterator() { - return new ArrayIterator<FieldValue>(values); + return new ArrayIterator<>(values); } public int getInt(int fieldIndex) { @@ -348,7 +348,8 @@ return getValue(fieldName) != null; } - public FieldValue copy() { + @Override + public FieldValue copy() { FieldValue[] copies = new FieldValue[values.length]; for (int i = 0; i < copies.length; ++i) { copies[i] = values[i].copy(); Modified: branches/generics-cleanup/src/main/java/org/openfast/MessageBlockReader.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/MessageBlockReader.java 2013-03-11 16:57:11 UTC (rev 306) +++ branches/generics-cleanup/src/main/java/org/openfast/MessageBlockReader.java 2013-05-01 11:06:58 UTC (rev 307) @@ -24,11 +24,13 @@ public interface MessageBlockReader { MessageBlockReader NULL = new MessageBlockReader() { - public boolean readBlock(InputStream in) { + @Override + public boolean readBlock(InputStream in) { return true; } - public void messageRead(InputStream in, Message message) { } + @Override + public void messageRead(InputStream in, Message message) { } @Override public String toString() { Modified: branches/generics-cleanup/src/main/java/org/openfast/MessageBlockWriter.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/MessageBlockWriter.java 2013-03-11 16:57:11 UTC (rev 306) +++ branches/generics-cleanup/src/main/java/org/openfast/MessageBlockWriter.java 2013-05-01 11:06:58 UTC (rev 307) @@ -6,7 +6,8 @@ public interface MessageBlockWriter { MessageBlockWriter NULL = new MessageBlockWriter() { - public void writeBlockLength(OutputStream out, Message message, byte[] encodedMessage) throws IOException { + @Override + public void writeBlockLength(OutputStream out, Message message, byte[] encodedMessage) throws IOException { } }; Modified: branches/generics-cleanup/src/main/java/org/openfast/MessageInputStream.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/MessageInputStream.java 2013-03-11 16:57:11 UTC (rev 306) +++ branches/generics-cleanup/src/main/java/org/openfast/MessageInputStream.java 2013-05-01 11:06:58 UTC (rev 307) @@ -85,7 +85,8 @@ context.registerTemplate(templateId, template); } - public void close() { + @Override + public void close() { try { in.close(); } catch (IOException e) { @@ -97,16 +98,18 @@ return in; } - public void addMessageHandler(MessageTemplate template, MessageHandler handler) { + @Override + public void addMessageHandler(MessageTemplate template, MessageHandler handler) { if (templateHandlers == Collections.EMPTY_MAP) { - templateHandlers = new HashMap<MessageTemplate, MessageHandler>(); + templateHandlers = new HashMap<>(); } templateHandlers.put(template, handler); } - public void addMessageHandler(MessageHandler handler) { + @Override + public void addMessageHandler(MessageHandler handler) { if (handlers == Collections.EMPTY_LIST) { - handlers = new ArrayList<MessageHandler>(4); + handlers = new ArrayList<>(4); } handlers.add(handler); } @@ -115,7 +118,8 @@ context.setTemplateRegistry(registry); } - public TemplateRegistry getTemplateRegistry() { + @Override + public TemplateRegistry getTemplateRegistry() { return context.getTemplateRegistry(); } Modified: branches/generics-cleanup/src/main/java/org/openfast/MessageOutputStream.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/MessageOutputStream.java 2013-03-11 16:57:11 UTC (rev 306) +++ branches/generics-cleanup/src/main/java/org/openfast/MessageOutputStream.java 2013-05-01 11:06:58 UTC (rev 307) @@ -93,7 +93,8 @@ encoder.registerTemplate(templateId, template); } - public void close() { + @Override + public void close() { try { out.close(); } catch (IOException e) { @@ -105,16 +106,18 @@ return out; } - public void addMessageHandler(MessageTemplate template, MessageHandler handler) { + @Override + public void addMessageHandler(MessageTemplate template, MessageHandler handler) { if (templateHandlers == Collections.EMPTY_MAP) { - templateHandlers = new HashMap<MessageTemplate, MessageHandler>(); + templateHandlers = new HashMap<>(); } templateHandlers.put(template, handler); } - public void addMessageHandler(MessageHandler handler) { + @Override + public void addMessageHandler(MessageHandler handler) { if (handlers == Collections.EMPTY_LIST) { - handlers = new ArrayList<MessageHandler>(4); + handlers = new ArrayList<>(4); } handlers.add(handler); } @@ -133,7 +136,8 @@ this.blockWriter = blockWriter; } - public TemplateRegistry getTemplateRegistry() { + @Override + public TemplateRegistry getTemplateRegistry() { return context.getTemplateRegistry(); } Modified: branches/generics-cleanup/src/main/java/org/openfast/NullOpenFastContext.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/NullOpenFastContext.java 2013-03-11 16:57:11 UTC (rev 306) +++ branches/generics-cleanup/src/main/java/org/openfast/NullOpenFastContext.java 2013-05-01 11:06:58 UTC (rev 307) @@ -7,32 +7,40 @@ public class NullOpenFastContext implements OpenFastContext { - public MessageTemplate getTemplate(int templateId) { + @Override + public MessageTemplate getTemplate(int templateId) { return null; } - public int getTemplateId(MessageTemplate template) { + @Override + public int getTemplateId(MessageTemplate template) { return 0; } - public TemplateRegistry getTemplateRegistry() { + @Override + public TemplateRegistry getTemplateRegistry() { return null; } - public void registerTemplate(int templateId, MessageTemplate template) { + @Override + public void registerTemplate(int templateId, MessageTemplate template) { } - public void setErrorHandler(ErrorHandler errorHandler) { + @Override + public void setErrorHandler(ErrorHandler errorHandler) { } - public void setTemplateRegistry(TemplateRegistry registry) { + @Override + public void setTemplateRegistry(TemplateRegistry registry) { } - public FastMessageLogger getLogger() { + @Override + public FastMessageLogger getLogger() { return FastMessageLogger.NULL; } - public void setLogger(FastMessageLogger logger) { + @Override + public void setLogger(FastMessageLogger logger) { } } Modified: branches/generics-cleanup/src/main/java/org/openfast/NumericValue.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/NumericValue.java 2013-03-11 16:57:11 UTC (rev 306) +++ branches/generics-cleanup/src/main/java/org/openfast/NumericValue.java 2013-05-01 11:06:58 UTC (rev 307) @@ -27,6 +27,8 @@ public abstract NumericValue subtract(NumericValue priorValue); public abstract NumericValue add(NumericValue addend); public abstract boolean equals(int value); - public abstract long toLong(); - public abstract int toInt(); + @Override + public abstract long toLong(); + @Override + public abstract int toInt(); } Modified: branches/generics-cleanup/src/main/java/org/openfast/QName.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/QName.java 2013-03-11 16:57:11 UTC (rev 306) +++ branches/generics-cleanup/src/main/java/org/openfast/QName.java 2013-05-01 11:06:58 UTC (rev 307) @@ -51,7 +51,8 @@ return name; } - public boolean equals(Object obj) { + @Override + public boolean equals(Object obj) { if (obj == this) return true; if (obj == null || obj.getClass() != this.getClass()) @@ -60,11 +61,13 @@ return other.namespace.equals(namespace) && other.name.equals(name); } - public int hashCode() { + @Override + public int hashCode() { return name.hashCode() + 31 * namespace.hashCode(); } - public String toString() { + @Override + public String toString() { if (namespace.equals("")) return name; return name + "[" + namespace + "]"; Modified: branches/generics-cleanup/src/main/java/org/openfast/ScalarValue.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/ScalarValue.java 2013-03-11 16:57:11 UTC (rev 306) +++ branches/generics-cleanup/src/main/java/org/openfast/ScalarValue.java 2013-05-01 11:06:58 UTC (rev 307) @@ -59,7 +59,8 @@ return false; } - public FieldValue copy() { + @Override + public FieldValue copy() { return this; // immutable objects don't need actual copies. } Modified: branches/generics-cleanup/src/main/java/org/openfast/SequenceValue.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/SequenceValue.java 2013-03-11 16:57:11 UTC (rev 306) +++ branches/generics-cleanup/src/main/java/org/openfast/SequenceValue.java 2013-05-01 11:06:58 UTC (rev 307) @@ -48,19 +48,20 @@ public void add(GroupValue value) { if (elements == Collections.EMPTY_LIST) { - elements = new ArrayList<GroupValue>(); + elements = new ArrayList<>(); } elements.add(value); } public void add(FieldValue[] values) { if (elements == Collections.EMPTY_LIST) { - elements = new ArrayList<GroupValue>(); + elements = new ArrayList<>(); } elements.add(new GroupValue(sequence.getGroup(), values)); } - public boolean equals(Object other) { + @Override + public boolean equals(Object other) { if (other == this) { return true; } @@ -82,11 +83,13 @@ return true; } - public int hashCode() { + @Override + public int hashCode() { return elements.hashCode() * 37 + sequence.hashCode(); } - public String toString() { + @Override + public String toString() { StringBuilder builder = new StringBuilder(4 + elements.size() * 24); Iterator<GroupValue> iter = elements.iterator(); builder.append("[ "); @@ -110,7 +113,8 @@ return this.elements.toArray(new GroupValue[elements.size()]); } - public FieldValue copy() { + @Override + public FieldValue copy() { SequenceValue value = new SequenceValue(this.sequence); for (GroupValue element : elements) { value.add((GroupValue) element.copy()); Modified: branches/generics-cleanup/src/main/java/org/openfast/SimpleNode.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/SimpleNode.java 2013-03-11 16:57:11 UTC (rev 306) +++ branches/generics-cleanup/src/main/java/org/openfast/SimpleNode.java 2013-05-01 11:06:58 UTC (rev 307) @@ -15,31 +15,36 @@ this.name = nodeName; } - public void addNode(Node node) { + @Override + public void addNode(Node node) { if (nodes.isEmpty()) - nodes = new ArrayList<Node>(3); + nodes = new ArrayList<>(3); nodes.add(node); } - public List<Node> getNodes() { + @Override + public List<Node> getNodes() { return nodes; } - public String getAttribute(QName name) { + @Override + public String getAttribute(QName name) { return attributes.get(name); } - public Map<QName, String> getAttributes() { + @Override + public Map<QName, String> getAttributes() { return attributes; } - public List<Node> getChildren(QName name) { + @Override + public List<Node> getChildren(QName name) { List<Node> children = Collections.emptyList(); for (int i = 0; i < nodes.size() && name != null; ++i) { Node child = (Node)nodes.get(i); if (name.equals(child.getNodeName())) { if (children.isEmpty()) { - children = new ArrayList<Node>(); + children = new ArrayList<>(); } children.add(nodes.get(i)); } @@ -47,22 +52,26 @@ return children; } - public QName getNodeName() { + @Override + public QName getNodeName() { return name; } - public void setAttribute(QName name, String value) { + @Override + public void setAttribute(QName name, String value) { if (attributes.isEmpty()) { - attributes = new HashMap<QName, String>(); + attributes = new HashMap<>(); } attributes.put(name, value); } - public boolean hasAttribute(QName name) { + @Override + public boolean hasAttribute(QName name) { return attributes.containsKey(name); } - public boolean hasChild(QName name) { + @Override + public boolean hasChild(QName name) { for (int i = 0; i < nodes.size() && name != null; ++i) { Node child = (Node)nodes.get(i); if (name.equals(child.getNodeName())) { Modified: branches/generics-cleanup/src/main/java/org/openfast/TemplateDictionary.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/TemplateDictionary.java 2013-03-11 16:57:11 UTC (rev 306) +++ branches/generics-cleanup/src/main/java/org/openfast/TemplateDictionary.java 2013-05-01 11:06:58 UTC (rev 307) @@ -28,9 +28,10 @@ public class TemplateDictionary implements Dictionary { - protected Map<Group, Map<QName, ScalarValue>> table = new HashMap<Group, Map<QName, ScalarValue>>(); + protected Map<Group, Map<QName, ScalarValue>> table = new HashMap<>(); - public ScalarValue lookup(Group template, QName key, QName applicationType) { + @Override + public ScalarValue lookup(Group template, QName key, QName applicationType) { if (!table.containsKey(template)) { return ScalarValue.UNDEFINED; } @@ -42,11 +43,13 @@ return ScalarValue.UNDEFINED; } - public void reset() { + @Override + public void reset() { table.clear(); } - public void store(Group group, QName applicationType, QName key, ScalarValue valueToEncode) { + @Override + public void store(Group group, QName applicationType, QName key, ScalarValue valueToEncode) { if (!table.containsKey(group)) { table.put(group, new HashMap<QName, ScalarValue>()); } @@ -54,7 +57,8 @@ table.get(group).put(key, valueToEncode); } - public String toString() { + @Override + public String toString() { StringBuilder builder = new StringBuilder(); Iterator<Group> templateIterator = table.keySet().iterator(); while (templateIterator.hasNext()) { Modified: branches/generics-cleanup/src/main/java/org/openfast/codec/FastDecoder.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/codec/FastDecoder.java 2013-03-11 16:57:11 UTC (rev 306) +++ branches/generics-cleanup/src/main/java/org/openfast/codec/FastDecoder.java 2013-05-01 11:06:58 UTC (rev 307) @@ -102,7 +102,8 @@ /** * Reset the FAST dictionary. */ - public void reset() { + @Override + public void reset() { context.reset(); } } Modified: branches/generics-cleanup/src/main/java/org/openfast/codec/FastEncoder.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/codec/FastEncoder.java 2013-03-11 16:57:11 UTC (rev 306) +++ branches/generics-cleanup/src/main/java/org/openfast/codec/FastEncoder.java 2013-05-01 11:06:58 UTC (rev 307) @@ -47,7 +47,8 @@ context.newMessage(template); return template.encode(message, context); } - public void reset() { + @Override + public void reset() { context.reset(); } public void registerTemplate(int templateId, MessageTemplate template) { @@ -55,7 +56,7 @@ } public void addTemplateRegisteredListener(TemplateRegisteredListener templateRegisteredListener) { if (listeners.isEmpty()) { - listeners = new ArrayList<TemplateRegisteredListener>(); + listeners = new ArrayList<>(); } listeners.add(templateRegisteredListener); } Modified: branches/generics-cleanup/src/main/java/org/openfast/debug/BasicDecodeTrace.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/debug/BasicDecodeTrace.java 2013-03-11 16:57:11 UTC (rev 306) +++ branches/generics-cleanup/src/main/java/org/openfast/debug/BasicDecodeTrace.java 2013-05-01 11:06:58 UTC (rev 307) @@ -30,7 +30,8 @@ private String indent = ""; private PrintWriter out = new PrintWriter(System.out); - public void groupStart(Group group) { + @Override + public void groupStart(Group group) { print(group); moveDown(); } @@ -49,11 +50,13 @@ out.flush(); } - public void groupEnd() { + @Override + public void groupEnd() { moveUp(); } - public void field(Field field, FieldValue value, FieldValue decodedValue, byte[] encoding, int pmapIndex) { + @Override + public void field(Field field, FieldValue value, FieldValue decodedValue, byte[] encoding, int pmapIndex) { StringBuilder scalarDecode = new StringBuilder(); scalarDecode.append(field.getName()).append(": "); scalarDecode.append(ByteUtil.convertByteArrayToHexString(encoding)); @@ -61,7 +64,8 @@ print(scalarDecode); } - public void pmap(byte[] bytes) { + @Override + public void pmap(byte[] bytes) { print("PMAP: " + ByteUtil.convertByteArrayToHexString(bytes)); } Modified: branches/generics-cleanup/src/main/java/org/openfast/debug/BasicEncodeTrace.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/debug/BasicEncodeTrace.java 2013-03-11 16:57:11 UTC (rev 306) +++ branches/generics-cleanup/src/main/java/org/openfast/debug/BasicEncodeTrace.java 2013-05-01 11:06:58 UTC (rev 307) @@ -32,28 +32,32 @@ public class BasicEncodeTrace implements Trace { - private Stack<TraceGroup> stack = new Stack<TraceGroup>(); + private Stack<TraceGroup> stack = new Stack<>(); private PrintWriter out = new PrintWriter(System.out); - public void groupStart(Group group) { + @Override + public void groupStart(Group group) { TraceGroup traceGroup = new TraceGroup(group); if (!stack.isEmpty()) stack.peek().addGroup(traceGroup); stack.push(traceGroup); } - public void field(Field field, FieldValue value, FieldValue encoded, byte[] encoding, int pmapIndex) { + @Override + public void field(Field field, FieldValue value, FieldValue encoded, byte[] encoding, int pmapIndex) { stack.peek().addField(field, value, encoded, pmapIndex, encoding); } - public void groupEnd() { + @Override + public void groupEnd() { TraceGroup group = (TraceGroup) stack.pop(); if (stack.isEmpty()) { out.println(group); } } - public void pmap(byte[] pmap) { + @Override + public void pmap(byte[] pmap) { stack.peek().setPmap(pmap); } @@ -67,7 +71,7 @@ public TraceGroup(Group group) { this.group = group; - this.nodes = new ArrayList<TraceNode>(group.getFieldCount()); + this.nodes = new ArrayList<>(group.getFieldCount()); } public void setPmap(byte[] pmap) { @@ -82,19 +86,21 @@ nodes.add(traceGroup); } - public StringBuilder serialize(StringBuilder builder, int indent) { - builder.append(indent(indent)).append(group.getName()).append("\n"); - indent += 2; + @Override + public StringBuilder serialize(StringBuilder builder, int indent) { + builder.append(indent(indent)).append(group.getName()).append("\n"); + int indentValue = indent + 2; if (pmap != null) - builder.append(indent(indent)).append("PMAP: ").append(ByteUtil.convertByteArrayToBitString(pmap)).append("\n"); + builder.append(indent(indentValue)).append("PMAP: ").append(ByteUtil.convertByteArrayToBitString(pmap)).append("\n"); for (int i = 0; i < nodes.size(); ++i) { - nodes.get(i).serialize(builder, indent); + nodes.get(i).serialize(builder, indentValue); } - indent -= 2; + indentValue -= 2; return builder; } - public String toString() { + @Override + public String toString() { return serialize(new StringBuilder(), 0).toString(); } } @@ -118,7 +124,8 @@ this.encoding = encoding; } - public StringBuilder serialize(StringBuilder builder, int indent) { + @Override + public StringBuilder serialize(StringBuilder builder, int indent) { builder.append(indent(indent)); builder.append(field.getName()).append("["); if (field.usesPresenceMapBit()) Modified: branches/generics-cleanup/src/main/java/org/openfast/error/ErrorCode.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/error/ErrorCode.java 2013-03-11 16:57:11 UTC (rev 306) +++ branches/generics-cleanup/src/main/java/org/openfast/error/ErrorCode.java 2013-05-01 11:06:58 UTC (rev 307) @@ -25,7 +25,7 @@ import org.openfast.Message; public class ErrorCode { - private static final Map<Integer, ErrorCode> ALERT_CODES = new HashMap<Integer, ErrorCode>(); + private static final Map<Integer, ErrorCode> ALERT_CODES = new HashMap<>(); private final int code; private final String shortName; private final String description; @@ -69,11 +69,13 @@ return type; } - public String toString() { + @Override + public String toString() { return shortName + ": " + description; } - public boolean equals(Object obj) { + @Override + public boolean equals(Object obj) { if (obj == this) return true; if (obj == null || !(obj instanceof ErrorCode)) Modified: branches/generics-cleanup/src/main/java/org/openfast/error/ErrorHandler.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/error/ErrorHandler.java 2013-03-11 16:57:11 UTC (rev 306) +++ branches/generics-cleanup/src/main/java/org/openfast/error/ErrorHandler.java 2013-05-01 11:06:58 UTC (rev 307) @@ -22,20 +22,24 @@ public interface ErrorHandler { public static final ErrorHandler DEFAULT = new ErrorHandler() { - public void error(ErrorCode code, String message) { + @Override + public void error(ErrorCode code, String message) { code.throwException(message); } - public void error(ErrorCode code, String message, Throwable t) { + @Override + public void error(ErrorCode code, String message, Throwable t) { throw new FastException(message, code, t); } }; public static final ErrorHandler NULL = new ErrorHandler() { - public void error(ErrorCode code, String message) { + @Override + public void error(ErrorCode code, String message) { } - public void error(ErrorCode code, String message, Throwable t) { + @Override + public void error(ErrorCode code, String message, Throwable t) { } }; Modified: branches/generics-cleanup/src/main/java/org/openfast/error/FastConstants.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/error/FastConstants.java 2013-03-11 16:57:11 UTC (rev 306) +++ branches/generics-cleanup/src/main/java/org/openfast/error/FastConstants.java 2013-05-01 11:06:58 UTC (rev 307) @@ -75,14 +75,16 @@ QName LENGTH_NS_ATTR = new QName("namespace", TEMPLATE_DEFINITION_1_1); QName LENGTH_ID_ATTR = new QName("id", TEMPLATE_DEFINITION_1_1); ErrorHandler BASIC_ERROR_HANDLER = new ErrorHandler() { - public void error(ErrorCode code, String message) { + @Override + public void error(ErrorCode code, String message) { if (REPORTABLE.equals(code.getType())) System.out.println("WARNING: " + message); else code.thro... [truncated message content] |
From: <ope...@li...> - 2013-03-11 16:57:19
|
Revision: 306 http://openfast.svn.sourceforge.net/openfast/?rev=306&view=rev Author: jacob_northey Date: 2013-03-11 16:57:11 +0000 (Mon, 11 Mar 2013) Log Message: ----------- Fixed the powered by logo Modified Paths: -------------- trunk/src/site/site.xml Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2013-03-11 16:42:49 UTC (rev 305) +++ trunk/src/site/site.xml 2013-03-11 16:57:11 UTC (rev 306) @@ -46,7 +46,7 @@ <version>1.0.1</version> </skin> <poweredBy> + <logo name="Maven" href="http://maven.apache.org/" img="http://maven.apache.org/images/logos/maven-feather.png"/> <logo name="SourceForge" href="http://sourceforge.net" img="http://sflogo.sourceforge.net/sflogo.php?group_id=198357&type=1"/> - <logo name="Maven" href="http://maven.apache.org/" img="images/logos/build-by-maven-white.png"/> </poweredBy> </project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ope...@li...> - 2013-03-11 16:42:58
|
Revision: 305 http://openfast.svn.sourceforge.net/openfast/?rev=305&view=rev Author: jacob_northey Date: 2013-03-11 16:42:49 +0000 (Mon, 11 Mar 2013) Log Message: ----------- Modified Paths: -------------- trunk/src/site/site.xml Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2013-03-11 16:31:41 UTC (rev 304) +++ trunk/src/site/site.xml 2013-03-11 16:42:49 UTC (rev 305) @@ -18,7 +18,7 @@ </links> <menu name="OpenFAST"> - <item name="Download" href="http://sourceforge.net/project/showfiles.php?group_id=198357&package_id=240515"/> + <item name="Download" href="https://sourceforge.net/projects/openfast/files/openfast4j/"/> <item name="License" href="license.html"/> </menu> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ope...@li...> - 2013-03-11 16:31:48
|
Revision: 304 http://openfast.svn.sourceforge.net/openfast/?rev=304&view=rev Author: jacob_northey Date: 2013-03-11 16:31:41 +0000 (Mon, 11 Mar 2013) Log Message: ----------- [maven-release-plugin] prepare for next development iteration Modified Paths: -------------- trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-11 16:31:38 UTC (rev 303) +++ trunk/pom.xml 2013-03-11 16:31:41 UTC (rev 304) @@ -3,7 +3,7 @@ <groupId>org.openfast</groupId> <artifactId>openfast</artifactId> <packaging>jar</packaging> - <version>1.1.2</version> + <version>1.2.0-SNAPSHOT</version> <organization> <name>The LaSalle Technology Group, LLC</name> @@ -71,9 +71,9 @@ </issueManagement> <scm> - <connection>scm:svn:https://openfast.svn.sourceforge.net/svnroot/openfast/tags/openfast-1.1.2</connection> - <developerConnection>scm:svn:https://openfast.svn.sourceforge.net/svnroot/openfast/tags/openfast-1.1.2</developerConnection> - <url>http://openfast.svn.sourceforge.net/viewvc/openfast/tags/openfast-1.1.2</url> + <connection>scm:svn:https://openfast.svn.sourceforge.net/svnroot/openfast/trunk</connection> + <developerConnection>scm:svn:https://openfast.svn.sourceforge.net/svnroot/openfast/trunk</developerConnection> + <url>http://openfast.svn.sourceforge.net/viewvc/openfast/trunk</url> </scm> <mailingLists> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ope...@li...> - 2013-03-11 16:31:45
|
Revision: 303 http://openfast.svn.sourceforge.net/openfast/?rev=303&view=rev Author: jacob_northey Date: 2013-03-11 16:31:38 +0000 (Mon, 11 Mar 2013) Log Message: ----------- [maven-release-plugin] copy for tag openfast-1.1.2 Added Paths: ----------- tags/openfast-1.1.2/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ope...@li...> - 2013-03-11 16:31:40
|
Revision: 302 http://openfast.svn.sourceforge.net/openfast/?rev=302&view=rev Author: jacob_northey Date: 2013-03-11 16:31:33 +0000 (Mon, 11 Mar 2013) Log Message: ----------- [maven-release-plugin] prepare release openfast-1.1.2 Modified Paths: -------------- trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-11 16:30:50 UTC (rev 301) +++ trunk/pom.xml 2013-03-11 16:31:33 UTC (rev 302) @@ -3,7 +3,7 @@ <groupId>org.openfast</groupId> <artifactId>openfast</artifactId> <packaging>jar</packaging> - <version>1.2.0-SNAPSHOT</version> + <version>1.1.2</version> <organization> <name>The LaSalle Technology Group, LLC</name> @@ -71,9 +71,9 @@ </issueManagement> <scm> - <connection>scm:svn:https://openfast.svn.sourceforge.net/svnroot/openfast/trunk</connection> - <developerConnection>scm:svn:https://openfast.svn.sourceforge.net/svnroot/openfast/trunk</developerConnection> - <url>http://openfast.svn.sourceforge.net/viewvc/openfast/trunk</url> + <connection>scm:svn:https://openfast.svn.sourceforge.net/svnroot/openfast/tags/openfast-1.1.2</connection> + <developerConnection>scm:svn:https://openfast.svn.sourceforge.net/svnroot/openfast/tags/openfast-1.1.2</developerConnection> + <url>http://openfast.svn.sourceforge.net/viewvc/openfast/tags/openfast-1.1.2</url> </scm> <mailingLists> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ope...@li...> - 2013-03-11 16:30:57
|
Revision: 301 http://openfast.svn.sourceforge.net/openfast/?rev=301&view=rev Author: jacob_northey Date: 2013-03-11 16:30:50 +0000 (Mon, 11 Mar 2013) Log Message: ----------- [FAST-46] Added javadoc generation to site-deploy; Added information on releasing next version to README; Added disclaimer to main page on using 1.1.1 or 1.1.2 Modified Paths: -------------- trunk/README trunk/pom.xml trunk/src/site/xdoc/index.xml.vm Modified: trunk/README =================================================================== --- trunk/README 2013-03-05 14:55:15 UTC (rev 300) +++ trunk/README 2013-03-11 16:30:50 UTC (rev 301) @@ -26,4 +26,13 @@ SourceForge has new restricted shell access. To release or deploy OpenFAST, use the following steps: For more information see http://maven.apache.org/plugins/maven-site-plugin-3.0-beta-3/examples/site-deploy-to-sourceforge.net.html 1. ssh -t jac...@sh... create - 2. mvn deploy \ No newline at end of file + 2. mvn deploy + +Releasing +========= + 1. Check that you can successfully deploy OpenFAST by following the steps in the [Deploying] section. + 2. Make sure all local changes are checked in. + 3. Run the release:prepare goal and follow the steps to set the release version. + > mvn release:prepare + 4. Run the release:perform goal to finalize the release. + 5. Check http://www.openfast.org to verify that the new version information is on the website. \ No newline at end of file Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-05 14:55:15 UTC (rev 300) +++ trunk/pom.xml 2013-03-11 16:30:50 UTC (rev 301) @@ -224,6 +224,20 @@ <scope>test</scope> </dependency> </dependencies> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <links> + <link>http://commons.apache.org/lang/api</link> + <link>http://java.sun.com/j2se/1.5.0/docs/api</link> + </links> + </configuration> + </plugin> + </plugins> + </reporting> <distributionManagement> <repository> Modified: trunk/src/site/xdoc/index.xml.vm =================================================================== --- trunk/src/site/xdoc/index.xml.vm 2013-03-05 14:55:15 UTC (rev 300) +++ trunk/src/site/xdoc/index.xml.vm 2013-03-11 16:30:50 UTC (rev 301) @@ -27,6 +27,13 @@ </ul> </div> <section name="OpenFAST"> + <subsection name="Implementation Details"> + <b>IMPORTANT:</b> + <ul> + <li>OpenFAST 1.1.1: the <a href="apidocs/org/openfast/MessageInputStream.html#readMessage()">MessageInputStream.readMessage()</a> method will throw a <a href="apidocs/org/openfast/error/FastException.html">FastException</a> when the end of the stream is encountered.</li> + <li>OpenFAST 1.1.2: the <a href="apidocs/org/openfast/MessageInputStream.html#readMessage()">MessageInputStream.readMessage()</a> method will throw a <a href="apidocs/org/openfast/error/FastException.html">FastException</a> when the end of the stream is encountered in the middle of decoding a message. If the end of the stream is encountered immediately after reading a full message, null is returned.</li> + </ul> + </subsection> <subsection name="What is OpenFAST?"> OpenFAST is a 100% Java implementation of the FAST Protocol (FIX Adapted for STreaming). The FAST protocol is used to optimize communications in the electronic exchange of financial data. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ope...@li...> - 2013-03-05 14:55:30
|
Revision: 300 http://openfast.svn.sourceforge.net/openfast/?rev=300&view=rev Author: jacob_northey Date: 2013-03-05 14:55:15 +0000 (Tue, 05 Mar 2013) Log Message: ----------- [FAST-46] Updated MessageInputStream to throw an exception only when a partial message is encountered. If no more messages are in the stream, a null value is returned similar to how 1.1.1 worked [FAST-43] Modified Paths: -------------- trunk/src/main/java/org/openfast/MessageInputStream.java trunk/src/main/java/org/openfast/template/type/codec/BitVectorType.java trunk/src/test/java/org/openfast/MessageInputStreamTest.java trunk/src/test/java/org/openfast/codec/FastDecoderTest.java trunk/src/test/java/org/openfast/submitted/OpraFeedTest.java Modified: trunk/src/main/java/org/openfast/MessageInputStream.java =================================================================== --- trunk/src/main/java/org/openfast/MessageInputStream.java 2012-08-08 22:50:47 UTC (rev 299) +++ trunk/src/main/java/org/openfast/MessageInputStream.java 2013-03-05 14:55:15 UTC (rev 300) @@ -35,9 +35,9 @@ import org.openfast.template.TemplateRegistry; public class MessageInputStream implements MessageStream { - private InputStream in; - private FastDecoder decoder; - private Context context; + private final InputStream in; + private final FastDecoder decoder; + private final Context context; private Map templateHandlers = Collections.EMPTY_MAP; private List handlers = Collections.EMPTY_LIST; private MessageBlockReader blockReader = MessageBlockReader.NULL; @@ -53,8 +53,13 @@ } /** - * @throws java.io.EOFException - * @return the next message in the stream + * Decodes the next message in the input stream if a message is found. If no more + * messages are present in the stream, <code>null</code> is returned. If a partial + * message is encountered a {@link org.openfast.error.FastException FastException} with error code 104 + * is thrown (see {@link org.openfast.error.FastConstants#END_OF_STREAM FastConstants.END_OF_STREAM}). + * + * @throws org.openfast.error.FastException + * @return the next message in the stream or <code>null</code> if no more messages are encountered in the stream */ public Message readMessage() { if (context.isTraceEnabled()) Modified: trunk/src/main/java/org/openfast/template/type/codec/BitVectorType.java =================================================================== --- trunk/src/main/java/org/openfast/template/type/codec/BitVectorType.java 2012-08-08 22:50:47 UTC (rev 299) +++ trunk/src/main/java/org/openfast/template/type/codec/BitVectorType.java 2013-03-05 14:55:15 UTC (rev 300) @@ -45,6 +45,7 @@ * The ScalarValue to be encoded * @return Returns a byte array of the passed object */ + @Override public byte[] encodeValue(ScalarValue value) { return ((BitVectorValue) value).value.getBytes(); } @@ -56,6 +57,7 @@ * The InputStream to be decoded * @return Returns a new BitVector object with the data stream as an array */ + @Override public ScalarValue decode(InputStream in) { int byt; ByteArrayOutputStream buffer = Global.getBuffer(); @@ -63,6 +65,10 @@ try { byt = in.read(); if (byt < 0) { + if (buffer.size() == 0) { + // No more bytes encountered, assume this is the end of the message stream. + return null; + } Global.handleError(FastConstants.END_OF_STREAM, "The end of the input stream has been reached."); return null; // short circuit if global error handler does not throw exception } @@ -91,6 +97,7 @@ return new BitVectorValue(new BitVector(0)); } + @Override public boolean equals(Object obj) { return obj != null && obj.getClass() == getClass(); } Modified: trunk/src/test/java/org/openfast/MessageInputStreamTest.java =================================================================== --- trunk/src/test/java/org/openfast/MessageInputStreamTest.java 2012-08-08 22:50:47 UTC (rev 299) +++ trunk/src/test/java/org/openfast/MessageInputStreamTest.java 2013-03-05 14:55:15 UTC (rev 300) @@ -2,18 +2,57 @@ import org.openfast.error.FastConstants; import org.openfast.error.FastException; +import org.openfast.template.Field; +import org.openfast.template.MessageTemplate; +import org.openfast.template.Scalar; +import org.openfast.template.operator.Operator; +import org.openfast.template.type.Type; import org.openfast.test.OpenFastTestCase; public class MessageInputStreamTest extends OpenFastTestCase { - public void testReadMessage() { - MessageInputStream in = new MessageInputStream(bitStream("11000000 10000100")); - try { - in.readMessage(); - fail(); - } catch (FastException e) { - assertEquals(FastConstants.D9_TEMPLATE_NOT_REGISTERED, e.getCode()); - } - } + private final MessageTemplate template = new MessageTemplate("Simple", new Field[] { new Scalar("field", Type.ASCII, Operator.NONE, null, false)}); + public void testReadMessage() { + MessageInputStream in = new MessageInputStream(bitStream("11000000 10000100")); + try { + in.readMessage(); + fail(); + } catch (FastException e) { + assertEquals(FastConstants.D9_TEMPLATE_NOT_REGISTERED, e.getCode()); + } + } + + public void testReadEOFReturnsNullWhenNoMoreMessagesInStream() { + MessageInputStream in = new MessageInputStream(bitStream("11000000 10000001 10000000")); + in.registerTemplate(1, template); + Message msg = in.readMessage(); + assertNotNull(msg); + Message msg2 = in.readMessage(); + assertNull(msg2); + } + + public void testReadThrowsExceptionWhenPartialMessageInStream() { + MessageInputStream in = new MessageInputStream(bitStream("11000000 10000001 10000000 10000000")); + in.registerTemplate(1, template); + assertEOF(in); + } + + public void testReadThrowsExceptionWhenPartialMessageInStreamPartialAscii() { + MessageInputStream in = new MessageInputStream(bitStream("11000000 10000001 10000000 10000000 00000001")); + in.registerTemplate(1, template); + assertEOF(in); + } + + private void assertEOF(MessageInputStream in) { + Message msg = in.readMessage(); + assertNotNull(msg); + try { + in.readMessage(); + fail("A FastException with END_OF_STREAM error code should have been thrown."); + } catch (FastException e) { + assertEquals(FastConstants.END_OF_STREAM, e.getCode()); + } + } + } Modified: trunk/src/test/java/org/openfast/codec/FastDecoderTest.java =================================================================== --- trunk/src/test/java/org/openfast/codec/FastDecoderTest.java 2012-08-08 22:50:47 UTC (rev 299) +++ trunk/src/test/java/org/openfast/codec/FastDecoderTest.java 2013-03-05 14:55:15 UTC (rev 300) @@ -21,7 +21,6 @@ package org.openfast.codec; -import java.io.IOException; import java.io.InputStream; import junit.framework.TestCase; @@ -33,7 +32,6 @@ import org.openfast.Message; import org.openfast.ScalarValue; import org.openfast.StringValue; -import org.openfast.error.FastException; import org.openfast.template.Field; import org.openfast.template.MessageTemplate; import org.openfast.template.Scalar; @@ -260,17 +258,4 @@ readMessage = decoder.readMessage(); assertEquals(message, readMessage); } - - public void testDecodeEndOfStream() { - FastDecoder decoder = new FastDecoder(new Context(), new InputStream() { - public int read() throws IOException { - return -1; - } - }); - try { - decoder.readMessage(); - fail("The decoder should have thrown a FAST Exception."); - } catch (FastException e) { - } - } } Modified: trunk/src/test/java/org/openfast/submitted/OpraFeedTest.java =================================================================== --- trunk/src/test/java/org/openfast/submitted/OpraFeedTest.java 2012-08-08 22:50:47 UTC (rev 299) +++ trunk/src/test/java/org/openfast/submitted/OpraFeedTest.java 2013-03-05 14:55:15 UTC (rev 300) @@ -58,8 +58,10 @@ public void messageRead(InputStream in, Message message) { } } + + public void testEmpty() {} - public void testReadFeed() { + public void IGNOREtestReadFeed() { XMLMessageTemplateLoader loader = new XMLMessageTemplateLoader(); loader.load(resource("OPRA/OPRATemplate.xml")); loader.getTemplateRegistry().register(0, "OPRA"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ope...@li...> - 2012-08-08 22:50:53
|
Revision: 299 http://openfast.svn.sourceforge.net/openfast/?rev=299&view=rev Author: joshseidel Date: 2012-08-08 22:50:47 +0000 (Wed, 08 Aug 2012) Log Message: ----------- Update the project file in the branch for integration check. Property Changed: ---------------- branches/generics-cleanup/ Property changes on: branches/generics-cleanup ___________________________________________________________________ Modified: svn:mergeinfo - /trunk:267-297 + /trunk:267-298 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ope...@li...> - 2012-08-02 13:31:53
|
Revision: 298 http://openfast.svn.sourceforge.net/openfast/?rev=298&view=rev Author: joshseidel Date: 2012-08-02 13:31:42 +0000 (Thu, 02 Aug 2012) Log Message: ----------- Update the project for merge. Property Changed: ---------------- branches/generics-cleanup/ Property changes on: branches/generics-cleanup ___________________________________________________________________ Modified: svn:mergeinfo - /trunk:267-296 + /trunk:267-297 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ope...@li...> - 2012-07-31 14:40:27
|
Revision: 297 http://openfast.svn.sourceforge.net/openfast/?rev=297&view=rev Author: joshseidel Date: 2012-07-31 14:40:16 +0000 (Tue, 31 Jul 2012) Log Message: ----------- Update branch to reflect ComposedDecimalParser changes in trunk. Modified Paths: -------------- branches/generics-cleanup/src/main/java/org/openfast/template/loader/ComposedDecimalParser.java branches/generics-cleanup/src/test/java/org/openfast/template/loader/ComposedDecimalParserTest.java Property Changed: ---------------- branches/generics-cleanup/ Property changes on: branches/generics-cleanup ___________________________________________________________________ Modified: svn:mergeinfo - /trunk:267-291 + /trunk:267-296 Modified: branches/generics-cleanup/src/main/java/org/openfast/template/loader/ComposedDecimalParser.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/loader/ComposedDecimalParser.java 2012-05-14 12:29:26 UTC (rev 296) +++ branches/generics-cleanup/src/main/java/org/openfast/template/loader/ComposedDecimalParser.java 2012-07-31 14:40:16 UTC (rev 297) @@ -95,27 +95,31 @@ String exponentNamespace = context.getNamespace(); if ((mantissaNode != null) && mantissaNode.hasChildNodes()) { Element operatorElement = getElement((Element) mantissaNode, 1); - mantissaOperator = operatorElement.getNodeName(); - if (operatorElement.hasAttribute("value")) - mantissaDefaultValue = Type.I64.getValue(operatorElement.getAttribute("value")); - if (operatorElement.hasAttribute("ns")) - mantissaNamespace = operatorElement.getAttribute("ns"); - if (operatorElement.hasAttribute("key")) - mantissaKey = new QName(operatorElement.getAttribute("key"), mantissaNamespace); - if (operatorElement.hasAttribute("dictionary")) - mantissaDictionary = operatorElement.getAttribute("dictionary"); + if (operatorElement != null) { + mantissaOperator = operatorElement.getNodeName(); + if (operatorElement.hasAttribute("value")) + mantissaDefaultValue = Type.I64.getValue(operatorElement.getAttribute("value")); + if (operatorElement.hasAttribute("ns")) + mantissaNamespace = operatorElement.getAttribute("ns"); + if (operatorElement.hasAttribute("key")) + mantissaKey = new QName(operatorElement.getAttribute("key"), mantissaNamespace); + if (operatorElement.hasAttribute("dictionary")) + mantissaDictionary = operatorElement.getAttribute("dictionary"); + } } if ((exponentNode != null) && exponentNode.hasChildNodes()) { Element operatorElement = getElement((Element) exponentNode, 1); - exponentOperator = operatorElement.getNodeName(); - if (operatorElement.hasAttribute("value")) - exponentDefaultValue = Type.I32.getValue(operatorElement.getAttribute("value")); - if (operatorElement.hasAttribute("ns")) - exponentNamespace = operatorElement.getAttribute("ns"); - if (operatorElement.hasAttribute("key")) - exponentKey = new QName(operatorElement.getAttribute("key"), exponentNamespace); - if (operatorElement.hasAttribute("dictionary")) - exponentDictionary = operatorElement.getAttribute("dictionary"); + if (operatorElement != null) { + exponentOperator = operatorElement.getNodeName(); + if (operatorElement.hasAttribute("value")) + exponentDefaultValue = Type.I32.getValue(operatorElement.getAttribute("value")); + if (operatorElement.hasAttribute("ns")) + exponentNamespace = operatorElement.getAttribute("ns"); + if (operatorElement.hasAttribute("key")) + exponentKey = new QName(operatorElement.getAttribute("key"), exponentNamespace); + if (operatorElement.hasAttribute("dictionary")) + exponentDictionary = operatorElement.getAttribute("dictionary"); + } } ComposedScalar scalar = Util.composedDecimal(name, Operator.getOperator(exponentOperator), exponentDefaultValue, Operator .getOperator(mantissaOperator), mantissaDefaultValue, optional); Modified: branches/generics-cleanup/src/test/java/org/openfast/template/loader/ComposedDecimalParserTest.java =================================================================== --- branches/generics-cleanup/src/test/java/org/openfast/template/loader/ComposedDecimalParserTest.java 2012-05-14 12:29:26 UTC (rev 296) +++ branches/generics-cleanup/src/test/java/org/openfast/template/loader/ComposedDecimalParserTest.java 2012-07-31 14:40:16 UTC (rev 297) @@ -12,45 +12,67 @@ public class ComposedDecimalParserTest extends OpenFastTestCase { - private FieldParser parser; - private ParsingContext context; + private FieldParser parser; + private ParsingContext context; - protected void setUp() throws Exception { - parser = new ComposedDecimalParser(); - context = XMLMessageTemplateLoader.createInitialContext(); - } - - public void testParse() throws Exception { - Element decimalDef = document("<decimal name=\"composed\"><mantissa><delta/></mantissa><exponent><constant value=\"-2\"/></exponent></decimal>").getDocumentElement(); - assertTrue(parser.canParse(decimalDef, context)); - ComposedScalar decimal = (ComposedScalar) parser.parse(decimalDef, context); - assertComposedScalarField(decimal, Type.DECIMAL, "composed", Operator.CONSTANT, new IntegerValue(-2), Operator.DELTA, ScalarValue.UNDEFINED); - } + protected void setUp() throws Exception { + parser = new ComposedDecimalParser(); + context = XMLMessageTemplateLoader.createInitialContext(); + } - public void testInheritDictionary() throws Exception { - Element decimalDef = document("<decimal name=\"composed\"><mantissa><delta/></mantissa><exponent><constant value=\"-2\"/></exponent></decimal>").getDocumentElement(); - context.setDictionary("template"); - assertTrue(parser.canParse(decimalDef, context)); - ComposedScalar decimal = (ComposedScalar) parser.parse(decimalDef, context); - assertComposedScalarField(decimal, Type.DECIMAL, "composed", Operator.CONSTANT, new IntegerValue(-2), Operator.DELTA, ScalarValue.UNDEFINED); - assertEquals("template", decimal.getFields()[0].getDictionary()); - assertEquals("template", decimal.getFields()[1].getDictionary()); - } - - public void testFullyDefinedOperators() throws Exception { - Element decimalDef = document("<decimal name=\"composed\"><mantissa><delta dictionary=\"template\" key=\"variable\" value=\"100\"/></mantissa><exponent><copy dictionary=\"template\" key=\"static\" value=\"-2\"/></exponent></decimal>").getDocumentElement(); - assertTrue(parser.canParse(decimalDef, context)); - ComposedScalar decimal = (ComposedScalar) parser.parse(decimalDef, context); + public void testParse() throws Exception { + Element decimalDef = document( + "<decimal name=\"composed\"><mantissa><delta/></mantissa><exponent><constant value=\"-2\"/></exponent></decimal>") + .getDocumentElement(); + assertTrue(parser.canParse(decimalDef, context)); + ComposedScalar decimal = (ComposedScalar) parser.parse(decimalDef, context); + assertComposedScalarField(decimal, Type.DECIMAL, "composed", Operator.CONSTANT, new IntegerValue(-2), Operator.DELTA, + ScalarValue.UNDEFINED); + } + + public void testParseEmptyMantissaAndExponent() throws Exception { - assertComposedScalarField(decimal, Type.DECIMAL, "composed", Operator.COPY, new IntegerValue(-2), Operator.DELTA, new IntegerValue(100)); - - Scalar exponent = decimal.getFields()[0]; - Scalar mantissa = decimal.getFields()[1]; - - assertEquals("template", exponent.getDictionary()); - assertEquals(new QName("static"), exponent.getKey()); - - assertEquals("template", exponent.getDictionary()); - assertEquals(new QName("variable"), mantissa.getKey()); - } + Element decimalDef = document( + "<decimal name=\"composed\"><mantissa> </mantissa><exponent> </exponent></decimal>") + .getDocumentElement(); + assertTrue(parser.canParse(decimalDef, context)); + ComposedScalar decimal = (ComposedScalar) parser.parse(decimalDef, context); + assertComposedScalarField(decimal, Type.DECIMAL, "composed", Operator.NONE, ScalarValue.UNDEFINED, Operator.NONE, + ScalarValue.UNDEFINED); + } + + public void testInheritDictionary() throws Exception { + Element decimalDef = document( + "<decimal name=\"composed\"><mantissa><delta/></mantissa><exponent><constant value=\"-2\"/></exponent></decimal>") + .getDocumentElement(); + context.setDictionary("template"); + assertTrue(parser.canParse(decimalDef, context)); + ComposedScalar decimal = (ComposedScalar) parser.parse(decimalDef, context); + assertComposedScalarField(decimal, Type.DECIMAL, "composed", Operator.CONSTANT, new IntegerValue(-2), Operator.DELTA, + ScalarValue.UNDEFINED); + assertEquals("template", decimal.getFields()[0].getDictionary()); + assertEquals("template", decimal.getFields()[1].getDictionary()); + } + + public void testFullyDefinedOperators() throws Exception { + Element decimalDef = document( + "<decimal name=\"composed\"><mantissa><delta dictionary=\"template\" key=\"variable\" value=\"100\"/></mantissa><exponent><copy dictionary=\"template\" key=\"static\" value=\"-2\"/></exponent></decimal>") + .getDocumentElement(); + assertTrue(parser.canParse(decimalDef, context)); + ComposedScalar decimal = (ComposedScalar) parser.parse(decimalDef, context); + + assertComposedScalarField(decimal, Type.DECIMAL, "composed", Operator.COPY, new IntegerValue(-2), Operator.DELTA, + new IntegerValue(100)); + + Scalar[] decimalFields = decimal.getFields(); + Scalar exponent = decimalFields[0]; + Scalar mantissa = decimalFields[1]; + + String exponentDictionary = exponent.getDictionary(); + assertEquals("template", exponentDictionary); + assertEquals(new QName("static"), exponent.getKey()); + + assertEquals("template", exponentDictionary); + assertEquals(new QName("variable"), mantissa.getKey()); + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ope...@li...> - 2012-05-14 12:29:36
|
Revision: 296 http://openfast.svn.sourceforge.net/openfast/?rev=296&view=rev Author: jacob_northey Date: 2012-05-14 12:29:26 +0000 (Mon, 14 May 2012) Log Message: ----------- [maven-release-plugin] prepare for next development iteration Modified Paths: -------------- trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-14 12:29:20 UTC (rev 295) +++ trunk/pom.xml 2012-05-14 12:29:26 UTC (rev 296) @@ -3,7 +3,7 @@ <groupId>org.openfast</groupId> <artifactId>openfast</artifactId> <packaging>jar</packaging> - <version>1.1.1</version> + <version>1.2.0-SNAPSHOT</version> <organization> <name>The LaSalle Technology Group, LLC</name> @@ -71,9 +71,9 @@ </issueManagement> <scm> - <connection>scm:svn:https://openfast.svn.sourceforge.net/svnroot/openfast/tags/openfast-1.1.1</connection> - <developerConnection>scm:svn:https://openfast.svn.sourceforge.net/svnroot/openfast/tags/openfast-1.1.1</developerConnection> - <url>http://openfast.svn.sourceforge.net/viewvc/openfast/tags/openfast-1.1.1</url> + <connection>scm:svn:https://openfast.svn.sourceforge.net/svnroot/openfast/trunk</connection> + <developerConnection>scm:svn:https://openfast.svn.sourceforge.net/svnroot/openfast/trunk</developerConnection> + <url>http://openfast.svn.sourceforge.net/viewvc/openfast/trunk</url> </scm> <mailingLists> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ope...@li...> - 2012-05-14 12:29:26
|
Revision: 295 http://openfast.svn.sourceforge.net/openfast/?rev=295&view=rev Author: jacob_northey Date: 2012-05-14 12:29:20 +0000 (Mon, 14 May 2012) Log Message: ----------- [maven-release-plugin] copy for tag openfast-1.1.1 Added Paths: ----------- tags/openfast-1.1.1/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ope...@li...> - 2012-05-14 12:29:20
|
Revision: 294 http://openfast.svn.sourceforge.net/openfast/?rev=294&view=rev Author: jacob_northey Date: 2012-05-14 12:29:14 +0000 (Mon, 14 May 2012) Log Message: ----------- [maven-release-plugin] prepare release openfast-1.1.1 Modified Paths: -------------- trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-14 12:17:23 UTC (rev 293) +++ trunk/pom.xml 2012-05-14 12:29:14 UTC (rev 294) @@ -3,7 +3,7 @@ <groupId>org.openfast</groupId> <artifactId>openfast</artifactId> <packaging>jar</packaging> - <version>1.2.0-SNAPSHOT</version> + <version>1.1.1</version> <organization> <name>The LaSalle Technology Group, LLC</name> @@ -71,9 +71,9 @@ </issueManagement> <scm> - <connection>scm:svn:https://openfast.svn.sourceforge.net/svnroot/openfast/trunk</connection> - <developerConnection>scm:svn:https://openfast.svn.sourceforge.net/svnroot/openfast/trunk</developerConnection> - <url>http://openfast.svn.sourceforge.net/viewvc/openfast/trunk</url> + <connection>scm:svn:https://openfast.svn.sourceforge.net/svnroot/openfast/tags/openfast-1.1.1</connection> + <developerConnection>scm:svn:https://openfast.svn.sourceforge.net/svnroot/openfast/tags/openfast-1.1.1</developerConnection> + <url>http://openfast.svn.sourceforge.net/viewvc/openfast/tags/openfast-1.1.1</url> </scm> <mailingLists> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ope...@li...> - 2012-05-14 12:17:34
|
Revision: 293 http://openfast.svn.sourceforge.net/openfast/?rev=293&view=rev Author: jacob_northey Date: 2012-05-14 12:17:23 +0000 (Mon, 14 May 2012) Log Message: ----------- [FAST-45] Added check for no operator element in mantissa and exponent elements Modified Paths: -------------- trunk/src/main/java/org/openfast/template/loader/ComposedDecimalParser.java trunk/src/test/java/org/openfast/template/loader/ComposedDecimalParserTest.java Modified: trunk/src/main/java/org/openfast/template/loader/ComposedDecimalParser.java =================================================================== --- trunk/src/main/java/org/openfast/template/loader/ComposedDecimalParser.java 2012-04-12 17:21:45 UTC (rev 292) +++ trunk/src/main/java/org/openfast/template/loader/ComposedDecimalParser.java 2012-05-14 12:17:23 UTC (rev 293) @@ -93,27 +93,31 @@ String exponentNamespace = context.getNamespace(); if ((mantissaNode != null) && mantissaNode.hasChildNodes()) { Element operatorElement = getElement((Element) mantissaNode, 1); - mantissaOperator = operatorElement.getNodeName(); - if (operatorElement.hasAttribute("value")) - mantissaDefaultValue = Type.I64.getValue(operatorElement.getAttribute("value")); - if (operatorElement.hasAttribute("ns")) - mantissaNamespace = operatorElement.getAttribute("ns"); - if (operatorElement.hasAttribute("key")) - mantissaKey = new QName(operatorElement.getAttribute("key"), mantissaNamespace); - if (operatorElement.hasAttribute("dictionary")) - mantissaDictionary = operatorElement.getAttribute("dictionary"); + if (operatorElement != null) { + mantissaOperator = operatorElement.getNodeName(); + if (operatorElement.hasAttribute("value")) + mantissaDefaultValue = Type.I64.getValue(operatorElement.getAttribute("value")); + if (operatorElement.hasAttribute("ns")) + mantissaNamespace = operatorElement.getAttribute("ns"); + if (operatorElement.hasAttribute("key")) + mantissaKey = new QName(operatorElement.getAttribute("key"), mantissaNamespace); + if (operatorElement.hasAttribute("dictionary")) + mantissaDictionary = operatorElement.getAttribute("dictionary"); + } } if ((exponentNode != null) && exponentNode.hasChildNodes()) { Element operatorElement = getElement((Element) exponentNode, 1); - exponentOperator = operatorElement.getNodeName(); - if (operatorElement.hasAttribute("value")) - exponentDefaultValue = Type.I32.getValue(operatorElement.getAttribute("value")); - if (operatorElement.hasAttribute("ns")) - exponentNamespace = operatorElement.getAttribute("ns"); - if (operatorElement.hasAttribute("key")) - exponentKey = new QName(operatorElement.getAttribute("key"), exponentNamespace); - if (operatorElement.hasAttribute("dictionary")) - exponentDictionary = operatorElement.getAttribute("dictionary"); + if (operatorElement != null) { + exponentOperator = operatorElement.getNodeName(); + if (operatorElement.hasAttribute("value")) + exponentDefaultValue = Type.I32.getValue(operatorElement.getAttribute("value")); + if (operatorElement.hasAttribute("ns")) + exponentNamespace = operatorElement.getAttribute("ns"); + if (operatorElement.hasAttribute("key")) + exponentKey = new QName(operatorElement.getAttribute("key"), exponentNamespace); + if (operatorElement.hasAttribute("dictionary")) + exponentDictionary = operatorElement.getAttribute("dictionary"); + } } ComposedScalar scalar = Util.composedDecimal(name, Operator.getOperator(exponentOperator), exponentDefaultValue, Operator .getOperator(mantissaOperator), mantissaDefaultValue, optional); Modified: trunk/src/test/java/org/openfast/template/loader/ComposedDecimalParserTest.java =================================================================== --- trunk/src/test/java/org/openfast/template/loader/ComposedDecimalParserTest.java 2012-04-12 17:21:45 UTC (rev 292) +++ trunk/src/test/java/org/openfast/template/loader/ComposedDecimalParserTest.java 2012-05-14 12:17:23 UTC (rev 293) @@ -12,45 +12,65 @@ public class ComposedDecimalParserTest extends OpenFastTestCase { - private FieldParser parser; - private ParsingContext context; + private FieldParser parser; + private ParsingContext context; - protected void setUp() throws Exception { - parser = new ComposedDecimalParser(); - context = XMLMessageTemplateLoader.createInitialContext(); - } - - public void testParse() throws Exception { - Element decimalDef = document("<decimal name=\"composed\"><mantissa><delta/></mantissa><exponent><constant value=\"-2\"/></exponent></decimal>").getDocumentElement(); - assertTrue(parser.canParse(decimalDef, context)); - ComposedScalar decimal = (ComposedScalar) parser.parse(decimalDef, context); - assertComposedScalarField(decimal, Type.DECIMAL, "composed", Operator.CONSTANT, new IntegerValue(-2), Operator.DELTA, ScalarValue.UNDEFINED); - } + protected void setUp() throws Exception { + parser = new ComposedDecimalParser(); + context = XMLMessageTemplateLoader.createInitialContext(); + } - public void testInheritDictionary() throws Exception { - Element decimalDef = document("<decimal name=\"composed\"><mantissa><delta/></mantissa><exponent><constant value=\"-2\"/></exponent></decimal>").getDocumentElement(); - context.setDictionary("template"); - assertTrue(parser.canParse(decimalDef, context)); - ComposedScalar decimal = (ComposedScalar) parser.parse(decimalDef, context); - assertComposedScalarField(decimal, Type.DECIMAL, "composed", Operator.CONSTANT, new IntegerValue(-2), Operator.DELTA, ScalarValue.UNDEFINED); - assertEquals("template", decimal.getFields()[0].getDictionary()); - assertEquals("template", decimal.getFields()[1].getDictionary()); - } - - public void testFullyDefinedOperators() throws Exception { - Element decimalDef = document("<decimal name=\"composed\"><mantissa><delta dictionary=\"template\" key=\"variable\" value=\"100\"/></mantissa><exponent><copy dictionary=\"template\" key=\"static\" value=\"-2\"/></exponent></decimal>").getDocumentElement(); - assertTrue(parser.canParse(decimalDef, context)); - ComposedScalar decimal = (ComposedScalar) parser.parse(decimalDef, context); + public void testParse() throws Exception { + Element decimalDef = document( + "<decimal name=\"composed\"><mantissa><delta/></mantissa><exponent><constant value=\"-2\"/></exponent></decimal>") + .getDocumentElement(); + assertTrue(parser.canParse(decimalDef, context)); + ComposedScalar decimal = (ComposedScalar) parser.parse(decimalDef, context); + assertComposedScalarField(decimal, Type.DECIMAL, "composed", Operator.CONSTANT, new IntegerValue(-2), Operator.DELTA, + ScalarValue.UNDEFINED); + } + + public void testParseEmptyMantissaAndExponent() throws Exception { - assertComposedScalarField(decimal, Type.DECIMAL, "composed", Operator.COPY, new IntegerValue(-2), Operator.DELTA, new IntegerValue(100)); - - Scalar exponent = decimal.getFields()[0]; - Scalar mantissa = decimal.getFields()[1]; - - assertEquals("template", exponent.getDictionary()); - assertEquals(new QName("static"), exponent.getKey()); - - assertEquals("template", exponent.getDictionary()); - assertEquals(new QName("variable"), mantissa.getKey()); - } + Element decimalDef = document( + "<decimal name=\"composed\"><mantissa> </mantissa><exponent> </exponent></decimal>") + .getDocumentElement(); + assertTrue(parser.canParse(decimalDef, context)); + ComposedScalar decimal = (ComposedScalar) parser.parse(decimalDef, context); + assertComposedScalarField(decimal, Type.DECIMAL, "composed", Operator.NONE, ScalarValue.UNDEFINED, Operator.NONE, + ScalarValue.UNDEFINED); + } + + public void testInheritDictionary() throws Exception { + Element decimalDef = document( + "<decimal name=\"composed\"><mantissa><delta/></mantissa><exponent><constant value=\"-2\"/></exponent></decimal>") + .getDocumentElement(); + context.setDictionary("template"); + assertTrue(parser.canParse(decimalDef, context)); + ComposedScalar decimal = (ComposedScalar) parser.parse(decimalDef, context); + assertComposedScalarField(decimal, Type.DECIMAL, "composed", Operator.CONSTANT, new IntegerValue(-2), Operator.DELTA, + ScalarValue.UNDEFINED); + assertEquals("template", decimal.getFields()[0].getDictionary()); + assertEquals("template", decimal.getFields()[1].getDictionary()); + } + + public void testFullyDefinedOperators() throws Exception { + Element decimalDef = document( + "<decimal name=\"composed\"><mantissa><delta dictionary=\"template\" key=\"variable\" value=\"100\"/></mantissa><exponent><copy dictionary=\"template\" key=\"static\" value=\"-2\"/></exponent></decimal>") + .getDocumentElement(); + assertTrue(parser.canParse(decimalDef, context)); + ComposedScalar decimal = (ComposedScalar) parser.parse(decimalDef, context); + + assertComposedScalarField(decimal, Type.DECIMAL, "composed", Operator.COPY, new IntegerValue(-2), Operator.DELTA, + new IntegerValue(100)); + + Scalar exponent = decimal.getFields()[0]; + Scalar mantissa = decimal.getFields()[1]; + + assertEquals("template", exponent.getDictionary()); + assertEquals(new QName("static"), exponent.getKey()); + + assertEquals("template", exponent.getDictionary()); + assertEquals(new QName("variable"), mantissa.getKey()); + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ope...@li...> - 2012-04-12 17:21:56
|
Revision: 292 http://openfast.svn.sourceforge.net/openfast/?rev=292&view=rev Author: joshseidel Date: 2012-04-12 17:21:45 +0000 (Thu, 12 Apr 2012) Log Message: ----------- Updated to the 1.1.0 trunk. Property Changed: ---------------- branches/generics-cleanup/ Property changes on: branches/generics-cleanup ___________________________________________________________________ Modified: svn:mergeinfo - /trunk:267-290 + /trunk:267-291 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ope...@li...> - 2012-04-12 17:20:45
|
Revision: 291 http://openfast.svn.sourceforge.net/openfast/?rev=291&view=rev Author: joshseidel Date: 2012-04-12 17:20:38 +0000 (Thu, 12 Apr 2012) Log Message: ----------- Update to trunk. Modified Paths: -------------- branches/generics-cleanup/README branches/generics-cleanup/pom.xml branches/generics-cleanup/src/main/java/org/openfast/codec/FastDecoder.java branches/generics-cleanup/src/main/java/org/openfast/session/multicast/MulticastEndpoint.java branches/generics-cleanup/src/main/java/org/openfast/session/multicast/MulticastInputStream.java branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/BitVectorType.java Property Changed: ---------------- branches/generics-cleanup/ branches/generics-cleanup/pom.xml Property changes on: branches/generics-cleanup ___________________________________________________________________ Modified: svn:mergeinfo - /trunk:267-274 + /trunk:267-290 Modified: branches/generics-cleanup/README =================================================================== --- branches/generics-cleanup/README 2012-04-11 19:51:39 UTC (rev 290) +++ branches/generics-cleanup/README 2012-04-12 17:20:38 UTC (rev 291) @@ -1,8 +1,29 @@ -OpenFAST uses the Maven2 build tool. Downloaded the latest version of Maven2 from http://maven.apache.org. +Building +======== + OpenFAST uses the Maven2 build tool. Downloaded the latest version of Maven2 from http://maven.apache.org. -To build OpenFAST using maven, enter from a command line: + To build OpenFAST using maven, enter from a command line: > mvn package - -To generate Eclipse .project and .classpath files so that OpenFAST can be imported into Eclipse: + +Eclipse +======= + To generate Eclipse .project and .classpath files so that OpenFAST can be imported into Eclipse: > mvn eclipse:eclipse - \ No newline at end of file + +Deploying +========= + To deploy to the OpenFAST maven repository complete the following steps: + 1. Contact project administrators to get shell access to the OpenFAST + 2. Add the following configuration to the M2 settings.xml file where [USERNAME] is an authorized user from step 1. + <server> + <id>sourceforge.net</id> + <username>[USERNAME],openfast</username> + <filePermissions>664</filePermissions> + <directoryPermissions>775</directoryPermissions> + <password>[PASSWORD]</password> + </server> + + SourceForge has new restricted shell access. To release or deploy OpenFAST, use the following steps: + For more information see http://maven.apache.org/plugins/maven-site-plugin-3.0-beta-3/examples/site-deploy-to-sourceforge.net.html + 1. ssh -t jac...@sh... create + 2. mvn deploy \ No newline at end of file Modified: branches/generics-cleanup/pom.xml =================================================================== --- branches/generics-cleanup/pom.xml 2012-04-11 19:51:39 UTC (rev 290) +++ branches/generics-cleanup/pom.xml 2012-04-12 17:20:38 UTC (rev 291) @@ -3,7 +3,7 @@ <groupId>org.openfast</groupId> <artifactId>openfast</artifactId> <packaging>jar</packaging> - <version>1.0.4-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <organization> <name>The LaSalle Technology Group, LLC</name> @@ -150,7 +150,7 @@ <extension> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-ssh</artifactId> - <version>1.0-beta-2</version> + <version>2.2</version> </extension> </extensions> @@ -241,21 +241,21 @@ <id>sourceforge.net</id> <name>Sourceforge.net Repository</name> <url> - scp://web.sourceforge.net/home/project-web/openfast/htdocs/maven/release + scp://shell.sourceforge.net/home/project-web/openfast/htdocs/maven/release </url> </repository> <snapshotRepository> <id>sourceforge.net</id> <name>Sourceforge.net Snapshot Repository</name> <url> - scp://web.sourceforge.net/home/project-web/openfast/htdocs/maven/snapshot + scp://shell.sourceforge.net/home/project-web/openfast/htdocs/maven/snapshot </url> </snapshotRepository> <site> <id>sourceforge.net</id> <name>Sourceforge.net OpenFAST Web Site</name> <url> - scp://web.sourceforge.net/home/project-web/openfast/htdocs + scp://shell.sourceforge.net/home/project-web/openfast/htdocs </url> </site> </distributionManagement> Property changes on: branches/generics-cleanup/pom.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: branches/generics-cleanup/src/main/java/org/openfast/codec/FastDecoder.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/codec/FastDecoder.java 2012-04-11 19:51:39 UTC (rev 290) +++ branches/generics-cleanup/src/main/java/org/openfast/codec/FastDecoder.java 2012-04-12 17:20:38 UTC (rev 291) @@ -22,12 +22,12 @@ import java.io.IOException; import java.io.InputStream; + import org.openfast.BitVector; import org.openfast.BitVectorReader; import org.openfast.BitVectorValue; import org.openfast.Context; import org.openfast.Message; -import org.openfast.error.FastConstants; import org.openfast.error.FastException; import org.openfast.template.MessageTemplate; import org.openfast.template.type.codec.TypeCodec; Modified: branches/generics-cleanup/src/main/java/org/openfast/session/multicast/MulticastEndpoint.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/session/multicast/MulticastEndpoint.java 2012-04-11 19:51:39 UTC (rev 290) +++ branches/generics-cleanup/src/main/java/org/openfast/session/multicast/MulticastEndpoint.java 2012-04-12 17:20:38 UTC (rev 291) @@ -22,6 +22,7 @@ import java.io.IOException; import java.net.InetAddress; +import java.net.InetSocketAddress; import java.net.MulticastSocket; import java.net.SocketException; @@ -47,7 +48,7 @@ protected MulticastSocket createSocket() throws FastConnectionException { try { - MulticastSocket socket = new MulticastSocket(port); + MulticastSocket socket = new MulticastSocket(new InetSocketAddress(group, port)); if (ifaddr != null) { try { socket.setInterface(InetAddress.getByName(ifaddr)); Modified: branches/generics-cleanup/src/main/java/org/openfast/session/multicast/MulticastInputStream.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/session/multicast/MulticastInputStream.java 2012-04-11 19:51:39 UTC (rev 290) +++ branches/generics-cleanup/src/main/java/org/openfast/session/multicast/MulticastInputStream.java 2012-04-12 17:20:38 UTC (rev 291) @@ -53,4 +53,9 @@ } return (buffer.get() & 0xFF); } + + @Override + public int available() throws IOException { + return buffer.remaining(); + } } Modified: branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/BitVectorType.java =================================================================== --- branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/BitVectorType.java 2012-04-11 19:51:39 UTC (rev 290) +++ branches/generics-cleanup/src/main/java/org/openfast/template/type/codec/BitVectorType.java 2012-04-12 17:20:38 UTC (rev 291) @@ -23,17 +23,16 @@ */ package org.openfast.template.type.codec; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; + import org.openfast.BitVector; import org.openfast.BitVectorValue; import org.openfast.Global; import org.openfast.ScalarValue; import org.openfast.error.FastConstants; -import org.openfast.error.FastException; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; - public final class BitVectorType extends TypeCodec { private static final long serialVersionUID = 1L; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ope...@li...> - 2012-04-11 19:51:48
|
Revision: 290 http://openfast.svn.sourceforge.net/openfast/?rev=290&view=rev Author: jacob_northey Date: 2012-04-11 19:51:39 +0000 (Wed, 11 Apr 2012) Log Message: ----------- [maven-release-plugin] prepare for next development iteration Modified Paths: -------------- trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-11 19:51:37 UTC (rev 289) +++ trunk/pom.xml 2012-04-11 19:51:39 UTC (rev 290) @@ -3,7 +3,7 @@ <groupId>org.openfast</groupId> <artifactId>openfast</artifactId> <packaging>jar</packaging> - <version>1.1.0</version> + <version>1.2.0-SNAPSHOT</version> <organization> <name>The LaSalle Technology Group, LLC</name> @@ -71,9 +71,9 @@ </issueManagement> <scm> - <connection>scm:svn:https://openfast.svn.sourceforge.net/svnroot/openfast/tags/openfast-1.1.0</connection> - <developerConnection>scm:svn:https://openfast.svn.sourceforge.net/svnroot/openfast/tags/openfast-1.1.0</developerConnection> - <url>http://openfast.svn.sourceforge.net/viewvc/openfast/tags/openfast-1.1.0</url> + <connection>scm:svn:https://openfast.svn.sourceforge.net/svnroot/openfast/trunk</connection> + <developerConnection>scm:svn:https://openfast.svn.sourceforge.net/svnroot/openfast/trunk</developerConnection> + <url>http://openfast.svn.sourceforge.net/viewvc/openfast/trunk</url> </scm> <mailingLists> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ope...@li...> - 2012-04-11 19:51:43
|
Revision: 289 http://openfast.svn.sourceforge.net/openfast/?rev=289&view=rev Author: jacob_northey Date: 2012-04-11 19:51:37 +0000 (Wed, 11 Apr 2012) Log Message: ----------- [maven-release-plugin] copy for tag openfast-1.1.0 Added Paths: ----------- tags/openfast-1.1.0/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ope...@li...> - 2012-04-11 19:51:39
|
Revision: 288 http://openfast.svn.sourceforge.net/openfast/?rev=288&view=rev Author: jacob_northey Date: 2012-04-11 19:51:33 +0000 (Wed, 11 Apr 2012) Log Message: ----------- [maven-release-plugin] prepare release openfast-1.1.0 Modified Paths: -------------- trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-11 19:50:39 UTC (rev 287) +++ trunk/pom.xml 2012-04-11 19:51:33 UTC (rev 288) @@ -3,7 +3,7 @@ <groupId>org.openfast</groupId> <artifactId>openfast</artifactId> <packaging>jar</packaging> - <version>1.2.0-SNAPSHOT</version> + <version>1.1.0</version> <organization> <name>The LaSalle Technology Group, LLC</name> @@ -71,9 +71,9 @@ </issueManagement> <scm> - <connection>scm:svn:https://openfast.svn.sourceforge.net/svnroot/openfast/trunk</connection> - <developerConnection>scm:svn:https://openfast.svn.sourceforge.net/svnroot/openfast/trunk</developerConnection> - <url>http://openfast.svn.sourceforge.net/viewvc/openfast/trunk</url> + <connection>scm:svn:https://openfast.svn.sourceforge.net/svnroot/openfast/tags/openfast-1.1.0</connection> + <developerConnection>scm:svn:https://openfast.svn.sourceforge.net/svnroot/openfast/tags/openfast-1.1.0</developerConnection> + <url>http://openfast.svn.sourceforge.net/viewvc/openfast/tags/openfast-1.1.0</url> </scm> <mailingLists> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ope...@li...> - 2012-04-11 19:50:45
|
Revision: 287 http://openfast.svn.sourceforge.net/openfast/?rev=287&view=rev Author: jacob_northey Date: 2012-04-11 19:50:39 +0000 (Wed, 11 Apr 2012) Log Message: ----------- Removed Paths: ------------- tags/openfast-1.1.0/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ope...@li...> - 2012-04-11 19:47:46
|
Revision: 286 http://openfast.svn.sourceforge.net/openfast/?rev=286&view=rev Author: jacob_northey Date: 2012-04-11 19:47:40 +0000 (Wed, 11 Apr 2012) Log Message: ----------- Updated ssh wagon Modified Paths: -------------- trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-11 19:33:28 UTC (rev 285) +++ trunk/pom.xml 2012-04-11 19:47:40 UTC (rev 286) @@ -139,7 +139,7 @@ <extension> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-ssh</artifactId> - <version>1.0-beta-2</version> + <version>2.2</version> </extension> </extensions> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ope...@li...> - 2012-04-11 19:33:34
|
Revision: 285 http://openfast.svn.sourceforge.net/openfast/?rev=285&view=rev Author: jacob_northey Date: 2012-04-11 19:33:28 +0000 (Wed, 11 Apr 2012) Log Message: ----------- [maven-release-plugin] prepare for next development iteration Modified Paths: -------------- trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-11 19:33:26 UTC (rev 284) +++ trunk/pom.xml 2012-04-11 19:33:28 UTC (rev 285) @@ -3,7 +3,7 @@ <groupId>org.openfast</groupId> <artifactId>openfast</artifactId> <packaging>jar</packaging> - <version>1.1.0</version> + <version>1.2.0-SNAPSHOT</version> <organization> <name>The LaSalle Technology Group, LLC</name> @@ -71,9 +71,9 @@ </issueManagement> <scm> - <connection>scm:svn:https://openfast.svn.sourceforge.net/svnroot/openfast/tags/openfast-1.1.0</connection> - <developerConnection>scm:svn:https://openfast.svn.sourceforge.net/svnroot/openfast/tags/openfast-1.1.0</developerConnection> - <url>http://openfast.svn.sourceforge.net/viewvc/openfast/tags/openfast-1.1.0</url> + <connection>scm:svn:https://openfast.svn.sourceforge.net/svnroot/openfast/trunk</connection> + <developerConnection>scm:svn:https://openfast.svn.sourceforge.net/svnroot/openfast/trunk</developerConnection> + <url>http://openfast.svn.sourceforge.net/viewvc/openfast/trunk</url> </scm> <mailingLists> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ope...@li...> - 2012-04-11 19:33:32
|
Revision: 284 http://openfast.svn.sourceforge.net/openfast/?rev=284&view=rev Author: jacob_northey Date: 2012-04-11 19:33:26 +0000 (Wed, 11 Apr 2012) Log Message: ----------- [maven-release-plugin] copy for tag openfast-1.1.0 Added Paths: ----------- tags/openfast-1.1.0/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |