You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by sc...@apache.org on 2009/01/29 17:38:03 UTC
svn commit: r738915 [4/7] - in /incubator/etch/trunk: ./
binding-csharp/compiler/
binding-csharp/compiler/src/main/java/etch/bindings/csharp/compiler/
binding-csharp/compiler/src/main/java/org/
binding-csharp/compiler/src/main/java/org/apache/ binding-...
Copied: incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/TestMessagizer.java (from r738231, incubator/etch/trunk/binding-java/runtime/src/test/java/etch/bindings/java/transport/TestMessagizer.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/TestMessagizer.java?p2=incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/TestMessagizer.java&p1=incubator/etch/trunk/binding-java/runtime/src/test/java/etch/bindings/java/transport/TestMessagizer.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/runtime/src/test/java/etch/bindings/java/transport/TestMessagizer.java (original)
+++ incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/TestMessagizer.java Thu Jan 29 16:37:49 2009
@@ -15,30 +15,33 @@
* under the License.
*/
-package etch.bindings.java.transport;
+package org.apache.etch.bindings.java.transport;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
+import org.apache.etch.bindings.java.msg.Field;
+import org.apache.etch.bindings.java.msg.Message;
+import org.apache.etch.bindings.java.msg.Type;
+import org.apache.etch.bindings.java.msg.TypeMap;
+import org.apache.etch.bindings.java.msg.ValueFactory;
+import org.apache.etch.bindings.java.support.Class2TypeMap;
+import org.apache.etch.bindings.java.support.DefaultValueFactory;
+import org.apache.etch.bindings.java.support.Validator_int;
+import org.apache.etch.bindings.java.support.Validator_long;
+import org.apache.etch.bindings.java.transport.Messagizer;
+import org.apache.etch.bindings.java.transport.SessionMessage;
+import org.apache.etch.bindings.java.transport.UnwantedMessage;
+import org.apache.etch.util.FlexBuffer;
+import org.apache.etch.util.Resources;
+import org.apache.etch.util.core.Who;
+import org.apache.etch.util.core.io.SessionPacket;
+import org.apache.etch.util.core.io.Transport;
+import org.apache.etch.util.core.io.TransportPacket;
import org.junit.Test;
-import etch.bindings.java.msg.Field;
-import etch.bindings.java.msg.Message;
-import etch.bindings.java.msg.Type;
-import etch.bindings.java.msg.TypeMap;
-import etch.bindings.java.msg.ValueFactory;
-import etch.bindings.java.support.Class2TypeMap;
-import etch.bindings.java.support.DefaultValueFactory;
-import etch.bindings.java.support.Validator_int;
-import etch.bindings.java.support.Validator_long;
-import etch.util.FlexBuffer;
-import etch.util.Resources;
-import etch.util.core.Who;
-import etch.util.core.io.SessionPacket;
-import etch.util.core.io.Transport;
-import etch.util.core.io.TransportPacket;
/** */
public class TestMessagizer
Copied: incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/TestPlainMailbox.java (from r738231, incubator/etch/trunk/binding-java/runtime/src/test/java/etch/bindings/java/transport/TestPlainMailbox.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/TestPlainMailbox.java?p2=incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/TestPlainMailbox.java&p1=incubator/etch/trunk/binding-java/runtime/src/test/java/etch/bindings/java/transport/TestPlainMailbox.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/runtime/src/test/java/etch/bindings/java/transport/TestPlainMailbox.java (original)
+++ incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/TestPlainMailbox.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
* under the License.
*/
-package etch.bindings.java.transport;
+package org.apache.etch.bindings.java.transport;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -25,17 +25,20 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.etch.bindings.java.msg.Message;
+import org.apache.etch.bindings.java.msg.Type;
+import org.apache.etch.bindings.java.msg.ValueFactory;
+import org.apache.etch.bindings.java.support.DummyValueFactory;
+import org.apache.etch.bindings.java.support.Mailbox;
+import org.apache.etch.bindings.java.support.Mailbox.Element;
+import org.apache.etch.bindings.java.support.Mailbox.Notify;
+import org.apache.etch.bindings.java.transport.MailboxManager;
+import org.apache.etch.bindings.java.transport.PlainMailbox;
+import org.apache.etch.bindings.java.transport.SessionMessage;
+import org.apache.etch.util.core.Who;
import org.junit.Ignore;
import org.junit.Test;
-import etch.bindings.java.msg.Message;
-import etch.bindings.java.msg.Type;
-import etch.bindings.java.msg.ValueFactory;
-import etch.bindings.java.support.DummyValueFactory;
-import etch.bindings.java.support.Mailbox;
-import etch.bindings.java.support.Mailbox.Element;
-import etch.bindings.java.support.Mailbox.Notify;
-import etch.util.core.Who;
/** Test of PlainMailbox */
public class TestPlainMailbox
Copied: incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/TestPlainMailboxManager.java (from r738231, incubator/etch/trunk/binding-java/runtime/src/test/java/etch/bindings/java/transport/TestPlainMailboxManager.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/TestPlainMailboxManager.java?p2=incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/TestPlainMailboxManager.java&p1=incubator/etch/trunk/binding-java/runtime/src/test/java/etch/bindings/java/transport/TestPlainMailboxManager.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/runtime/src/test/java/etch/bindings/java/transport/TestPlainMailboxManager.java (original)
+++ incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/TestPlainMailboxManager.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
* under the License.
*/
-package etch.bindings.java.transport;
+package org.apache.etch.bindings.java.transport;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -24,18 +24,21 @@
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
+import org.apache.etch.bindings.java.msg.Message;
+import org.apache.etch.bindings.java.msg.Type;
+import org.apache.etch.bindings.java.msg.TypeMap;
+import org.apache.etch.bindings.java.msg.ValueFactory;
+import org.apache.etch.bindings.java.support.Class2TypeMap;
+import org.apache.etch.bindings.java.support.DefaultValueFactory;
+import org.apache.etch.bindings.java.support.Mailbox;
+import org.apache.etch.bindings.java.support.Validator_long;
+import org.apache.etch.bindings.java.transport.PlainMailboxManager;
+import org.apache.etch.bindings.java.transport.SessionMessage;
+import org.apache.etch.bindings.java.transport.TransportMessage;
+import org.apache.etch.util.core.Who;
+import org.apache.etch.util.core.io.Session;
import org.junit.Test;
-import etch.bindings.java.msg.Message;
-import etch.bindings.java.msg.Type;
-import etch.bindings.java.msg.TypeMap;
-import etch.bindings.java.msg.ValueFactory;
-import etch.bindings.java.support.Class2TypeMap;
-import etch.bindings.java.support.DefaultValueFactory;
-import etch.bindings.java.support.Mailbox;
-import etch.bindings.java.support.Validator_long;
-import etch.util.core.Who;
-import etch.util.core.io.Session;
/** Tests MailboxManager */
public class TestPlainMailboxManager
Copied: incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/TestTcp2TransportFactory.java (from r738231, incubator/etch/trunk/binding-java/runtime/src/test/java/etch/bindings/java/transport/TestTcp2TransportFactory.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/TestTcp2TransportFactory.java?p2=incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/TestTcp2TransportFactory.java&p1=incubator/etch/trunk/binding-java/runtime/src/test/java/etch/bindings/java/transport/TestTcp2TransportFactory.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/runtime/src/test/java/etch/bindings/java/transport/TestTcp2TransportFactory.java (original)
+++ incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/TestTcp2TransportFactory.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
* under the License.
*/
-package etch.bindings.java.transport;
+package org.apache.etch.bindings.java.transport;
import org.junit.Test;
Copied: incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/TestTcpTransportFactory.java (from r738231, incubator/etch/trunk/binding-java/runtime/src/test/java/etch/bindings/java/transport/TestTcpTransportFactory.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/TestTcpTransportFactory.java?p2=incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/TestTcpTransportFactory.java&p1=incubator/etch/trunk/binding-java/runtime/src/test/java/etch/bindings/java/transport/TestTcpTransportFactory.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/runtime/src/test/java/etch/bindings/java/transport/TestTcpTransportFactory.java (original)
+++ incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/TestTcpTransportFactory.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
* under the License.
*/
-package etch.bindings.java.transport;
+package org.apache.etch.bindings.java.transport;
import org.junit.Ignore;
import org.junit.Test;
Copied: incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/TestUnwantedMessage.java (from r738231, incubator/etch/trunk/binding-java/runtime/src/test/java/etch/bindings/java/transport/TestUnwantedMessage.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/TestUnwantedMessage.java?p2=incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/TestUnwantedMessage.java&p1=incubator/etch/trunk/binding-java/runtime/src/test/java/etch/bindings/java/transport/TestUnwantedMessage.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/runtime/src/test/java/etch/bindings/java/transport/TestUnwantedMessage.java (original)
+++ incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/TestUnwantedMessage.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
* under the License.
*/
-package etch.bindings.java.transport;
+package org.apache.etch.bindings.java.transport;
import org.junit.Ignore;
import org.junit.Test;
Modified: incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestKeepAlive.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestKeepAlive.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestKeepAlive.java (original)
+++ incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestKeepAlive.java Thu Jan 29 16:37:49 2009
@@ -15,29 +15,30 @@
* under the License.
*/
-package etch.bindings.java.transport.filters;
+package org.apache.etch.bindings.java.transport.filters;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
+import org.apache.etch.bindings.java.msg.Field;
+import org.apache.etch.bindings.java.msg.Message;
+import org.apache.etch.bindings.java.msg.Type;
+import org.apache.etch.bindings.java.msg.TypeMap;
+import org.apache.etch.bindings.java.support.Class2TypeMap;
+import org.apache.etch.bindings.java.support.DefaultValueFactory;
+import org.apache.etch.bindings.java.support.Validator_int;
+import org.apache.etch.bindings.java.transport.SessionMessage;
+import org.apache.etch.bindings.java.transport.TransportMessage;
+import org.apache.etch.bindings.java.transport.filters.KeepAlive;
+import org.apache.etch.util.Log;
+import org.apache.etch.util.Resources;
+import org.apache.etch.util.URL;
+import org.apache.etch.util.core.Who;
+import org.apache.etch.util.core.io.Session;
+import org.apache.etch.util.core.io.Transport;
import org.junit.Test;
-import etch.bindings.java.msg.Field;
-import etch.bindings.java.msg.Message;
-import etch.bindings.java.msg.Type;
-import etch.bindings.java.msg.TypeMap;
-import etch.bindings.java.support.Class2TypeMap;
-import etch.bindings.java.support.DefaultValueFactory;
-import etch.bindings.java.support.Validator_int;
-import etch.bindings.java.transport.SessionMessage;
-import etch.bindings.java.transport.TransportMessage;
-import etch.util.Log;
-import etch.util.Resources;
-import etch.util.URL;
-import etch.util.core.Who;
-import etch.util.core.io.Session;
-import etch.util.core.io.Transport;
/** */
public class TestKeepAlive
Modified: incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestLogger.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestLogger.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestLogger.java (original)
+++ incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestLogger.java Thu Jan 29 16:37:49 2009
@@ -15,27 +15,28 @@
* under the License.
*/
-package etch.bindings.java.transport.filters;
+package org.apache.etch.bindings.java.transport.filters;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertSame;
+import org.apache.etch.bindings.java.msg.Message;
+import org.apache.etch.bindings.java.msg.Type;
+import org.apache.etch.bindings.java.msg.TypeMap;
+import org.apache.etch.bindings.java.support.Class2TypeMap;
+import org.apache.etch.bindings.java.support.DefaultValueFactory;
+import org.apache.etch.bindings.java.transport.SessionMessage;
+import org.apache.etch.bindings.java.transport.TransportMessage;
+import org.apache.etch.bindings.java.transport.filters.Logger;
+import org.apache.etch.util.Log;
+import org.apache.etch.util.Resources;
+import org.apache.etch.util.URL;
+import org.apache.etch.util.core.Who;
+import org.apache.etch.util.core.io.Session;
+import org.apache.etch.util.core.io.Transport;
import org.junit.Test;
-import etch.bindings.java.msg.Message;
-import etch.bindings.java.msg.Type;
-import etch.bindings.java.msg.TypeMap;
-import etch.bindings.java.support.Class2TypeMap;
-import etch.bindings.java.support.DefaultValueFactory;
-import etch.bindings.java.transport.SessionMessage;
-import etch.bindings.java.transport.TransportMessage;
-import etch.util.Log;
-import etch.util.Resources;
-import etch.util.URL;
-import etch.util.core.Who;
-import etch.util.core.io.Session;
-import etch.util.core.io.Transport;
/** */
public class TestLogger
Modified: incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestPwAuth.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestPwAuth.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestPwAuth.java (original)
+++ incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/filters/TestPwAuth.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
* under the License.
*/
-package etch.bindings.java.transport.filters;
+package org.apache.etch.bindings.java.transport.filters;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -23,22 +23,23 @@
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
+import org.apache.etch.bindings.java.msg.Field;
+import org.apache.etch.bindings.java.msg.Message;
+import org.apache.etch.bindings.java.msg.TypeMap;
+import org.apache.etch.bindings.java.support.Class2TypeMap;
+import org.apache.etch.bindings.java.support.DefaultValueFactory;
+import org.apache.etch.bindings.java.transport.SessionMessage;
+import org.apache.etch.bindings.java.transport.TransportMessage;
+import org.apache.etch.bindings.java.transport.filters.PwAuth;
+import org.apache.etch.bindings.java.transport.filters.PwAuth.UserPassword;
+import org.apache.etch.util.Log;
+import org.apache.etch.util.Resources;
+import org.apache.etch.util.URL;
+import org.apache.etch.util.core.Who;
+import org.apache.etch.util.core.io.Session;
+import org.apache.etch.util.core.io.Transport;
import org.junit.Test;
-import etch.bindings.java.msg.Field;
-import etch.bindings.java.msg.Message;
-import etch.bindings.java.msg.TypeMap;
-import etch.bindings.java.support.Class2TypeMap;
-import etch.bindings.java.support.DefaultValueFactory;
-import etch.bindings.java.transport.SessionMessage;
-import etch.bindings.java.transport.TransportMessage;
-import etch.bindings.java.transport.filters.PwAuth.UserPassword;
-import etch.util.Log;
-import etch.util.Resources;
-import etch.util.URL;
-import etch.util.core.Who;
-import etch.util.core.io.Session;
-import etch.util.core.io.Transport;
/** */
public class TestPwAuth
Modified: incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/fmt/binary/TestBinaryTaggedDataInOut.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/fmt/binary/TestBinaryTaggedDataInOut.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/fmt/binary/TestBinaryTaggedDataInOut.java (original)
+++ incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/transport/fmt/binary/TestBinaryTaggedDataInOut.java Thu Jan 29 16:37:49 2009
@@ -15,43 +15,46 @@
* under the License.
*/
-package etch.bindings.java.transport.fmt.binary;
+package org.apache.etch.bindings.java.transport.fmt.binary;
import java.io.IOException;
import java.lang.reflect.Array;
import java.util.Date;
+import org.apache.etch.bindings.java.msg.Field;
+import org.apache.etch.bindings.java.msg.Message;
+import org.apache.etch.bindings.java.msg.StructValue;
+import org.apache.etch.bindings.java.msg.Type;
+import org.apache.etch.bindings.java.msg.TypeMap;
+import org.apache.etch.bindings.java.msg.Validator;
+import org.apache.etch.bindings.java.msg.Validator.Level;
+import org.apache.etch.bindings.java.support.Class2TypeMap;
+import org.apache.etch.bindings.java.support.DefaultValueFactory;
+import org.apache.etch.bindings.java.support.Validator_boolean;
+import org.apache.etch.bindings.java.support.Validator_byte;
+import org.apache.etch.bindings.java.support.Validator_double;
+import org.apache.etch.bindings.java.support.Validator_float;
+import org.apache.etch.bindings.java.support.Validator_int;
+import org.apache.etch.bindings.java.support.Validator_long;
+import org.apache.etch.bindings.java.support.Validator_object;
+import org.apache.etch.bindings.java.support.Validator_short;
+import org.apache.etch.bindings.java.support.Validator_string;
+import org.apache.etch.bindings.java.transport.Messagizer;
+import org.apache.etch.bindings.java.transport.fmt.TypeCode;
+import org.apache.etch.bindings.java.transport.fmt.binary.BinaryTaggedData;
+import org.apache.etch.bindings.java.transport.fmt.binary.BinaryTaggedDataInput;
+import org.apache.etch.bindings.java.transport.fmt.binary.BinaryTaggedDataOutput;
+import org.apache.etch.util.FlexBuffer;
+import org.apache.etch.util.Log;
+import org.apache.etch.util.Resources;
+import org.apache.etch.util.URL;
+import org.apache.etch.util.core.Who;
+import org.apache.etch.util.core.io.SessionPacket;
+import org.apache.etch.util.core.io.Transport;
+import org.apache.etch.util.core.io.TransportPacket;
import org.junit.Assert;
import org.junit.Test;
-import etch.bindings.java.msg.Field;
-import etch.bindings.java.msg.Message;
-import etch.bindings.java.msg.StructValue;
-import etch.bindings.java.msg.Type;
-import etch.bindings.java.msg.TypeMap;
-import etch.bindings.java.msg.Validator;
-import etch.bindings.java.msg.Validator.Level;
-import etch.bindings.java.support.Class2TypeMap;
-import etch.bindings.java.support.DefaultValueFactory;
-import etch.bindings.java.support.Validator_boolean;
-import etch.bindings.java.support.Validator_byte;
-import etch.bindings.java.support.Validator_double;
-import etch.bindings.java.support.Validator_float;
-import etch.bindings.java.support.Validator_int;
-import etch.bindings.java.support.Validator_long;
-import etch.bindings.java.support.Validator_object;
-import etch.bindings.java.support.Validator_short;
-import etch.bindings.java.support.Validator_string;
-import etch.bindings.java.transport.Messagizer;
-import etch.bindings.java.transport.fmt.TypeCode;
-import etch.util.FlexBuffer;
-import etch.util.Log;
-import etch.util.Resources;
-import etch.util.URL;
-import etch.util.core.Who;
-import etch.util.core.io.SessionPacket;
-import etch.util.core.io.Transport;
-import etch.util.core.io.TransportPacket;
/**
* Test binary input and output.
Modified: incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/util/TestDateSerializer.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/util/TestDateSerializer.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/util/TestDateSerializer.java (original)
+++ incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/util/TestDateSerializer.java Thu Jan 29 16:37:49 2009
@@ -15,20 +15,21 @@
* under the License.
*/
-package etch.bindings.java.util;
+package org.apache.etch.bindings.java.util;
import static org.junit.Assert.assertEquals;
import java.util.Date;
+import org.apache.etch.bindings.java.msg.ImportExportHelper;
+import org.apache.etch.bindings.java.msg.StructValue;
+import org.apache.etch.bindings.java.msg.Type;
+import org.apache.etch.bindings.java.msg.ValueFactory;
+import org.apache.etch.bindings.java.support.Class2TypeMap;
+import org.apache.etch.bindings.java.support.DummyValueFactory;
+import org.apache.etch.bindings.java.util.DateSerializer;
import org.junit.Test;
-import etch.bindings.java.msg.ImportExportHelper;
-import etch.bindings.java.msg.StructValue;
-import etch.bindings.java.msg.Type;
-import etch.bindings.java.msg.ValueFactory;
-import etch.bindings.java.support.Class2TypeMap;
-import etch.bindings.java.support.DummyValueFactory;
/** Tests DateSerializer */
public class TestDateSerializer
Modified: incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/util/TestStrIntHashMapSerializer.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/util/TestStrIntHashMapSerializer.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/util/TestStrIntHashMapSerializer.java (original)
+++ incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/util/TestStrIntHashMapSerializer.java Thu Jan 29 16:37:49 2009
@@ -15,18 +15,20 @@
* under the License.
*/
-package etch.bindings.java.util;
+package org.apache.etch.bindings.java.util;
import static org.junit.Assert.assertEquals;
+import org.apache.etch.bindings.java.msg.ImportExportHelper;
+import org.apache.etch.bindings.java.msg.StructValue;
+import org.apache.etch.bindings.java.msg.Type;
+import org.apache.etch.bindings.java.msg.ValueFactory;
+import org.apache.etch.bindings.java.support.Class2TypeMap;
+import org.apache.etch.bindings.java.support.DummyValueFactory;
+import org.apache.etch.bindings.java.util.StrIntHashMap;
+import org.apache.etch.bindings.java.util.StrIntHashMapSerializer;
import org.junit.Test;
-import etch.bindings.java.msg.ImportExportHelper;
-import etch.bindings.java.msg.StructValue;
-import etch.bindings.java.msg.Type;
-import etch.bindings.java.msg.ValueFactory;
-import etch.bindings.java.support.Class2TypeMap;
-import etch.bindings.java.support.DummyValueFactory;
/** Tests StrIntHashMapSerializer */
public class TestStrIntHashMapSerializer
Modified: incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/util/TestStrStrHashMapSerializer.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/util/TestStrStrHashMapSerializer.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/util/TestStrStrHashMapSerializer.java (original)
+++ incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/util/TestStrStrHashMapSerializer.java Thu Jan 29 16:37:49 2009
@@ -15,18 +15,20 @@
* under the License.
*/
-package etch.bindings.java.util;
+package org.apache.etch.bindings.java.util;
import static org.junit.Assert.assertEquals;
+import org.apache.etch.bindings.java.msg.ImportExportHelper;
+import org.apache.etch.bindings.java.msg.StructValue;
+import org.apache.etch.bindings.java.msg.Type;
+import org.apache.etch.bindings.java.msg.ValueFactory;
+import org.apache.etch.bindings.java.support.Class2TypeMap;
+import org.apache.etch.bindings.java.support.DummyValueFactory;
+import org.apache.etch.bindings.java.util.StrStrHashMap;
+import org.apache.etch.bindings.java.util.StrStrHashMapSerializer;
import org.junit.Test;
-import etch.bindings.java.msg.ImportExportHelper;
-import etch.bindings.java.msg.StructValue;
-import etch.bindings.java.msg.Type;
-import etch.bindings.java.msg.ValueFactory;
-import etch.bindings.java.support.Class2TypeMap;
-import etch.bindings.java.support.DummyValueFactory;
/** Tests StrStrHashMapSerializer */
public class TestStrStrHashMapSerializer
Modified: incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/util/TestURLSerializer.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/util/TestURLSerializer.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/util/TestURLSerializer.java (original)
+++ incubator/etch/trunk/binding-java/runtime/src/test/java/org/apache/etch/bindings/java/util/TestURLSerializer.java Thu Jan 29 16:37:49 2009
@@ -15,19 +15,20 @@
* under the License.
*/
-package etch.bindings.java.util;
+package org.apache.etch.bindings.java.util;
import static org.junit.Assert.assertEquals;
+import org.apache.etch.bindings.java.msg.ImportExportHelper;
+import org.apache.etch.bindings.java.msg.StructValue;
+import org.apache.etch.bindings.java.msg.Type;
+import org.apache.etch.bindings.java.msg.ValueFactory;
+import org.apache.etch.bindings.java.support.Class2TypeMap;
+import org.apache.etch.bindings.java.support.DummyValueFactory;
+import org.apache.etch.bindings.java.util.URLSerializer;
+import org.apache.etch.util.URL;
import org.junit.Test;
-import etch.bindings.java.msg.ImportExportHelper;
-import etch.bindings.java.msg.StructValue;
-import etch.bindings.java.msg.Type;
-import etch.bindings.java.msg.ValueFactory;
-import etch.bindings.java.support.Class2TypeMap;
-import etch.bindings.java.support.DummyValueFactory;
-import etch.util.URL;
/** Tests URLSerializer */
public class TestURLSerializer
Modified: incubator/etch/trunk/binding-xml/compiler/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-xml/compiler/build.xml?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/binding-xml/compiler/build.xml (original)
+++ incubator/etch/trunk/binding-xml/compiler/build.xml Thu Jan 29 16:37:49 2009
@@ -84,7 +84,7 @@
<attribute name="SVN-Revision" value="${Etch.runtime.revisionNumber}" />
</manifest>
<fileset dir="${classesDirectory}/main">
- <include name="etch/bindings/**" />
+ <include name="org/apache/etch/bindings/**" />
<!-- <include name="resources/**" /> -->
</fileset>
</jar>
@@ -94,7 +94,7 @@
<!-- package up etch-xml-compiler src -->
<zip destfile="@{dist}/lib/${etch-xml-compiler-src.zip}" >
<fileset dir="${src}/main/java" >
- <include name="etch/bindings/**/*.java" />
+ <include name="org/apache/etch/bindings/**/*.java" />
</fileset>
<fileset dir="${src}/main/resources" >
<include name="**/*" />
@@ -125,7 +125,7 @@
<target name="generate-sources" >
<!-- Generate version info -->
- <update-tokens filename="${src}/main/java/etch/bindings/xml/compiler/CompilerVersion.java" />
+ <update-tokens filename="${src}/main/java/org/apache/etch/bindings/xml/compiler/CompilerVersion.java" />
</target>
<target name="compile-for-dist" >
Modified: incubator/etch/trunk/binding-xml/compiler/src/main/java/org/apache/etch/bindings/xml/compiler/Compiler.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-xml/compiler/src/main/java/org/apache/etch/bindings/xml/compiler/Compiler.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/binding-xml/compiler/src/main/java/org/apache/etch/bindings/xml/compiler/Compiler.java (original)
+++ incubator/etch/trunk/binding-xml/compiler/src/main/java/org/apache/etch/bindings/xml/compiler/Compiler.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
* under the License.
*/
-package etch.bindings.xml.compiler;
+package org.apache.etch.bindings.xml.compiler;
import java.io.IOException;
import java.io.PrintWriter;
@@ -25,6 +25,32 @@
import java.util.List;
import java.util.Set;
+import org.apache.etch.compiler.Backend;
+import org.apache.etch.compiler.CmdLineOptions;
+import org.apache.etch.compiler.EtchGrammarConstants;
+import org.apache.etch.compiler.LogHandler;
+import org.apache.etch.compiler.Output;
+import org.apache.etch.compiler.ParseException;
+import org.apache.etch.compiler.Token;
+import org.apache.etch.compiler.Version;
+import org.apache.etch.compiler.ast.Except;
+import org.apache.etch.compiler.ast.Extern;
+import org.apache.etch.compiler.ast.Item;
+import org.apache.etch.compiler.ast.Message;
+import org.apache.etch.compiler.ast.MessageDirection;
+import org.apache.etch.compiler.ast.Module;
+import org.apache.etch.compiler.ast.MsgDirHelper;
+import org.apache.etch.compiler.ast.Named;
+import org.apache.etch.compiler.ast.ParamList;
+import org.apache.etch.compiler.ast.Parameter;
+import org.apache.etch.compiler.ast.Service;
+import org.apache.etch.compiler.ast.Thrown;
+import org.apache.etch.compiler.ast.TypeRef;
+import org.apache.etch.compiler.opt.ToString;
+import org.apache.etch.compiler.opt.ToString.FieldItem;
+import org.apache.etch.compiler.opt.ToString.FmtItem;
+import org.apache.etch.compiler.opt.ToString.StringItem;
+import org.apache.etch.util.Hash;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
@@ -32,32 +58,6 @@
import org.apache.velocity.runtime.RuntimeServices;
import org.apache.velocity.runtime.log.LogChute;
-import etch.compiler.Backend;
-import etch.compiler.CmdLineOptions;
-import etch.compiler.EtchGrammarConstants;
-import etch.compiler.LogHandler;
-import etch.compiler.Output;
-import etch.compiler.ParseException;
-import etch.compiler.Token;
-import etch.compiler.Version;
-import etch.compiler.ast.Except;
-import etch.compiler.ast.Extern;
-import etch.compiler.ast.Item;
-import etch.compiler.ast.Message;
-import etch.compiler.ast.MessageDirection;
-import etch.compiler.ast.Module;
-import etch.compiler.ast.MsgDirHelper;
-import etch.compiler.ast.Named;
-import etch.compiler.ast.ParamList;
-import etch.compiler.ast.Parameter;
-import etch.compiler.ast.Service;
-import etch.compiler.ast.Thrown;
-import etch.compiler.ast.TypeRef;
-import etch.compiler.opt.ToString;
-import etch.compiler.opt.ToString.FieldItem;
-import etch.compiler.opt.ToString.FmtItem;
-import etch.compiler.opt.ToString.StringItem;
-import etch.util.Hash;
/**
* Compiler is a helper class not only for Backend, but also
@@ -66,8 +66,8 @@
*/
public class Compiler extends Backend
{
- private final static String tmplPath1 = "etch/bindings/xml/compiler/";
- private final static String tmplPath2 = "resources/etch/bindings/xml/compiler/";
+ private final static String tmplPath1 = "org/apache/etch/bindings/xml/compiler/";
+ private final static String tmplPath2 = "resources/org/apache/etch/bindings/xml/compiler/";
private final static String fnSuffix = ".xml";
@@ -596,7 +596,7 @@
*/
public String protectAttr(String unprotected) throws IOException
{
- return etch.util.core.xml.XmlParser.ProtectAttrValue.toString(unprotected);
+ return org.apache.etch.util.core.xml.XmlParser.ProtectAttrValue.toString(unprotected);
}
/**
@@ -606,7 +606,7 @@
*/
public String protectCData(String unprotected) throws IOException
{
- return etch.util.core.xml.XmlParser.ProtectCData.toString(unprotected);
+ return org.apache.etch.util.core.xml.XmlParser.ProtectCData.toString(unprotected);
}
@Override
Modified: incubator/etch/trunk/binding-xml/compiler/src/main/java/org/apache/etch/bindings/xml/compiler/CompilerVersion.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-xml/compiler/src/main/java/org/apache/etch/bindings/xml/compiler/CompilerVersion.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/binding-xml/compiler/src/main/java/org/apache/etch/bindings/xml/compiler/CompilerVersion.java (original)
+++ incubator/etch/trunk/binding-xml/compiler/src/main/java/org/apache/etch/bindings/xml/compiler/CompilerVersion.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
* under the License.
*/
-package etch.bindings.xml.compiler;
+package org.apache.etch.bindings.xml.compiler;
/**
* The version info of this Etch backend (compiler).
@@ -26,5 +26,5 @@
// of VERSION below with whatever it wants the version string to actually be.
/** The version of this Etch backend (compiler) */
- public String VERSION = "xml 1.0.0 (LOCAL-0)";
+ public String VERSION = "xml 1.1.0 (LOCAL-0)";
}
Modified: incubator/etch/trunk/binding-xml/compiler/src/main/java/org/apache/etch/bindings/xml/compiler/CompilerVersion.java.tmpl
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-xml/compiler/src/main/java/org/apache/etch/bindings/xml/compiler/CompilerVersion.java.tmpl?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/binding-xml/compiler/src/main/java/org/apache/etch/bindings/xml/compiler/CompilerVersion.java.tmpl (original)
+++ incubator/etch/trunk/binding-xml/compiler/src/main/java/org/apache/etch/bindings/xml/compiler/CompilerVersion.java.tmpl Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
* under the License.
*/
-package etch.bindings.xml.compiler;
+package org.apache.etch.bindings.xml.compiler;
/**
* The version info of this Etch backend (compiler).
Modified: incubator/etch/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/build.xml?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/build.xml (original)
+++ incubator/etch/trunk/build.xml Thu Jan 29 16:37:49 2009
@@ -112,10 +112,10 @@
<target name="extra-clean">
<!-- remove files that were overwritten by the filtered copy -->
- <delete file="compiler/src/main/java/etch/compiler/Version.java" />
- <delete file="binding-java/compiler/src/main/java/etch/bindings/java/compiler/CompilerVersion.java" />
- <delete file="binding-xml/compiler/src/main/java/etch/bindings/xml/compiler/CompilerVersion.java" />
- <delete file="binding-csharp/compiler/src/main/java/etch/bindings/csharp/compiler/CompilerVersion.java" />
+ <delete file="compiler/src/main/java/org/apache/etch/compiler/Version.java" />
+ <delete file="binding-java/compiler/src/main/java/org/apache/etch/bindings/java/compiler/CompilerVersion.java" />
+ <delete file="binding-xml/compiler/src/main/java/org/apache/etch/bindings/xml/compiler/CompilerVersion.java" />
+ <delete file="binding-csharp/compiler/src/main/java/org/apache/etch/bindings/csharp/compiler/CompilerVersion.java" />
<delete file="binding-csharp/runtime/src/main/csharp/Properties/AssemblyInfo.cs" />
</target>
Modified: incubator/etch/trunk/compiler/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/build.xml?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/build.xml (original)
+++ incubator/etch/trunk/compiler/build.xml Thu Jan 29 16:37:49 2009
@@ -102,7 +102,7 @@
<attribute name="Main-Class" value="etch.compiler.EtchMain" />
</manifest>
<fileset dir="${classesDirectory}/main">
- <include name="etch/compiler/**" />
+ <include name="org/apache/etch/compiler/**" />
<!-- <include name="resources/**" /> -->
</fileset>
</jar>
@@ -119,7 +119,7 @@
<!-- package up etch-compiler source -->
<zip destfile="@{support}/lib/${etch-compiler-src.zip}" >
<fileset dir="${src}/main/java" >
- <include name="etch/compiler/**/*.java" />
+ <include name="org/apache/etch/compiler/**/*.java" />
</fileset>
<fileset dir="${src}/main/resources" >
<include name="**/*.kwd" />
@@ -191,14 +191,14 @@
<target name="generate-sources" >
<!-- Generate version info -->
- <update-tokens filename="${src}/main/java/etch/compiler/Version.java" />
+ <update-tokens filename="${src}/main/java/org/apache/etch/compiler/Version.java" />
<!-- Generate Parser -->
- <mkdir dir="${generatedSrc}/main/javacc/java/etch/compiler" />
+ <mkdir dir="${generatedSrc}/main/javacc/java/org/apache/etch/compiler" />
<javacc
target="${src}/main/javacc/EtchGrammar.jj"
javacchome="${Etch.dependency.javacc.home}"
- outputdirectory="${generatedSrc}/main/javacc/java/etch/compiler"
+ outputdirectory="${generatedSrc}/main/javacc/java/org/apache/etch/compiler"
/>
</target>
@@ -265,7 +265,7 @@
<formatter type="xml"/>
<batchtest fork="true" todir="${testResultsDirectory}">
<fileset dir="${src}/test/java">
- <include name="etch/compiler/**/Test*.java" />
+ <include name="org/apache/etch/compiler/**/Test*.java" />
<!-- TODO: Move TestEtch to Java binding -->
<exclude name="**/TestEtch.java" />
</fileset>
Copied: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/AbstractLogHandler.java (from r738231, incubator/etch/trunk/compiler/src/main/java/etch/compiler/AbstractLogHandler.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/AbstractLogHandler.java?p2=incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/AbstractLogHandler.java&p1=incubator/etch/trunk/compiler/src/main/java/etch/compiler/AbstractLogHandler.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/etch/compiler/AbstractLogHandler.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/AbstractLogHandler.java Thu Jan 29 16:37:49 2009
@@ -15,11 +15,14 @@
* under the License.
*/
-package etch.compiler;
+package org.apache.etch.compiler;
import java.util.Stack;
-import etch.util.Assertion;
+import org.apache.etch.compiler.Token;
+import org.apache.etch.util.Assertion;
+
+
/**
* Abstract implementation of LogHandler. Subclasser must implement
Copied: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/Backend.java (from r738231, incubator/etch/trunk/compiler/src/main/java/etch/compiler/Backend.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/Backend.java?p2=incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/Backend.java&p1=incubator/etch/trunk/compiler/src/main/java/etch/compiler/Backend.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/etch/compiler/Backend.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/Backend.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
* under the License.
*/
-package etch.compiler;
+package org.apache.etch.compiler;
import java.io.BufferedReader;
import java.io.FileInputStream;
@@ -31,25 +31,29 @@
import java.util.Set;
import java.util.StringTokenizer;
-import etch.compiler.ast.Message;
-import etch.compiler.ast.MessageDirection;
-import etch.compiler.ast.Module;
-import etch.compiler.ast.Name;
-import etch.compiler.ast.Named;
-import etch.compiler.ast.Opt;
-import etch.compiler.ast.ParamList;
-import etch.compiler.ast.Service;
-import etch.compiler.ast.TypeRef;
-import etch.compiler.opt.Extern;
-import etch.util.Assertion;
+import org.apache.etch.compiler.EtchGrammarConstants;
+import org.apache.etch.compiler.ParseException;
+import org.apache.etch.compiler.Token;
+import org.apache.etch.compiler.ast.Message;
+import org.apache.etch.compiler.ast.MessageDirection;
+import org.apache.etch.compiler.ast.Module;
+import org.apache.etch.compiler.ast.Name;
+import org.apache.etch.compiler.ast.Named;
+import org.apache.etch.compiler.ast.Opt;
+import org.apache.etch.compiler.ast.ParamList;
+import org.apache.etch.compiler.ast.Service;
+import org.apache.etch.compiler.ast.TypeRef;
+import org.apache.etch.compiler.opt.Extern;
+import org.apache.etch.util.Assertion;
+
/**
* Generic interface to language (or language/runtime) bindings.
*/
abstract public class Backend
{
- private final static String tmplPath1 = "etch/compiler/";
- private final static String tmplPath2 = "resources/etch/compiler/";
+ private final static String tmplPath1 = "org/apache/etch/compiler/";
+ private final static String tmplPath2 = "resources/org/apache/etch/compiler/";
//////////////////////////
// WHAT DIRECTION GROUP //
@@ -269,7 +273,7 @@
try
{
// Assume file is internal to project:
- // EG) etch/compiler/globalKeywords
+ // EG) org/apache/etch/compiler/globalKeywords
InputStream input = getClass().getClassLoader().getResourceAsStream(filePath);
// Otherwise it's external
Copied: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/CmdLineOptions.java (from r738231, incubator/etch/trunk/compiler/src/main/java/etch/compiler/CmdLineOptions.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/CmdLineOptions.java?p2=incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/CmdLineOptions.java&p1=incubator/etch/trunk/compiler/src/main/java/etch/compiler/CmdLineOptions.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/etch/compiler/CmdLineOptions.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/CmdLineOptions.java Thu Jan 29 16:37:49 2009
@@ -16,7 +16,7 @@
* the License.
*/
-package etch.compiler;
+package org.apache.etch.compiler;
import java.io.File;
import java.util.ArrayList;
Copied: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ConsoleLogHandler.java (from r738231, incubator/etch/trunk/compiler/src/main/java/etch/compiler/ConsoleLogHandler.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ConsoleLogHandler.java?p2=incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ConsoleLogHandler.java&p1=incubator/etch/trunk/compiler/src/main/java/etch/compiler/ConsoleLogHandler.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/etch/compiler/ConsoleLogHandler.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ConsoleLogHandler.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
* under the License.
*/
-package etch.compiler;
+package org.apache.etch.compiler;
import java.io.PrintStream;
Copied: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/Etch2.java (from r738231, incubator/etch/trunk/compiler/src/main/java/etch/compiler/Etch2.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/Etch2.java?p2=incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/Etch2.java&p1=incubator/etch/trunk/compiler/src/main/java/etch/compiler/Etch2.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/etch/compiler/Etch2.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/Etch2.java Thu Jan 29 16:37:49 2009
@@ -1,3 +1,4 @@
+package org.apache.etch.compiler;
///* $Id$
// *
// * Copyright 2007-2008 Cisco Systems Inc.
@@ -210,7 +211,7 @@
// try
// {
// binding = Class.forName( String.format(
-// "etch.bindings.%s.compiler.Compiler", value ) );
+// "org.apache.etch.bindings.%s.compiler.Compiler", value ) );
// return true;
// }
// catch ( ClassNotFoundException e )
@@ -616,7 +617,7 @@
// try
// {
// cl.bindingClass = Class.forName( String.format(
-// "etch.bindings.%s.compiler.Compiler", cl.binding ) );
+// "org.apache.etch.bindings.%s.compiler.Compiler", cl.binding ) );
// return true;
// }
// catch ( ClassNotFoundException e )
Copied: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/EtchCompiler.java (from r738231, incubator/etch/trunk/compiler/src/main/java/etch/compiler/EtchCompiler.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/EtchCompiler.java?p2=incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/EtchCompiler.java&p1=incubator/etch/trunk/compiler/src/main/java/etch/compiler/EtchCompiler.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/etch/compiler/EtchCompiler.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/EtchCompiler.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
* under the License.
*/
-package etch.compiler;
+package org.apache.etch.compiler;
import java.io.BufferedInputStream;
import java.io.File;
@@ -31,10 +31,13 @@
import java.util.Set;
import java.util.StringTokenizer;
-import etch.compiler.ast.Module;
-import etch.compiler.ast.Name;
-import etch.compiler.ast.Opt;
-import etch.compiler.ast.Service;
+import org.apache.etch.compiler.EtchGrammar;
+import org.apache.etch.compiler.ParseException;
+import org.apache.etch.compiler.ast.Module;
+import org.apache.etch.compiler.ast.Name;
+import org.apache.etch.compiler.ast.Opt;
+import org.apache.etch.compiler.ast.Service;
+
/**
* The main driver of the compiler.
@@ -175,7 +178,7 @@
}
}
- private final static String BINDING_FORMAT = "etch.bindings.%s.compiler.Compiler";
+ private final static String BINDING_FORMAT = "org.apache.etch.bindings.%s.compiler.Compiler";
private static boolean checkSourceFile( CmdLineOptions clo )
{
Copied: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/EtchHelper.java (from r738231, incubator/etch/trunk/compiler/src/main/java/etch/compiler/EtchHelper.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/EtchHelper.java?p2=incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/EtchHelper.java&p1=incubator/etch/trunk/compiler/src/main/java/etch/compiler/EtchHelper.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/etch/compiler/EtchHelper.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/EtchHelper.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
* under the License.
*/
-package etch.compiler;
+package org.apache.etch.compiler;
import java.io.File;
import java.io.FileNotFoundException;
@@ -29,19 +29,26 @@
import java.util.List;
import java.util.StringTokenizer;
-import etch.compiler.ast.Constant;
-import etch.compiler.ast.Enumx;
-import etch.compiler.ast.Except;
-import etch.compiler.ast.Item;
-import etch.compiler.ast.Message;
-import etch.compiler.ast.Module;
-import etch.compiler.ast.Name;
-import etch.compiler.ast.Opt;
-import etch.compiler.ast.ParamList;
-import etch.compiler.ast.Parameter;
-import etch.compiler.ast.Service;
-import etch.compiler.ast.Struct;
-import etch.compiler.ast.Thrown;
+import org.apache.etch.compiler.EtchGrammar;
+import org.apache.etch.compiler.EtchGrammarConstants;
+import org.apache.etch.compiler.EtchGrammarTokenManager;
+import org.apache.etch.compiler.ParseException;
+import org.apache.etch.compiler.SimpleCharStream;
+import org.apache.etch.compiler.Token;
+import org.apache.etch.compiler.ast.Constant;
+import org.apache.etch.compiler.ast.Enumx;
+import org.apache.etch.compiler.ast.Except;
+import org.apache.etch.compiler.ast.Item;
+import org.apache.etch.compiler.ast.Message;
+import org.apache.etch.compiler.ast.Module;
+import org.apache.etch.compiler.ast.Name;
+import org.apache.etch.compiler.ast.Opt;
+import org.apache.etch.compiler.ast.ParamList;
+import org.apache.etch.compiler.ast.Parameter;
+import org.apache.etch.compiler.ast.Service;
+import org.apache.etch.compiler.ast.Struct;
+import org.apache.etch.compiler.ast.Thrown;
+
/**
* Compiler support routines.
@@ -521,7 +528,7 @@
*/
protected Opt makeOpt( Name n, List<Token> list ) throws ParseException
{
- String cn = "etch.compiler.opt."+n.token.image;
+ String cn = "org.apache.etch.compiler.opt."+n.token.image;
Class<?> c;
try
Copied: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/EtchMain.java (from r738231, incubator/etch/trunk/compiler/src/main/java/etch/compiler/EtchMain.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/EtchMain.java?p2=incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/EtchMain.java&p1=incubator/etch/trunk/compiler/src/main/java/etch/compiler/EtchMain.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/etch/compiler/EtchMain.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/EtchMain.java Thu Jan 29 16:37:49 2009
@@ -15,15 +15,16 @@
* under the License.
*/
-package etch.compiler;
+package org.apache.etch.compiler;
import java.io.File;
import java.util.StringTokenizer;
-import etch.util.cmd.CommandParser;
-import etch.util.cmd.Option;
-import etch.util.cmd.Parameter;
-import etch.util.cmd.Program;
+import org.apache.etch.util.cmd.CommandParser;
+import org.apache.etch.util.cmd.Option;
+import org.apache.etch.util.cmd.Parameter;
+import org.apache.etch.util.cmd.Program;
+
/**
* The main command line interface for the etch compiler.
Copied: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/FileOutput.java (from r738231, incubator/etch/trunk/compiler/src/main/java/etch/compiler/FileOutput.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/FileOutput.java?p2=incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/FileOutput.java&p1=incubator/etch/trunk/compiler/src/main/java/etch/compiler/FileOutput.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/etch/compiler/FileOutput.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/FileOutput.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
* under the License.
*/
-package etch.compiler;
+package org.apache.etch.compiler;
import java.io.ByteArrayOutputStream;
import java.io.File;
Copied: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ListLogHandler.java (from r738231, incubator/etch/trunk/compiler/src/main/java/etch/compiler/ListLogHandler.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ListLogHandler.java?p2=incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ListLogHandler.java&p1=incubator/etch/trunk/compiler/src/main/java/etch/compiler/ListLogHandler.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/etch/compiler/ListLogHandler.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ListLogHandler.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
* under the License.
*/
-package etch.compiler;
+package org.apache.etch.compiler;
import java.util.ArrayList;
import java.util.List;
Copied: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/LogHandler.java (from r738231, incubator/etch/trunk/compiler/src/main/java/etch/compiler/LogHandler.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/LogHandler.java?p2=incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/LogHandler.java&p1=incubator/etch/trunk/compiler/src/main/java/etch/compiler/LogHandler.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/etch/compiler/LogHandler.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/LogHandler.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,9 @@
* under the License.
*/
-package etch.compiler;
+package org.apache.etch.compiler;
+
+import org.apache.etch.compiler.Token;
/**
* This Interface is used for Logging messages. It helps provide a consistent
Copied: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/NullCompiler.java (from r738231, incubator/etch/trunk/compiler/src/main/java/etch/compiler/NullCompiler.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/NullCompiler.java?p2=incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/NullCompiler.java&p1=incubator/etch/trunk/compiler/src/main/java/etch/compiler/NullCompiler.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/etch/compiler/NullCompiler.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/NullCompiler.java Thu Jan 29 16:37:49 2009
@@ -15,16 +15,19 @@
* under the License.
*/
-package etch.compiler;
+package org.apache.etch.compiler;
import java.io.IOException;
-import etch.compiler.ast.Message;
-import etch.compiler.ast.Module;
-import etch.compiler.ast.Named;
-import etch.compiler.ast.ParamList;
-import etch.compiler.ast.Service;
-import etch.compiler.ast.TypeRef;
+import org.apache.etch.compiler.ParseException;
+import org.apache.etch.compiler.Token;
+import org.apache.etch.compiler.ast.Message;
+import org.apache.etch.compiler.ast.Module;
+import org.apache.etch.compiler.ast.Named;
+import org.apache.etch.compiler.ast.ParamList;
+import org.apache.etch.compiler.ast.Service;
+import org.apache.etch.compiler.ast.TypeRef;
+
/**
* Compiler which doesn't generated any code.
Copied: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/NullOutput.java (from r738231, incubator/etch/trunk/compiler/src/main/java/etch/compiler/NullOutput.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/NullOutput.java?p2=incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/NullOutput.java&p1=incubator/etch/trunk/compiler/src/main/java/etch/compiler/NullOutput.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/etch/compiler/NullOutput.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/NullOutput.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
* under the License.
*/
-package etch.compiler;
+package org.apache.etch.compiler;
import java.io.File;
import java.io.IOException;
Copied: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/Output.java (from r738231, incubator/etch/trunk/compiler/src/main/java/etch/compiler/Output.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/Output.java?p2=incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/Output.java&p1=incubator/etch/trunk/compiler/src/main/java/etch/compiler/Output.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/etch/compiler/Output.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/Output.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
* under the License.
*/
-package etch.compiler;
+package org.apache.etch.compiler;
import java.io.File;
import java.io.IOException;
Copied: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/StackInputStream.java (from r738231, incubator/etch/trunk/compiler/src/main/java/etch/compiler/StackInputStream.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/StackInputStream.java?p2=incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/StackInputStream.java&p1=incubator/etch/trunk/compiler/src/main/java/etch/compiler/StackInputStream.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/etch/compiler/StackInputStream.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/StackInputStream.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
* under the License.
*/
-package etch.compiler;
+package org.apache.etch.compiler;
import java.io.IOException;
import java.io.InputStream;
Copied: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/Version.java (from r738231, incubator/etch/trunk/compiler/src/main/java/etch/compiler/Version.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/Version.java?p2=incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/Version.java&p1=incubator/etch/trunk/compiler/src/main/java/etch/compiler/Version.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/etch/compiler/Version.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/Version.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
* under the License.
*/
-package etch.compiler;
+package org.apache.etch.compiler;
/**
* The version info of the Etch frontend (parser)
@@ -23,5 +23,5 @@
public interface Version
{
/** The version of the Etch frontend (parser) */
- public String VERSION = "Etch 1.0.0 (LOCAL-0)";
+ public String VERSION = "Etch 1.1.0 (LOCAL-0)";
}
Copied: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/Version.java.tmpl (from r738231, incubator/etch/trunk/compiler/src/main/java/etch/compiler/Version.java.tmpl)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/Version.java.tmpl?p2=incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/Version.java.tmpl&p1=incubator/etch/trunk/compiler/src/main/java/etch/compiler/Version.java.tmpl&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/etch/compiler/Version.java.tmpl (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/Version.java.tmpl Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
* under the License.
*/
-package etch.compiler;
+package org.apache.etch.compiler;
/**
* The version info of the Etch frontend (parser)
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/AbstractTreeWalker.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/AbstractTreeWalker.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/AbstractTreeWalker.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/AbstractTreeWalker.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
* under the License.
*/
-package etch.compiler.ast;
+package org.apache.etch.compiler.ast;
/**
* An implementation of tree walker that does nothing. Useful for
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/AsyncReceiverMode.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/AsyncReceiverMode.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/AsyncReceiverMode.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/AsyncReceiverMode.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
* under the License.
*/
-package etch.compiler.ast;
+package org.apache.etch.compiler.ast;
/**
* Flag that controls how the message receiver dispatches
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Builtin.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Builtin.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Builtin.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Builtin.java Thu Jan 29 16:37:49 2009
@@ -15,10 +15,11 @@
* under the License.
*/
-package etch.compiler.ast;
+package org.apache.etch.compiler.ast;
+
+import org.apache.etch.compiler.Backend;
+import org.apache.etch.compiler.ParseException;
-import etch.compiler.Backend;
-import etch.compiler.ParseException;
/**
* A built-in declaration from the binding.
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Constant.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Constant.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Constant.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Constant.java Thu Jan 29 16:37:49 2009
@@ -15,14 +15,15 @@
* under the License.
*/
-package etch.compiler.ast;
+package org.apache.etch.compiler.ast;
import java.util.Map;
-import etch.compiler.Backend;
-import etch.compiler.EtchGrammarConstants;
-import etch.compiler.ParseException;
-import etch.compiler.Token;
+import org.apache.etch.compiler.Backend;
+import org.apache.etch.compiler.EtchGrammarConstants;
+import org.apache.etch.compiler.ParseException;
+import org.apache.etch.compiler.Token;
+
/**
* A named constant declaration from the etch idl.
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Enumx.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Enumx.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Enumx.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Enumx.java Thu Jan 29 16:37:49 2009
@@ -15,13 +15,14 @@
* under the License.
*/
-package etch.compiler.ast;
+package org.apache.etch.compiler.ast;
import java.util.Iterator;
import java.util.Map;
-import etch.compiler.Backend;
-import etch.compiler.ParseException;
+import org.apache.etch.compiler.Backend;
+import org.apache.etch.compiler.ParseException;
+
/**
* An enumeration (named set of named constants) declaration from the etch idl.
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Except.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Except.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Except.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Except.java Thu Jan 29 16:37:49 2009
@@ -15,15 +15,16 @@
* under the License.
*/
-package etch.compiler.ast;
+package org.apache.etch.compiler.ast;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import etch.compiler.Backend;
-import etch.compiler.ParseException;
-import etch.compiler.opt.Unchecked;
+import org.apache.etch.compiler.Backend;
+import org.apache.etch.compiler.ParseException;
+import org.apache.etch.compiler.opt.Unchecked;
+
/**
* An exception declaration from the etch idl.
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Extern.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Extern.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Extern.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Extern.java Thu Jan 29 16:37:49 2009
@@ -15,12 +15,13 @@
* under the License.
*/
-package etch.compiler.ast;
+package org.apache.etch.compiler.ast;
import java.util.Map;
-import etch.compiler.Backend;
-import etch.compiler.ParseException;
+import org.apache.etch.compiler.Backend;
+import org.apache.etch.compiler.ParseException;
+
/**
* An extern declaration from the etch idl.
@@ -74,7 +75,7 @@
public String efqname( Backend helper )
{
String lang = helper.getLang();
- etch.compiler.opt.Extern opt = (etch.compiler.opt.Extern) getOpt( "Extern."+lang );
+ org.apache.etch.compiler.opt.Extern opt = (org.apache.etch.compiler.opt.Extern) getOpt( "Extern."+lang );
if (opt == null)
return null;
return opt.xname.image;
@@ -93,7 +94,7 @@
public String sname( Backend helper )
{
String lang = helper.getLang();
- etch.compiler.opt.Extern opt = (etch.compiler.opt.Extern) getOpt( "Extern."+lang );
+ org.apache.etch.compiler.opt.Extern opt = (org.apache.etch.compiler.opt.Extern) getOpt( "Extern."+lang );
if (opt == null)
// TODO need to throw the right thing...
throw new UnsupportedOperationException( String.format(
@@ -109,7 +110,7 @@
public boolean hasImport( Backend helper )
{
String lang = helper.getLang();
- etch.compiler.opt.Extern opt = (etch.compiler.opt.Extern) getOpt( "Extern."+lang );
+ org.apache.etch.compiler.opt.Extern opt = (org.apache.etch.compiler.opt.Extern) getOpt( "Extern."+lang );
if (opt == null)
return false;
return opt.xnameImport.image.length() > 0;
@@ -122,7 +123,7 @@
public String getImport( Backend helper )
{
String lang = helper.getLang();
- etch.compiler.opt.Extern opt = (etch.compiler.opt.Extern) getOpt( "Extern."+lang );
+ org.apache.etch.compiler.opt.Extern opt = (org.apache.etch.compiler.opt.Extern) getOpt( "Extern."+lang );
if (opt == null)
return null;
return opt.xnameImport.image;
@@ -135,7 +136,7 @@
public boolean hasSerializerImport( Backend helper )
{
String lang = helper.getLang();
- etch.compiler.opt.Extern opt = (etch.compiler.opt.Extern) getOpt( "Extern."+lang );
+ org.apache.etch.compiler.opt.Extern opt = (org.apache.etch.compiler.opt.Extern) getOpt( "Extern."+lang );
if (opt == null)
return false;
return opt.serializerImport.image.length() > 0;
@@ -148,7 +149,7 @@
public String getSerializerImport( Backend helper )
{
String lang = helper.getLang();
- etch.compiler.opt.Extern opt = (etch.compiler.opt.Extern) getOpt( "Extern."+lang );
+ org.apache.etch.compiler.opt.Extern opt = (org.apache.etch.compiler.opt.Extern) getOpt( "Extern."+lang );
if (opt == null)
return null;
return opt.serializerImport.image;
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Item.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Item.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Item.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Item.java Thu Jan 29 16:37:49 2009
@@ -15,10 +15,11 @@
* under the License.
*/
-package etch.compiler.ast;
+package org.apache.etch.compiler.ast;
+
+import org.apache.etch.compiler.Backend;
+import org.apache.etch.compiler.ParseException;
-import etch.compiler.Backend;
-import etch.compiler.ParseException;
/**
* An enumeration item declaration from the etch idl.
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Message.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Message.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Message.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Message.java Thu Jan 29 16:37:49 2009
@@ -15,20 +15,21 @@
* under the License.
*/
-package etch.compiler.ast;
+package org.apache.etch.compiler.ast;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import etch.compiler.Backend;
-import etch.compiler.EtchGrammarConstants;
-import etch.compiler.ParseException;
-import etch.compiler.opt.AsyncReceiver;
-import etch.compiler.opt.Authorize;
-import etch.compiler.opt.Direction;
-import etch.compiler.opt.Oneway;
-import etch.compiler.opt.Timeout;
+import org.apache.etch.compiler.Backend;
+import org.apache.etch.compiler.EtchGrammarConstants;
+import org.apache.etch.compiler.ParseException;
+import org.apache.etch.compiler.opt.AsyncReceiver;
+import org.apache.etch.compiler.opt.Authorize;
+import org.apache.etch.compiler.opt.Direction;
+import org.apache.etch.compiler.opt.Oneway;
+import org.apache.etch.compiler.opt.Timeout;
+
/**
* Description of Message.
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/MessageDirection.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/MessageDirection.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/MessageDirection.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/MessageDirection.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
* under the License.
*/
-package etch.compiler.ast;
+package org.apache.etch.compiler.ast;
/**
* The message direction is whether the message is from client to
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Mixin.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Mixin.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Mixin.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Mixin.java Thu Jan 29 16:37:49 2009
@@ -15,12 +15,13 @@
* under the License.
*/
-package etch.compiler.ast;
+package org.apache.etch.compiler.ast;
import java.util.Map;
-import etch.compiler.Backend;
-import etch.compiler.ParseException;
+import org.apache.etch.compiler.Backend;
+import org.apache.etch.compiler.ParseException;
+
/**
* A mixin declaration from the etch idl.
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Module.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Module.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Module.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Module.java Thu Jan 29 16:37:49 2009
@@ -15,14 +15,15 @@
* under the License.
*/
-package etch.compiler.ast;
+package org.apache.etch.compiler.ast;
import java.util.Iterator;
import java.util.Map;
-import etch.compiler.Backend;
-import etch.compiler.CmdLineOptions;
-import etch.compiler.ParseException;
+import org.apache.etch.compiler.Backend;
+import org.apache.etch.compiler.CmdLineOptions;
+import org.apache.etch.compiler.ParseException;
+
/**
* A module declaration from the etch idl.
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/MsgDirHelper.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/MsgDirHelper.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/MsgDirHelper.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/MsgDirHelper.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
* under the License.
*/
-package etch.compiler.ast;
+package org.apache.etch.compiler.ast;
/**
* Some helpful methods used in conjuction with MessageDirection.
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Name.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Name.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Name.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Name.java Thu Jan 29 16:37:49 2009
@@ -15,9 +15,9 @@
* under the License.
*/
-package etch.compiler.ast;
+package org.apache.etch.compiler.ast;
-import etch.compiler.Token;
+import org.apache.etch.compiler.Token;
/**
* A name of a thing from the etch idle. If the token is present,
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/NameList.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/NameList.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/NameList.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/NameList.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
* under the License.
*/
-package etch.compiler.ast;
+package org.apache.etch.compiler.ast;
import java.util.ArrayList;
import java.util.HashMap;
@@ -23,7 +23,8 @@
import java.util.List;
import java.util.Map;
-import etch.compiler.ParseException;
+import org.apache.etch.compiler.ParseException;
+
/**
* Abstraction of a list of named items. The items may be retreived in
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Named.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Named.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Named.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Named.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
* under the License.
*/
-package etch.compiler.ast;
+package org.apache.etch.compiler.ast;
import java.util.ArrayList;
import java.util.Collection;
@@ -23,10 +23,11 @@
import java.util.Map;
import java.util.StringTokenizer;
-import etch.compiler.Backend;
-import etch.compiler.CmdLineOptions;
-import etch.compiler.ParseException;
-import etch.compiler.Token;
+import org.apache.etch.compiler.Backend;
+import org.apache.etch.compiler.CmdLineOptions;
+import org.apache.etch.compiler.ParseException;
+import org.apache.etch.compiler.Token;
+
/**
* Abstraction of a named item from the etch idl.
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Opt.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Opt.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Opt.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Opt.java Thu Jan 29 16:37:49 2009
@@ -15,12 +15,13 @@
* under the License.
*/
-package etch.compiler.ast;
+package org.apache.etch.compiler.ast;
import java.util.HashSet;
import java.util.Set;
-import etch.compiler.ParseException;
+import org.apache.etch.compiler.ParseException;
+
/**
* Abstract base class of annotations from the etch idl.
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/OptList.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/OptList.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/OptList.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/OptList.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
* under the License.
*/
-package etch.compiler.ast;
+package org.apache.etch.compiler.ast;
import java.util.Collection;
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/ParamList.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/ParamList.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/ParamList.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/ParamList.java Thu Jan 29 16:37:49 2009
@@ -15,17 +15,18 @@
* under the License.
*/
-package etch.compiler.ast;
+package org.apache.etch.compiler.ast;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import etch.compiler.ParseException;
-import etch.compiler.opt.ToString.FieldItem;
-import etch.compiler.opt.ToString.FmtItem;
-import etch.compiler.opt.ToString.StringItem;
+import org.apache.etch.compiler.ParseException;
+import org.apache.etch.compiler.opt.ToString.FieldItem;
+import org.apache.etch.compiler.opt.ToString.FmtItem;
+import org.apache.etch.compiler.opt.ToString.StringItem;
+
/**
* Abstract base class of service elements which have parameter lists
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Parameter.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Parameter.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Parameter.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Parameter.java Thu Jan 29 16:37:49 2009
@@ -15,10 +15,11 @@
* under the License.
*/
-package etch.compiler.ast;
+package org.apache.etch.compiler.ast;
+
+import org.apache.etch.compiler.Backend;
+import org.apache.etch.compiler.ParseException;
-import etch.compiler.Backend;
-import etch.compiler.ParseException;
/**
* A parameter declaration from the etch idl. A parameter can be
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/ReservedWordChecker.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/ReservedWordChecker.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/ReservedWordChecker.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/ReservedWordChecker.java Thu Jan 29 16:37:49 2009
@@ -15,13 +15,14 @@
* under the License.
*/
-package etch.compiler.ast;
+package org.apache.etch.compiler.ast;
import java.util.Map;
import java.util.StringTokenizer;
-import etch.compiler.LogHandler;
-import etch.compiler.Token;
+import org.apache.etch.compiler.LogHandler;
+import org.apache.etch.compiler.Token;
+
/**
* Checks the abstract syntax tree for uses of reserved words.
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Service.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Service.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Service.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Service.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
* under the License.
*/
-package etch.compiler.ast;
+package org.apache.etch.compiler.ast;
import java.util.ArrayList;
import java.util.HashMap;
@@ -23,11 +23,12 @@
import java.util.List;
import java.util.Map;
-import etch.compiler.Backend;
-import etch.compiler.EtchCompiler;
-import etch.compiler.EtchGrammarConstants;
-import etch.compiler.ParseException;
-import etch.compiler.Token;
+import org.apache.etch.compiler.Backend;
+import org.apache.etch.compiler.EtchCompiler;
+import org.apache.etch.compiler.EtchGrammarConstants;
+import org.apache.etch.compiler.ParseException;
+import org.apache.etch.compiler.Token;
+
/**
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Struct.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Struct.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Struct.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Struct.java Thu Jan 29 16:37:49 2009
@@ -15,14 +15,15 @@
* under the License.
*/
-package etch.compiler.ast;
+package org.apache.etch.compiler.ast;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import etch.compiler.Backend;
-import etch.compiler.ParseException;
+import org.apache.etch.compiler.Backend;
+import org.apache.etch.compiler.ParseException;
+
/**
* A struct declaration from the etch idl.