diff --git a/.idea/artifacts/akka_samples_lift_war_exploded.xml b/.idea/artifacts/akka_samples_lift_war_exploded.xml index ecb7937f58..0cff3865c5 100644 --- a/.idea/artifacts/akka_samples_lift_war_exploded.xml +++ b/.idea/artifacts/akka_samples_lift_war_exploded.xml @@ -16,7 +16,7 @@ - + @@ -35,7 +35,7 @@ - + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index ee5b03c2c3..0f201e04ee 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,8 +3,18 @@ + + - + + + + + + + + + @@ -67,88 +77,88 @@ - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + @@ -169,8 +179,14 @@ @@ -218,6 +234,8 @@ + + @@ -229,18 +247,17 @@ - - + - + - + @@ -367,7 +384,7 @@ - + @@ -414,30 +431,9 @@ - + - - - - - - - - - - - - - - - - - - - - - - + @@ -456,30 +452,93 @@ - + - + + + + + + + + + + + + + + + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/akka-actors/pom.xml b/akka-actors/pom.xml index 09284fae4b..5138a48ccb 100644 --- a/akka-actors/pom.xml +++ b/akka-actors/pom.xml @@ -65,7 +65,7 @@ org.jboss.netty netty - 3.1.0.GA + 3.2.0.ALPHA1 org.scala-tools @@ -87,7 +87,7 @@ com.google.protobuf protobuf-java - 2.1.0 + 2.2.0 sbinary diff --git a/akka-actors/src/main/scala/actor/Actor.scala b/akka-actors/src/main/scala/actor/Actor.scala index b45612db13..358e27bd54 100644 --- a/akka-actors/src/main/scala/actor/Actor.scala +++ b/akka-actors/src/main/scala/actor/Actor.scala @@ -181,11 +181,9 @@ trait Actor extends Logging with TransactionManagement { /** * User overridable callback/setting. * - * Defines the life-cycle for a supervised actor. - * - * Needs to be set if the actor is supervised programmatically. + * Defines the life-cycle for a supervised actor. Default is 'LifeCycle(Permanent)' but can be overridden. */ - @volatile var lifeCycle: Option[LifeCycle] = None + @volatile var lifeCycle: Option[LifeCycle] = Some(LifeCycle(Permanent)) /** * User overridable callback/setting. diff --git a/akka-fun-test-java/pom.xml b/akka-fun-test-java/pom.xml index 7b5e829220..0cba842396 100644 --- a/akka-fun-test-java/pom.xml +++ b/akka-fun-test-java/pom.xml @@ -26,6 +26,11 @@ 1.8.6.3 test + + com.google.protobuf + protobuf-java + 2.2.0 + com.sun.jersey jersey-server diff --git a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/ProtobufProtocol.java b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/ProtobufProtocol.java index 2ab5696a1f..e7b15ca1ef 100644 --- a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/ProtobufProtocol.java +++ b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/ProtobufProtocol.java @@ -26,7 +26,6 @@ public final class ProtobufProtocol { return se.scalablesolutions.akka.api.ProtobufProtocol.internal_static_se_scalablesolutions_akka_api_ProtobufPOJO_descriptor; } - @Override protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return se.scalablesolutions.akka.api.ProtobufProtocol.internal_static_se_scalablesolutions_akka_api_ProtobufPOJO_fieldAccessorTable; @@ -53,7 +52,6 @@ public final class ProtobufProtocol { public boolean hasStatus() { return hasStatus; } public boolean getStatus() { return status_; } - @Override public final boolean isInitialized() { if (!hasId) return false; if (!hasName) return false; @@ -61,7 +59,6 @@ public final class ProtobufProtocol { return true; } - @Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (hasId()) { @@ -77,7 +74,6 @@ public final class ProtobufProtocol { } private int memoizedSerializedSize = -1; - @Override public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; @@ -107,7 +103,7 @@ public final class ProtobufProtocol { } public static se.scalablesolutions.akka.api.ProtobufProtocol.ProtobufPOJO parseFrom( com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistry extensionRegistry) + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); @@ -118,7 +114,7 @@ public final class ProtobufProtocol { } public static se.scalablesolutions.akka.api.ProtobufProtocol.ProtobufPOJO parseFrom( byte[] data, - com.google.protobuf.ExtensionRegistry extensionRegistry) + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); @@ -129,7 +125,7 @@ public final class ProtobufProtocol { } public static se.scalablesolutions.akka.api.ProtobufProtocol.ProtobufPOJO parseFrom( java.io.InputStream input, - com.google.protobuf.ExtensionRegistry extensionRegistry) + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); @@ -140,7 +136,7 @@ public final class ProtobufProtocol { } public static se.scalablesolutions.akka.api.ProtobufProtocol.ProtobufPOJO parseDelimitedFrom( java.io.InputStream input, - com.google.protobuf.ExtensionRegistry extensionRegistry) + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return newBuilder().mergeDelimitedFrom(input, extensionRegistry) .buildParsed(); @@ -152,43 +148,49 @@ public final class ProtobufProtocol { } public static se.scalablesolutions.akka.api.ProtobufProtocol.ProtobufPOJO parseFrom( com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistry extensionRegistry) + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - public static Builder newBuilder() { return new Builder(); } - public Builder newBuilderForType() { return new Builder(); } + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(se.scalablesolutions.akka.api.ProtobufProtocol.ProtobufPOJO prototype) { - return new Builder().mergeFrom(prototype); + return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder { + private se.scalablesolutions.akka.api.ProtobufProtocol.ProtobufPOJO result; + // Construct using se.scalablesolutions.akka.api.ProtobufProtocol.ProtobufPOJO.newBuilder() private Builder() {} - se.scalablesolutions.akka.api.ProtobufProtocol.ProtobufPOJO result = new se.scalablesolutions.akka.api.ProtobufProtocol.ProtobufPOJO(); + private static Builder create() { + Builder builder = new Builder(); + builder.result = new se.scalablesolutions.akka.api.ProtobufProtocol.ProtobufPOJO(); + return builder; + } - @Override protected se.scalablesolutions.akka.api.ProtobufProtocol.ProtobufPOJO internalGetResult() { return result; } - @Override public Builder clear() { + if (result == null) { + throw new IllegalStateException( + "Cannot call clear() after build()."); + } result = new se.scalablesolutions.akka.api.ProtobufProtocol.ProtobufPOJO(); return this; } - @Override public Builder clone() { - return new Builder().mergeFrom(result); + return create().mergeFrom(result); } - @Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return se.scalablesolutions.akka.api.ProtobufProtocol.ProtobufPOJO.getDescriptor(); @@ -198,10 +200,12 @@ public final class ProtobufProtocol { return se.scalablesolutions.akka.api.ProtobufProtocol.ProtobufPOJO.getDefaultInstance(); } + public boolean isInitialized() { + return result.isInitialized(); + } public se.scalablesolutions.akka.api.ProtobufProtocol.ProtobufPOJO build() { if (result != null && !isInitialized()) { - throw new com.google.protobuf.UninitializedMessageException( - result); + throw newUninitializedMessageException(result); } return buildPartial(); } @@ -209,7 +213,7 @@ public final class ProtobufProtocol { private se.scalablesolutions.akka.api.ProtobufProtocol.ProtobufPOJO buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { if (!isInitialized()) { - throw new com.google.protobuf.UninitializedMessageException( + throw newUninitializedMessageException( result).asInvalidProtocolBufferException(); } return buildPartial(); @@ -218,13 +222,13 @@ public final class ProtobufProtocol { public se.scalablesolutions.akka.api.ProtobufProtocol.ProtobufPOJO buildPartial() { if (result == null) { throw new IllegalStateException( - "build() has already been called on this Builder."); } + "build() has already been called on this Builder."); + } se.scalablesolutions.akka.api.ProtobufProtocol.ProtobufPOJO returnMe = result; result = null; return returnMe; } - @Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof se.scalablesolutions.akka.api.ProtobufProtocol.ProtobufPOJO) { return mergeFrom((se.scalablesolutions.akka.api.ProtobufProtocol.ProtobufPOJO)other); @@ -249,18 +253,9 @@ public final class ProtobufProtocol { return this; } - @Override - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return mergeFrom(input, - com.google.protobuf.ExtensionRegistry.getEmptyRegistry()); - } - - @Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistry extensionRegistry) + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder( @@ -331,7 +326,7 @@ public final class ProtobufProtocol { } public Builder clearName() { result.hasName = false; - result.name_ = ""; + result.name_ = getDefaultInstance().getName(); return this; } @@ -357,6 +352,10 @@ public final class ProtobufProtocol { static { se.scalablesolutions.akka.api.ProtobufProtocol.getDescriptor(); } + + static { + se.scalablesolutions.akka.api.ProtobufProtocol.internalForceInit(); + } } private static com.google.protobuf.Descriptors.Descriptor @@ -372,11 +371,12 @@ public final class ProtobufProtocol { private static com.google.protobuf.Descriptors.FileDescriptor descriptor; static { - java.lang.String descriptorData = + java.lang.String[] descriptorData = { "\n4se/scalablesolutions/akka/api/Protobuf" + "Protocol.proto\022\035se.scalablesolutions.akk" + "a.api\"8\n\014ProtobufPOJO\022\n\n\002id\030\001 \002(\004\022\014\n\004nam" + - "e\030\002 \002(\t\022\016\n\006status\030\003 \002(\010B\002H\001"; + "e\030\002 \002(\t\022\016\n\006status\030\003 \002(\010" + }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { public com.google.protobuf.ExtensionRegistry assignDescriptors( @@ -398,4 +398,6 @@ public final class ProtobufProtocol { new com.google.protobuf.Descriptors.FileDescriptor[] { }, assigner); } + + public static void internalForceInit() {} } diff --git a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/ProtobufProtocol.proto b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/ProtobufProtocol.proto index f5026303a5..3ff0784949 100644 --- a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/ProtobufProtocol.proto +++ b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/ProtobufProtocol.proto @@ -10,8 +10,6 @@ package se.scalablesolutions.akka.api; protoc se/scalablesolutions/akka/api/ProtobufProtocol.proto --java_out . */ -option optimize_for = SPEED; - message ProtobufPOJO { required uint64 id = 1; required string name = 2; diff --git a/akka-kernel/pom.xml b/akka-kernel/pom.xml index 4886d11a6a..b964967624 100755 --- a/akka-kernel/pom.xml +++ b/akka-kernel/pom.xml @@ -129,7 +129,7 @@ com.google.protobuf protobuf-java - 2.1.0 + 2.2.0 sbinary diff --git a/akka-util-java/pom.xml b/akka-util-java/pom.xml index 4e545b2e82..537a07fab4 100755 --- a/akka-util-java/pom.xml +++ b/akka-util-java/pom.xml @@ -23,7 +23,7 @@ com.google.protobuf protobuf-java - 2.1.0 + 2.2.0 org.multiverse diff --git a/akka-util-java/src/main/java/se/scalablesolutions/akka/nio/protobuf/RemoteProtocol.java b/akka-util-java/src/main/java/se/scalablesolutions/akka/nio/protobuf/RemoteProtocol.java index 38022db312..b956e77c96 100644 --- a/akka-util-java/src/main/java/se/scalablesolutions/akka/nio/protobuf/RemoteProtocol.java +++ b/akka-util-java/src/main/java/se/scalablesolutions/akka/nio/protobuf/RemoteProtocol.java @@ -26,7 +26,6 @@ public final class RemoteProtocol { return se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.internal_static_se_scalablesolutions_akka_nio_protobuf_RemoteRequest_descriptor; } - @Override protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.internal_static_se_scalablesolutions_akka_nio_protobuf_RemoteRequest_fieldAccessorTable; @@ -109,7 +108,6 @@ public final class RemoteProtocol { public boolean hasIsEscaped() { return hasIsEscaped; } public boolean getIsEscaped() { return isEscaped_; } - @Override public final boolean isInitialized() { if (!hasId) return false; if (!hasProtocol) return false; @@ -122,7 +120,6 @@ public final class RemoteProtocol { return true; } - @Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (hasId()) { @@ -162,7 +159,6 @@ public final class RemoteProtocol { } private int memoizedSerializedSize = -1; - @Override public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; @@ -224,7 +220,7 @@ public final class RemoteProtocol { } public static se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest parseFrom( com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistry extensionRegistry) + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); @@ -235,7 +231,7 @@ public final class RemoteProtocol { } public static se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest parseFrom( byte[] data, - com.google.protobuf.ExtensionRegistry extensionRegistry) + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); @@ -246,7 +242,7 @@ public final class RemoteProtocol { } public static se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest parseFrom( java.io.InputStream input, - com.google.protobuf.ExtensionRegistry extensionRegistry) + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); @@ -257,7 +253,7 @@ public final class RemoteProtocol { } public static se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest parseDelimitedFrom( java.io.InputStream input, - com.google.protobuf.ExtensionRegistry extensionRegistry) + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return newBuilder().mergeDelimitedFrom(input, extensionRegistry) .buildParsed(); @@ -269,43 +265,49 @@ public final class RemoteProtocol { } public static se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest parseFrom( com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistry extensionRegistry) + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - public static Builder newBuilder() { return new Builder(); } - public Builder newBuilderForType() { return new Builder(); } + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest prototype) { - return new Builder().mergeFrom(prototype); + return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder { + private se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest result; + // Construct using se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest.newBuilder() private Builder() {} - se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest result = new se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest(); + private static Builder create() { + Builder builder = new Builder(); + builder.result = new se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest(); + return builder; + } - @Override protected se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest internalGetResult() { return result; } - @Override public Builder clear() { + if (result == null) { + throw new IllegalStateException( + "Cannot call clear() after build()."); + } result = new se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest(); return this; } - @Override public Builder clone() { - return new Builder().mergeFrom(result); + return create().mergeFrom(result); } - @Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest.getDescriptor(); @@ -315,10 +317,12 @@ public final class RemoteProtocol { return se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest.getDefaultInstance(); } + public boolean isInitialized() { + return result.isInitialized(); + } public se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest build() { if (result != null && !isInitialized()) { - throw new com.google.protobuf.UninitializedMessageException( - result); + throw newUninitializedMessageException(result); } return buildPartial(); } @@ -326,7 +330,7 @@ public final class RemoteProtocol { private se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { if (!isInitialized()) { - throw new com.google.protobuf.UninitializedMessageException( + throw newUninitializedMessageException( result).asInvalidProtocolBufferException(); } return buildPartial(); @@ -335,13 +339,13 @@ public final class RemoteProtocol { public se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest buildPartial() { if (result == null) { throw new IllegalStateException( - "build() has already been called on this Builder."); } + "build() has already been called on this Builder."); + } se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest returnMe = result; result = null; return returnMe; } - @Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest) { return mergeFrom((se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteRequest)other); @@ -390,18 +394,9 @@ public final class RemoteProtocol { return this; } - @Override - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return mergeFrom(input, - com.google.protobuf.ExtensionRegistry.getEmptyRegistry()); - } - - @Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistry extensionRegistry) + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder( @@ -522,7 +517,7 @@ public final class RemoteProtocol { } public Builder clearMessage() { result.hasMessage = false; - result.message_ = com.google.protobuf.ByteString.EMPTY; + result.message_ = getDefaultInstance().getMessage(); return this; } @@ -543,7 +538,7 @@ public final class RemoteProtocol { } public Builder clearMessageManifest() { result.hasMessageManifest = false; - result.messageManifest_ = com.google.protobuf.ByteString.EMPTY; + result.messageManifest_ = getDefaultInstance().getMessageManifest(); return this; } @@ -564,7 +559,7 @@ public final class RemoteProtocol { } public Builder clearMethod() { result.hasMethod = false; - result.method_ = ""; + result.method_ = getDefaultInstance().getMethod(); return this; } @@ -585,7 +580,7 @@ public final class RemoteProtocol { } public Builder clearTarget() { result.hasTarget = false; - result.target_ = ""; + result.target_ = getDefaultInstance().getTarget(); return this; } @@ -624,7 +619,7 @@ public final class RemoteProtocol { } public Builder clearSupervisorUuid() { result.hasSupervisorUuid = false; - result.supervisorUuid_ = ""; + result.supervisorUuid_ = getDefaultInstance().getSupervisorUuid(); return this; } @@ -686,6 +681,10 @@ public final class RemoteProtocol { static { se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.getDescriptor(); } + + static { + se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.internalForceInit(); + } } public static final class RemoteReply extends @@ -707,7 +706,6 @@ public final class RemoteProtocol { return se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.internal_static_se_scalablesolutions_akka_nio_protobuf_RemoteReply_descriptor; } - @Override protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.internal_static_se_scalablesolutions_akka_nio_protobuf_RemoteReply_fieldAccessorTable; @@ -769,7 +767,6 @@ public final class RemoteProtocol { public boolean hasIsSuccessful() { return hasIsSuccessful; } public boolean getIsSuccessful() { return isSuccessful_; } - @Override public final boolean isInitialized() { if (!hasId) return false; if (!hasIsActor) return false; @@ -777,7 +774,6 @@ public final class RemoteProtocol { return true; } - @Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (hasId()) { @@ -808,7 +804,6 @@ public final class RemoteProtocol { } private int memoizedSerializedSize = -1; - @Override public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; @@ -858,7 +853,7 @@ public final class RemoteProtocol { } public static se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply parseFrom( com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistry extensionRegistry) + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); @@ -869,7 +864,7 @@ public final class RemoteProtocol { } public static se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply parseFrom( byte[] data, - com.google.protobuf.ExtensionRegistry extensionRegistry) + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); @@ -880,7 +875,7 @@ public final class RemoteProtocol { } public static se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply parseFrom( java.io.InputStream input, - com.google.protobuf.ExtensionRegistry extensionRegistry) + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); @@ -891,7 +886,7 @@ public final class RemoteProtocol { } public static se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply parseDelimitedFrom( java.io.InputStream input, - com.google.protobuf.ExtensionRegistry extensionRegistry) + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return newBuilder().mergeDelimitedFrom(input, extensionRegistry) .buildParsed(); @@ -903,43 +898,49 @@ public final class RemoteProtocol { } public static se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply parseFrom( com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistry extensionRegistry) + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - public static Builder newBuilder() { return new Builder(); } - public Builder newBuilderForType() { return new Builder(); } + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply prototype) { - return new Builder().mergeFrom(prototype); + return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder { + private se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply result; + // Construct using se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply.newBuilder() private Builder() {} - se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply result = new se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply(); + private static Builder create() { + Builder builder = new Builder(); + builder.result = new se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply(); + return builder; + } - @Override protected se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply internalGetResult() { return result; } - @Override public Builder clear() { + if (result == null) { + throw new IllegalStateException( + "Cannot call clear() after build()."); + } result = new se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply(); return this; } - @Override public Builder clone() { - return new Builder().mergeFrom(result); + return create().mergeFrom(result); } - @Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply.getDescriptor(); @@ -949,10 +950,12 @@ public final class RemoteProtocol { return se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply.getDefaultInstance(); } + public boolean isInitialized() { + return result.isInitialized(); + } public se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply build() { if (result != null && !isInitialized()) { - throw new com.google.protobuf.UninitializedMessageException( - result); + throw newUninitializedMessageException(result); } return buildPartial(); } @@ -960,7 +963,7 @@ public final class RemoteProtocol { private se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { if (!isInitialized()) { - throw new com.google.protobuf.UninitializedMessageException( + throw newUninitializedMessageException( result).asInvalidProtocolBufferException(); } return buildPartial(); @@ -969,13 +972,13 @@ public final class RemoteProtocol { public se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply buildPartial() { if (result == null) { throw new IllegalStateException( - "build() has already been called on this Builder."); } + "build() has already been called on this Builder."); + } se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply returnMe = result; result = null; return returnMe; } - @Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply) { return mergeFrom((se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.RemoteReply)other); @@ -1015,18 +1018,9 @@ public final class RemoteProtocol { return this; } - @Override - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return mergeFrom(input, - com.google.protobuf.ExtensionRegistry.getEmptyRegistry()); - } - - @Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistry extensionRegistry) + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder( @@ -1135,7 +1129,7 @@ public final class RemoteProtocol { } public Builder clearMessage() { result.hasMessage = false; - result.message_ = com.google.protobuf.ByteString.EMPTY; + result.message_ = getDefaultInstance().getMessage(); return this; } @@ -1156,7 +1150,7 @@ public final class RemoteProtocol { } public Builder clearMessageManifest() { result.hasMessageManifest = false; - result.messageManifest_ = com.google.protobuf.ByteString.EMPTY; + result.messageManifest_ = getDefaultInstance().getMessageManifest(); return this; } @@ -1177,7 +1171,7 @@ public final class RemoteProtocol { } public Builder clearException() { result.hasException = false; - result.exception_ = ""; + result.exception_ = getDefaultInstance().getException(); return this; } @@ -1198,7 +1192,7 @@ public final class RemoteProtocol { } public Builder clearSupervisorUuid() { result.hasSupervisorUuid = false; - result.supervisorUuid_ = ""; + result.supervisorUuid_ = getDefaultInstance().getSupervisorUuid(); return this; } @@ -1242,6 +1236,10 @@ public final class RemoteProtocol { static { se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.getDescriptor(); } + + static { + se.scalablesolutions.akka.nio.protobuf.RemoteProtocol.internalForceInit(); + } } private static com.google.protobuf.Descriptors.Descriptor @@ -1262,7 +1260,7 @@ public final class RemoteProtocol { private static com.google.protobuf.Descriptors.FileDescriptor descriptor; static { - java.lang.String descriptorData = + java.lang.String[] descriptorData = { "\n;se/scalablesolutions/akka/nio/protobuf" + "/RemoteProtocol.proto\022&se.scalablesoluti" + "ons.akka.nio.protobuf\"\326\001\n\rRemoteRequest\022" + @@ -1272,10 +1270,11 @@ public final class RemoteProtocol { "\022\026\n\016supervisorUuid\030\010 \001(\t\022\017\n\007isActor\030\t \002(" + "\010\022\020\n\010isOneWay\030\n \002(\010\022\021\n\tisEscaped\030\013 \002(\010\"\247" + "\001\n\013RemoteReply\022\n\n\002id\030\001 \002(\004\022\020\n\010protocol\030\002" + - " \001(\r\022\017\n\007message\030\003 \001(\014\022\027\n\017messageManifest" + + " \001(\r\022\017\n\007message\030\003 \001(\014\022\027\n\017messageManifest", "\030\004 \001(\014\022\021\n\texception\030\005 \001(\t\022\026\n\016supervisorU" + "uid\030\006 \001(\t\022\017\n\007isActor\030\007 \002(\010\022\024\n\014isSuccessf" + - "ul\030\010 \002(\010B\002H\001"; + "ul\030\010 \002(\010B\002H\001" + }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { public com.google.protobuf.ExtensionRegistry assignDescriptors( @@ -1305,4 +1304,6 @@ public final class RemoteProtocol { new com.google.protobuf.Descriptors.FileDescriptor[] { }, assigner); } + + public static void internalForceInit() {} } diff --git a/embedded-repo/com/google/protobuf/protobuf-java/2.1.0/protobuf-java-2.1.0.jar b/embedded-repo/com/google/protobuf/protobuf-java/2.1.0/protobuf-java-2.1.0.jar deleted file mode 100644 index 961d55122a..0000000000 Binary files a/embedded-repo/com/google/protobuf/protobuf-java/2.1.0/protobuf-java-2.1.0.jar and /dev/null differ diff --git a/embedded-repo/com/google/protobuf/protobuf-java/2.1.0/protobuf-java-2.1.0.pom b/embedded-repo/com/google/protobuf/protobuf-java/2.1.0/protobuf-java-2.1.0.pom deleted file mode 100644 index f40c24adcf..0000000000 --- a/embedded-repo/com/google/protobuf/protobuf-java/2.1.0/protobuf-java-2.1.0.pom +++ /dev/null @@ -1,8 +0,0 @@ - - - 4.0.0 - com.google.protobuf - protobuf-java - 2.1.0 - jar - \ No newline at end of file diff --git a/embedded-repo/sjson/json/sjson/0.1/sjson-0.1.jar b/embedded-repo/sjson/json/sjson/0.1/sjson-0.1.jar deleted file mode 100644 index 0265f14990..0000000000 Binary files a/embedded-repo/sjson/json/sjson/0.1/sjson-0.1.jar and /dev/null differ