You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by cu...@apache.org on 2011/03/31 23:26:13 UTC
svn commit: r1087445 - in /avro/branches/branch-1.5: ./ lang/csharp/
lang/csharp/lib/ lang/csharp/lib/main/ lang/csharp/lib/test/
lang/csharp/src/ lang/csharp/src/apache/ lang/csharp/src/apache/codegen/
lang/csharp/src/apache/codegen/Properties/ lang/c...
Author: cutting
Date: Thu Mar 31 21:26:10 2011
New Revision: 1087445
URL: http://svn.apache.org/viewvc?rev=1087445&view=rev
Log:
Merge 1087439, 1087440 from trunk to 1.5 branch. Fixes AVRO-533.
Added:
avro/branches/branch-1.5/lang/csharp/ (props changed)
- copied from r1087439, avro/trunk/lang/csharp/
avro/branches/branch-1.5/lang/csharp/Avro.nunit
- copied unchanged from r1087439, avro/trunk/lang/csharp/Avro.nunit
avro/branches/branch-1.5/lang/csharp/Avro.sln
- copied unchanged from r1087439, avro/trunk/lang/csharp/Avro.sln
avro/branches/branch-1.5/lang/csharp/README
- copied unchanged from r1087439, avro/trunk/lang/csharp/README
avro/branches/branch-1.5/lang/csharp/build.sh
- copied unchanged from r1087439, avro/trunk/lang/csharp/build.sh
avro/branches/branch-1.5/lang/csharp/lib/
- copied from r1087439, avro/trunk/lang/csharp/lib/
avro/branches/branch-1.5/lang/csharp/lib/main/
- copied from r1087439, avro/trunk/lang/csharp/lib/main/
avro/branches/branch-1.5/lang/csharp/lib/main/Newtonsoft.Json.dll
- copied unchanged from r1087439, avro/trunk/lang/csharp/lib/main/Newtonsoft.Json.dll
avro/branches/branch-1.5/lang/csharp/lib/main/log4net.dll
- copied unchanged from r1087439, avro/trunk/lang/csharp/lib/main/log4net.dll
avro/branches/branch-1.5/lang/csharp/lib/test/
- copied from r1087439, avro/trunk/lang/csharp/lib/test/
avro/branches/branch-1.5/lang/csharp/lib/test/nunit.framework.dll
- copied unchanged from r1087439, avro/trunk/lang/csharp/lib/test/nunit.framework.dll
avro/branches/branch-1.5/lang/csharp/src/
- copied from r1087439, avro/trunk/lang/csharp/src/
avro/branches/branch-1.5/lang/csharp/src/apache/
- copied from r1087439, avro/trunk/lang/csharp/src/apache/
avro/branches/branch-1.5/lang/csharp/src/apache/codegen/ (props changed)
- copied from r1087439, avro/trunk/lang/csharp/src/apache/codegen/
avro/branches/branch-1.5/lang/csharp/src/apache/codegen/Avro.codegen.csproj
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/codegen/Avro.codegen.csproj
avro/branches/branch-1.5/lang/csharp/src/apache/codegen/Program.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/codegen/Program.cs
avro/branches/branch-1.5/lang/csharp/src/apache/codegen/Properties/
- copied from r1087439, avro/trunk/lang/csharp/src/apache/codegen/Properties/
avro/branches/branch-1.5/lang/csharp/src/apache/codegen/Properties/AssemblyInfo.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/codegen/Properties/AssemblyInfo.cs
avro/branches/branch-1.5/lang/csharp/src/apache/codegen/app.config
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/codegen/app.config
avro/branches/branch-1.5/lang/csharp/src/apache/main/ (props changed)
- copied from r1087439, avro/trunk/lang/csharp/src/apache/main/
avro/branches/branch-1.5/lang/csharp/src/apache/main/Avro.main.csproj
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Avro.main.csproj
avro/branches/branch-1.5/lang/csharp/src/apache/main/CodeGen/
- copied from r1087439, avro/trunk/lang/csharp/src/apache/main/CodeGen/
avro/branches/branch-1.5/lang/csharp/src/apache/main/CodeGen/AvroRuntimeException.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/CodeGen/AvroRuntimeException.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/CodeGen/CodeGen.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/CodeGen/CodeGen.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/CodeGen/CodeGenException.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/CodeGen/CodeGenException.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/CodeGen/CodeGenExt.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/CodeGen/CodeGenExt.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/Generic/
- copied from r1087439, avro/trunk/lang/csharp/src/apache/main/Generic/
avro/branches/branch-1.5/lang/csharp/src/apache/main/Generic/DatumReader.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Generic/DatumReader.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/Generic/DatumWriter.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Generic/DatumWriter.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/Generic/GenericEnum.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Generic/GenericEnum.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/Generic/GenericFixed.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Generic/GenericFixed.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/Generic/GenericReader.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Generic/GenericReader.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/Generic/GenericRecord.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Generic/GenericRecord.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/Generic/GenericWriter.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Generic/GenericWriter.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/IO/
- copied from r1087439, avro/trunk/lang/csharp/src/apache/main/IO/
avro/branches/branch-1.5/lang/csharp/src/apache/main/IO/BinaryDecoder.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/IO/BinaryDecoder.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/IO/BinaryEncoder.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/IO/BinaryEncoder.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/IO/Decoder.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/IO/Decoder.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/IO/Encoder.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/IO/Encoder.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/IO/Resolver.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/IO/Resolver.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/Properties/
- copied from r1087439, avro/trunk/lang/csharp/src/apache/main/Properties/
avro/branches/branch-1.5/lang/csharp/src/apache/main/Properties/AssemblyInfo.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Properties/AssemblyInfo.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/Properties/Settings.Designer.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Properties/Settings.Designer.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/Protocol/
- copied from r1087439, avro/trunk/lang/csharp/src/apache/main/Protocol/
avro/branches/branch-1.5/lang/csharp/src/apache/main/Protocol/Message.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Protocol/Message.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/Protocol/Protocol.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Protocol/Protocol.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/Protocol/ProtocolParseException.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Protocol/ProtocolParseException.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/Schema/
- copied from r1087439, avro/trunk/lang/csharp/src/apache/main/Schema/
avro/branches/branch-1.5/lang/csharp/src/apache/main/Schema/ArraySchema.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Schema/ArraySchema.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/Schema/AvroException.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Schema/AvroException.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/Schema/AvroTypeException.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Schema/AvroTypeException.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/Schema/EnumSchema.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Schema/EnumSchema.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/Schema/Field.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Schema/Field.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/Schema/FixedSchema.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Schema/FixedSchema.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/Schema/JsonHelper.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Schema/JsonHelper.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/Schema/MapSchema.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Schema/MapSchema.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/Schema/NamedSchema.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Schema/NamedSchema.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/Schema/PrimitiveSchema.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Schema/PrimitiveSchema.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/Schema/Property.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Schema/Property.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/Schema/RecordSchema.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Schema/RecordSchema.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/Schema/Schema.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Schema/Schema.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/Schema/SchemaName.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Schema/SchemaName.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/Schema/SchemaParseException.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Schema/SchemaParseException.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/Schema/UnionSchema.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Schema/UnionSchema.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/Schema/UnnamedSchema.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Schema/UnnamedSchema.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/Specific/
- copied from r1087439, avro/trunk/lang/csharp/src/apache/main/Specific/
avro/branches/branch-1.5/lang/csharp/src/apache/main/Specific/ObjectCreator.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Specific/ObjectCreator.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/Specific/SpecificFixed.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Specific/SpecificFixed.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/Specific/SpecificReader.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Specific/SpecificReader.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/Specific/SpecificRecord.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Specific/SpecificRecord.cs
avro/branches/branch-1.5/lang/csharp/src/apache/main/Specific/SpecificWriter.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/main/Specific/SpecificWriter.cs
avro/branches/branch-1.5/lang/csharp/src/apache/test/ (props changed)
- copied from r1087439, avro/trunk/lang/csharp/src/apache/test/
avro/branches/branch-1.5/lang/csharp/src/apache/test/Avro.test.csproj
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/test/Avro.test.csproj
avro/branches/branch-1.5/lang/csharp/src/apache/test/CodGen/
- copied from r1087439, avro/trunk/lang/csharp/src/apache/test/CodGen/
avro/branches/branch-1.5/lang/csharp/src/apache/test/CodGen/CodeGenTest.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/test/CodGen/CodeGenTest.cs
avro/branches/branch-1.5/lang/csharp/src/apache/test/Generic/
- copied from r1087439, avro/trunk/lang/csharp/src/apache/test/Generic/
avro/branches/branch-1.5/lang/csharp/src/apache/test/Generic/GenericTests.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/test/Generic/GenericTests.cs
avro/branches/branch-1.5/lang/csharp/src/apache/test/IO/
- copied from r1087439, avro/trunk/lang/csharp/src/apache/test/IO/
avro/branches/branch-1.5/lang/csharp/src/apache/test/IO/BinaryCodecTests.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/test/IO/BinaryCodecTests.cs
avro/branches/branch-1.5/lang/csharp/src/apache/test/Properties/
- copied from r1087439, avro/trunk/lang/csharp/src/apache/test/Properties/
avro/branches/branch-1.5/lang/csharp/src/apache/test/Properties/AssemblyInfo.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/test/Properties/AssemblyInfo.cs
avro/branches/branch-1.5/lang/csharp/src/apache/test/Protocol/
- copied from r1087439, avro/trunk/lang/csharp/src/apache/test/Protocol/
avro/branches/branch-1.5/lang/csharp/src/apache/test/Protocol/ProtocolTest.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/test/Protocol/ProtocolTest.cs
avro/branches/branch-1.5/lang/csharp/src/apache/test/Schema/
- copied from r1087439, avro/trunk/lang/csharp/src/apache/test/Schema/
avro/branches/branch-1.5/lang/csharp/src/apache/test/Schema/AliasTest.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/test/Schema/AliasTest.cs
avro/branches/branch-1.5/lang/csharp/src/apache/test/Schema/SchemaTests.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/test/Schema/SchemaTests.cs
avro/branches/branch-1.5/lang/csharp/src/apache/test/Specific/
- copied from r1087439, avro/trunk/lang/csharp/src/apache/test/Specific/
avro/branches/branch-1.5/lang/csharp/src/apache/test/Specific/SpecificTests.cs
- copied unchanged from r1087439, avro/trunk/lang/csharp/src/apache/test/Specific/SpecificTests.cs
Modified:
avro/branches/branch-1.5/ (props changed)
avro/branches/branch-1.5/CHANGES.txt
avro/branches/branch-1.5/build.sh
avro/branches/branch-1.5/share/rat-excludes.txt
Propchange: avro/branches/branch-1.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 31 21:26:10 2011
@@ -1 +1 @@
-/avro/trunk:1075938,1075993,1078917,1079055,1079060,1079063,1083246,1085921,1086727,1086730,1086866,1087076,1087129,1087136
+/avro/trunk:1075938,1075993,1078917,1079055,1079060,1079063,1083246,1085921,1086727,1086730,1086866,1087076,1087129,1087136,1087439-1087440
Modified: avro/branches/branch-1.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.5/CHANGES.txt?rev=1087445&r1=1087444&r2=1087445&view=diff
==============================================================================
--- avro/branches/branch-1.5/CHANGES.txt (original)
+++ avro/branches/branch-1.5/CHANGES.txt Thu Mar 31 21:26:10 2011
@@ -2,6 +2,11 @@ Avro Change Log
Avro 1.5.1 (unreleased)
+ NEW FEATURES
+
+ AVRO-533. Add a C# implementation.
+ (Jeremy Custenborder, Dona Alvarez and thiru)
+
IMPROVEMENTS
AVRO-785. Java: Squash a Velocity warning by upgrading to Velocity 1.7.
Modified: avro/branches/branch-1.5/build.sh
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.5/build.sh?rev=1087445&r1=1087444&r2=1087445&view=diff
==============================================================================
--- avro/branches/branch-1.5/build.sh (original)
+++ avro/branches/branch-1.5/build.sh Thu Mar 31 21:26:10 2011
@@ -44,6 +44,7 @@ case "$target" in
(cd lang/py; ant test)
(cd lang/c; ./build.sh test)
(cd lang/c++; ./build.sh test)
+ (cd lang/csharp; ./build.sh test)
(cd lang/ruby; rake test)
(cd lang/php; ./build.sh test)
@@ -144,6 +145,8 @@ case "$target" in
(cd lang/c++; ./build.sh clean)
+ (cd lang/csharp; ./build.sh clean)
+
(cd lang/ruby; rake clean)
(cd lang/php; ./build.sh clean)
Propchange: avro/branches/branch-1.5/lang/csharp/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Mar 31 21:26:10 2011
@@ -0,0 +1,2 @@
+build
+TestResult.xml
Propchange: avro/branches/branch-1.5/lang/csharp/src/apache/codegen/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Mar 31 21:26:10 2011
@@ -0,0 +1 @@
+obj
Propchange: avro/branches/branch-1.5/lang/csharp/src/apache/main/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Mar 31 21:26:10 2011
@@ -0,0 +1 @@
+obj
Propchange: avro/branches/branch-1.5/lang/csharp/src/apache/test/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Mar 31 21:26:10 2011
@@ -0,0 +1 @@
+obj
Modified: avro/branches/branch-1.5/share/rat-excludes.txt
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.5/share/rat-excludes.txt?rev=1087445&r1=1087444&r2=1087445&view=diff
==============================================================================
--- avro/branches/branch-1.5/share/rat-excludes.txt (original)
+++ avro/branches/branch-1.5/share/rat-excludes.txt Thu Mar 31 21:26:10 2011
@@ -32,6 +32,8 @@ lang/c/jansson/**
lang/c/src/queue.h
lang/c/src/st.h
lang/c/src/st.c
+lang/csharp/Avro.sln
+lang/csharp/Avro.nunit
lang/java/ipc/src/main/java/org/apache/avro/ipc/stats/static/*.js
lang/java/ipc/src/main/java/org/apache/avro/ipc/stats/static/*.css
share/test/data/test.avro12