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 [5/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-...
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Thrown.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Thrown.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Thrown.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/Thrown.java Thu Jan 29 16:37:49 2009
@@ -15,11 +15,12 @@
* under the License.
*/
-package etch.compiler.ast;
+package org.apache.etch.compiler.ast;
+
+import org.apache.etch.compiler.Backend;
+import org.apache.etch.compiler.EtchGrammarConstants;
+import org.apache.etch.compiler.ParseException;
-import etch.compiler.Backend;
-import etch.compiler.EtchGrammarConstants;
-import etch.compiler.ParseException;
/**
* A thrown exception reference from the etch idl.
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/TreeWalker.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/TreeWalker.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/TreeWalker.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/TreeWalker.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;
/**
* Interfaces used by the tree walker to report what it finds.
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/TypeRef.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/TypeRef.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/TypeRef.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/ast/TypeRef.java Thu Jan 29 16:37:49 2009
@@ -15,11 +15,11 @@
* under the License.
*/
-package etch.compiler.ast;
+package org.apache.etch.compiler.ast;
-import etch.compiler.EtchGrammarConstants;
-import etch.compiler.ParseException;
-import etch.compiler.Token;
+import org.apache.etch.compiler.EtchGrammarConstants;
+import org.apache.etch.compiler.ParseException;
+import org.apache.etch.compiler.Token;
/**
* A type reference from the etch idl.
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/AsyncReceiver.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/AsyncReceiver.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/AsyncReceiver.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/AsyncReceiver.java Thu Jan 29 16:37:49 2009
@@ -16,18 +16,19 @@
*/
-package etch.compiler.opt;
+package org.apache.etch.compiler.opt;
import java.util.EnumSet;
-import etch.compiler.EtchGrammarConstants;
-import etch.compiler.ParseException;
-import etch.compiler.Token;
-import etch.compiler.ast.AsyncReceiverMode;
-import etch.compiler.ast.Message;
-import etch.compiler.ast.Name;
-import etch.compiler.ast.Opt;
-import etch.compiler.ast.Service;
+import org.apache.etch.compiler.EtchGrammarConstants;
+import org.apache.etch.compiler.ParseException;
+import org.apache.etch.compiler.Token;
+import org.apache.etch.compiler.ast.AsyncReceiverMode;
+import org.apache.etch.compiler.ast.Message;
+import org.apache.etch.compiler.ast.Name;
+import org.apache.etch.compiler.ast.Opt;
+import org.apache.etch.compiler.ast.Service;
+
/**
* Option which sets the async mode of the message receiver.
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Authorize.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Authorize.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Authorize.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Authorize.java Thu Jan 29 16:37:49 2009
@@ -15,27 +15,28 @@
* under the License.
*/
-package etch.compiler.opt;
+package org.apache.etch.compiler.opt;
import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
-import etch.compiler.EtchGrammarConstants;
-import etch.compiler.ParseException;
-import etch.compiler.Token;
-import etch.compiler.ast.Constant;
-import etch.compiler.ast.Enumx;
-import etch.compiler.ast.Item;
-import etch.compiler.ast.Message;
-import etch.compiler.ast.Name;
-import etch.compiler.ast.Named;
-import etch.compiler.ast.Opt;
-import etch.compiler.ast.Parameter;
-import etch.compiler.ast.Service;
-import etch.compiler.ast.Struct;
-import etch.compiler.ast.TypeRef;
-import etch.util.StringUtil;
+import org.apache.etch.compiler.EtchGrammarConstants;
+import org.apache.etch.compiler.ParseException;
+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.Item;
+import org.apache.etch.compiler.ast.Message;
+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.Parameter;
+import org.apache.etch.compiler.ast.Service;
+import org.apache.etch.compiler.ast.Struct;
+import org.apache.etch.compiler.ast.TypeRef;
+import org.apache.etch.util.StringUtil;
+
/**
* Option which sets the authorization method for a message.
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Direction.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Direction.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Direction.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Direction.java Thu Jan 29 16:37:49 2009
@@ -15,18 +15,19 @@
* under the License.
*/
-package etch.compiler.opt;
+package org.apache.etch.compiler.opt;
import java.util.EnumSet;
-import etch.compiler.EtchGrammarConstants;
-import etch.compiler.ParseException;
-import etch.compiler.Token;
-import etch.compiler.ast.Message;
-import etch.compiler.ast.MessageDirection;
-import etch.compiler.ast.Name;
-import etch.compiler.ast.Opt;
-import etch.compiler.ast.Service;
+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.Name;
+import org.apache.etch.compiler.ast.Opt;
+import org.apache.etch.compiler.ast.Service;
+
/**
* Option which sets the direction of a message ([client->]server,
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Extern.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Extern.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Extern.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Extern.java Thu Jan 29 16:37:49 2009
@@ -15,13 +15,14 @@
* under the License.
*/
-package etch.compiler.opt;
+package org.apache.etch.compiler.opt;
+
+import org.apache.etch.compiler.EtchGrammarConstants;
+import org.apache.etch.compiler.ParseException;
+import org.apache.etch.compiler.Token;
+import org.apache.etch.compiler.ast.Name;
+import org.apache.etch.compiler.ast.Opt;
-import etch.compiler.EtchGrammarConstants;
-import etch.compiler.ParseException;
-import etch.compiler.Token;
-import etch.compiler.ast.Name;
-import etch.compiler.ast.Opt;
/**
* Option which sets the language specific attributes of an extern
@@ -39,7 +40,7 @@
public Extern( Name name, Token... args ) throws ParseException
{
super( null, name.token.beginLine );
- addType( etch.compiler.ast.Extern.class );
+ addType( org.apache.etch.compiler.ast.Extern.class );
// usage: @Extern(language, name, nameImport, serializer, serializerImport)
// example: @Extern(java, "java.util.Date", "", "etch.bindings.java.util.DateSerializer", "")
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Oneway.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Oneway.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Oneway.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Oneway.java Thu Jan 29 16:37:49 2009
@@ -15,15 +15,16 @@
* under the License.
*/
-package etch.compiler.opt;
+package org.apache.etch.compiler.opt;
+
+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.Name;
+import org.apache.etch.compiler.ast.Opt;
+import org.apache.etch.compiler.ast.Service;
-import etch.compiler.EtchGrammarConstants;
-import etch.compiler.ParseException;
-import etch.compiler.Token;
-import etch.compiler.ast.Message;
-import etch.compiler.ast.Name;
-import etch.compiler.ast.Opt;
-import etch.compiler.ast.Service;
/**
* Option which sets the oneway attribute of a message. If the message is
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Timeout.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Timeout.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Timeout.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Timeout.java Thu Jan 29 16:37:49 2009
@@ -15,15 +15,16 @@
* under the License.
*/
-package etch.compiler.opt;
+package org.apache.etch.compiler.opt;
+
+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.Name;
+import org.apache.etch.compiler.ast.Opt;
+import org.apache.etch.compiler.ast.Service;
-import etch.compiler.EtchGrammarConstants;
-import etch.compiler.ParseException;
-import etch.compiler.Token;
-import etch.compiler.ast.Message;
-import etch.compiler.ast.Name;
-import etch.compiler.ast.Opt;
-import etch.compiler.ast.Service;
/**
* Option which sets the timeout of a message which is expecting a
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/ToString.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/ToString.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/ToString.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/ToString.java Thu Jan 29 16:37:49 2009
@@ -15,20 +15,21 @@
* under the License.
*/
-package etch.compiler.opt;
+package org.apache.etch.compiler.opt;
import java.io.IOException;
import java.io.StringReader;
import java.util.ArrayList;
import java.util.List;
-import etch.compiler.EtchGrammarConstants;
-import etch.compiler.ParseException;
-import etch.compiler.Token;
-import etch.compiler.ast.Except;
-import etch.compiler.ast.Name;
-import etch.compiler.ast.Opt;
-import etch.compiler.ast.Struct;
+import org.apache.etch.compiler.EtchGrammarConstants;
+import org.apache.etch.compiler.ParseException;
+import org.apache.etch.compiler.Token;
+import org.apache.etch.compiler.ast.Except;
+import org.apache.etch.compiler.ast.Name;
+import org.apache.etch.compiler.ast.Opt;
+import org.apache.etch.compiler.ast.Struct;
+
/**
* Option which sets the string format of a struct or exception.
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Unchecked.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Unchecked.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Unchecked.java (original)
+++ incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/opt/Unchecked.java Thu Jan 29 16:37:49 2009
@@ -15,14 +15,15 @@
* under the License.
*/
-package etch.compiler.opt;
+package org.apache.etch.compiler.opt;
+
+import org.apache.etch.compiler.EtchGrammarConstants;
+import org.apache.etch.compiler.ParseException;
+import org.apache.etch.compiler.Token;
+import org.apache.etch.compiler.ast.Except;
+import org.apache.etch.compiler.ast.Name;
+import org.apache.etch.compiler.ast.Opt;
-import etch.compiler.EtchGrammarConstants;
-import etch.compiler.ParseException;
-import etch.compiler.Token;
-import etch.compiler.ast.Except;
-import etch.compiler.ast.Name;
-import etch.compiler.ast.Opt;
/**
* Option which sets the unchecked attribute of an exception.
Modified: incubator/etch/trunk/compiler/src/main/javacc/EtchGrammar.jj
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/javacc/EtchGrammar.jj?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/javacc/EtchGrammar.jj (original)
+++ incubator/etch/trunk/compiler/src/main/javacc/EtchGrammar.jj Thu Jan 29 16:37:49 2009
@@ -8,12 +8,12 @@
JAVA_UNICODE_ESCAPE = false;
STATIC = false;
JDK_VERSION = "1.5";
- OUTPUT_DIRECTORY = "../../../target/generated-sources/main/javacc/java/etch/compiler";
+ OUTPUT_DIRECTORY = "../../../target/generated-sources/main/javacc/java/org/apache/etch/compiler";
}
PARSER_BEGIN(EtchGrammar)
-package etch.compiler;
+package org.apache.etch.compiler;
import java.io.InputStream;
@@ -22,20 +22,20 @@
import java.util.List;
import java.util.Map;
-import etch.compiler.ast.Constant;
-import etch.compiler.ast.Enumx;
-import etch.compiler.ast.Except;
-import etch.compiler.ast.Service;
-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.Struct;
-import etch.compiler.ast.Thrown;
-import etch.compiler.ast.TypeRef;
+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.Service;
+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.Struct;
+import org.apache.etch.compiler.ast.Thrown;
+import org.apache.etch.compiler.ast.TypeRef;
/** The JavaCC grammar file for the etch compiler. */
public class EtchGrammar extends EtchHelper
Modified: incubator/etch/trunk/compiler/src/main/scripts/etch.bat
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/scripts/etch.bat?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/scripts/etch.bat (original)
+++ incubator/etch/trunk/compiler/src/main/scripts/etch.bat Thu Jan 29 16:37:49 2009
@@ -20,4 +20,4 @@
set ETCH_CP=%ETCH_CP%;%CLOVER_HOME%\lib\clover.jar
:skip_clover
-java -cp "%ETCH_CP%" etch.compiler.EtchMain %*
+java -cp "%ETCH_CP%" org.apache.etch.compiler.EtchMain %*
Modified: incubator/etch/trunk/compiler/src/main/scripts/etch.sh
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/scripts/etch.sh?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/main/scripts/etch.sh (original)
+++ incubator/etch/trunk/compiler/src/main/scripts/etch.sh Thu Jan 29 16:37:49 2009
@@ -32,4 +32,4 @@
fi
# Invoke Etch
-exec "$JAVA_CMD" -cp "${ETCH_CP}" "-Detch.home=${ETCH_HOME}" etch.compiler.EtchMain ${1+"$@"}
+exec "$JAVA_CMD" -cp "${ETCH_CP}" "-Detch.home=${ETCH_HOME}" org.apache.etch.compiler.EtchMain ${1+"$@"}
Modified: incubator/etch/trunk/compiler/src/test/java/org/apache/etch/compiler/TestEtchMain.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/test/java/org/apache/etch/compiler/TestEtchMain.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/test/java/org/apache/etch/compiler/TestEtchMain.java (original)
+++ incubator/etch/trunk/compiler/src/test/java/org/apache/etch/compiler/TestEtchMain.java Thu Jan 29 16:37:49 2009
@@ -16,7 +16,7 @@
* the License.
*/
-package etch.compiler;
+package org.apache.etch.compiler;
import static org.junit.Assert.*;
@@ -24,6 +24,8 @@
import java.net.URI;
import java.net.URL;
+import org.apache.etch.compiler.EtchMain;
+import org.apache.etch.compiler.ListLogHandler;
import org.junit.Test;
/**
Modified: incubator/etch/trunk/compiler/src/test/java/org/apache/etch/compiler/TestMapWords.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/test/java/org/apache/etch/compiler/TestMapWords.java?rev=738915&r1=738231&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/src/test/java/org/apache/etch/compiler/TestMapWords.java (original)
+++ incubator/etch/trunk/compiler/src/test/java/org/apache/etch/compiler/TestMapWords.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
* under the License.
*/
-package etch.compiler;
+package org.apache.etch.compiler;
import static org.junit.Assert.assertEquals;
@@ -25,15 +25,19 @@
import java.util.HashMap;
import java.util.Map;
+import org.apache.etch.compiler.Backend;
+import org.apache.etch.compiler.CmdLineOptions;
+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;
import org.junit.Before;
import org.junit.Test;
-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;
/**
* UnitTest for the mapWords(String, Map<String, String>) method in Backend.
@@ -191,9 +195,9 @@
}
- private static final String tmpPath1 = "etch/compiler/";
+ private static final String tmpPath1 = "org/apache/etch/compiler/";
private static final String tmpPath2 = null;
- private static final String tmpPath3 = "resources/etch/compiler/";
+ private static final String tmpPath3 = "resources/org/apache/etch/compiler/";
private static final String[] path = {tmpPath1, tmpPath2, tmpPath3};
private static final String firstFile = "mapWordsTestFileOne.kwd";
Modified: incubator/etch/trunk/etch.properties
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/etch.properties?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/etch.properties (original)
+++ incubator/etch/trunk/etch.properties Thu Jan 29 16:37:49 2009
@@ -1,3 +1,3 @@
majorVersion=1
-minorVersion=0
-patchVersion=2
+minorVersion=1
+patchVersion=0
Modified: incubator/etch/trunk/examples/chat/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/chat/build.xml?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/examples/chat/build.xml (original)
+++ incubator/etch/trunk/examples/chat/build.xml Thu Jan 29 16:37:49 2009
@@ -22,7 +22,7 @@
<property name="Etch.buildSupportDirectory" location="../../build-support" />
<!-- compute etch.version -->
- <condition property="etch.version" value="1.0.1" >
+ <condition property="etch.version" value="1.1.0" >
<not><isset property="etch.version" /></not>
</condition>
Modified: incubator/etch/trunk/examples/chat/dist-build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/chat/dist-build.xml?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/examples/chat/dist-build.xml (original)
+++ incubator/etch/trunk/examples/chat/dist-build.xml Thu Jan 29 16:37:49 2009
@@ -3,7 +3,7 @@
<description>Chat Example</description>
<property name="etch.home" location="${basedir}/../.."/>
- <property name="etch.version" value="1.0.1"/>
+ <property name="etch.version" value="1.1.0"/>
<property name="etch-java-runtime-name" value="etch-java-runtime-${etch.version}.jar"/>
<property name="etch-ant-plugin.jar" location="${etch.home}/lib/etch-ant-plugin-${etch.version}.jar"/>
Modified: incubator/etch/trunk/examples/chat/src/main/java/etch/examples/chat/ImplChatClient.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/chat/src/main/java/etch/examples/chat/ImplChatClient.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/examples/chat/src/main/java/etch/examples/chat/ImplChatClient.java (original)
+++ incubator/etch/trunk/examples/chat/src/main/java/etch/examples/chat/ImplChatClient.java Thu Jan 29 16:37:49 2009
@@ -20,7 +20,8 @@
import java.util.HashSet;
import java.util.Set;
-import etch.util.core.io.Session;
+import org.apache.etch.util.core.io.Session;
+
/**
* Your custom implementation of BaseChatClient. Add methods here to provide
Modified: incubator/etch/trunk/examples/chat/src/main/java/etch/examples/chat/ImplChatServer.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/chat/src/main/java/etch/examples/chat/ImplChatServer.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/examples/chat/src/main/java/etch/examples/chat/ImplChatServer.java (original)
+++ incubator/etch/trunk/examples/chat/src/main/java/etch/examples/chat/ImplChatServer.java Thu Jan 29 16:37:49 2009
@@ -22,8 +22,9 @@
import java.util.Map;
import java.util.Set;
-import etch.util.Log;
-import etch.util.core.io.Session;
+import org.apache.etch.util.Log;
+import org.apache.etch.util.core.io.Session;
+
/**
* Your custom implementation of BaseChatServer. Add methods here to provide
Modified: incubator/etch/trunk/examples/chat/src/main/java/etch/examples/chat/MainChatClient.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/chat/src/main/java/etch/examples/chat/MainChatClient.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/examples/chat/src/main/java/etch/examples/chat/MainChatClient.java (original)
+++ incubator/etch/trunk/examples/chat/src/main/java/etch/examples/chat/MainChatClient.java Thu Jan 29 16:37:49 2009
@@ -28,11 +28,12 @@
import java.util.Set;
import java.util.StringTokenizer;
-import etch.bindings.java.support.ObjSession;
-import etch.bindings.java.support._Etch_AuthException;
-import etch.util.Log;
-import etch.util.core.io.Session;
-import etch.util.core.io.Transport;
+import org.apache.etch.bindings.java.support.ObjSession;
+import org.apache.etch.bindings.java.support._Etch_AuthException;
+import org.apache.etch.util.Log;
+import org.apache.etch.util.core.io.Session;
+import org.apache.etch.util.core.io.Transport;
+
/**
* Simple command line chat client.
Modified: incubator/etch/trunk/examples/chat/src/main/java/etch/examples/chat/MainChatListener.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/chat/src/main/java/etch/examples/chat/MainChatListener.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/examples/chat/src/main/java/etch/examples/chat/MainChatListener.java (original)
+++ incubator/etch/trunk/examples/chat/src/main/java/etch/examples/chat/MainChatListener.java Thu Jan 29 16:37:49 2009
@@ -21,9 +21,10 @@
import java.util.HashMap;
import java.util.Map;
-import etch.bindings.java.support.ServerFactory;
-import etch.util.Log;
-import etch.util.core.io.Transport;
+import org.apache.etch.bindings.java.support.ServerFactory;
+import org.apache.etch.util.Log;
+import org.apache.etch.util.core.io.Transport;
+
/**
* Main program for ChatServer. This program makes a listener to accept
Modified: incubator/etch/trunk/examples/chat/src/test/java/etch/examples/chat/TestRemoteChatServer.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/chat/src/test/java/etch/examples/chat/TestRemoteChatServer.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/examples/chat/src/test/java/etch/examples/chat/TestRemoteChatServer.java (original)
+++ incubator/etch/trunk/examples/chat/src/test/java/etch/examples/chat/TestRemoteChatServer.java Thu Jan 29 16:37:49 2009
@@ -19,15 +19,15 @@
// import static org.junit.Assert.*;
+import org.apache.etch.bindings.java.support.ServerFactory;
+import org.apache.etch.util.Log;
+import org.apache.etch.util.core.io.Transport;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-import etch.bindings.java.support.ServerFactory;
import etch.examples.chat.Chat.Failure;
-import etch.util.Log;
-import etch.util.core.io.Transport;
/**
* Tests RemoteChatServer.
Modified: incubator/etch/trunk/examples/distmap/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/distmap/build.xml?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/examples/distmap/build.xml (original)
+++ incubator/etch/trunk/examples/distmap/build.xml Thu Jan 29 16:37:49 2009
@@ -22,7 +22,7 @@
<property name="Etch.buildSupportDirectory" location="../../build-support" />
<!-- compute etch.version -->
- <condition property="etch.version" value="1.0.1" >
+ <condition property="etch.version" value="1.1.0" >
<not><isset property="etch.version" /></not>
</condition>
Modified: incubator/etch/trunk/examples/distmap/dist-build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/distmap/dist-build.xml?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/examples/distmap/dist-build.xml (original)
+++ incubator/etch/trunk/examples/distmap/dist-build.xml Thu Jan 29 16:37:49 2009
@@ -3,7 +3,7 @@
<description>Distributed Map Example</description>
<property name="etch.home" location="${basedir}/../.."/>
- <property name="etch.version" value="1.0.1"/>
+ <property name="etch.version" value="1.1.0"/>
<property name="etch-java-runtime-name" value="etch-java-runtime-${etch.version}.jar"/>
<property name="etch-ant-plugin.jar" location="${etch.home}/lib/etch-ant-plugin-${etch.version}.jar"/>
Modified: incubator/etch/trunk/examples/distmap/src/main/java/etch/examples/distmap/MainDistributedHashTableClient.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/distmap/src/main/java/etch/examples/distmap/MainDistributedHashTableClient.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/examples/distmap/src/main/java/etch/examples/distmap/MainDistributedHashTableClient.java (original)
+++ incubator/etch/trunk/examples/distmap/src/main/java/etch/examples/distmap/MainDistributedHashTableClient.java Thu Jan 29 16:37:49 2009
@@ -17,8 +17,9 @@
package etch.examples.distmap;
+import org.apache.etch.util.Log;
+
import etch.examples.distmap.DistributedHashTable.Entry;
-import etch.util.Log;
/**
* Main program for DistributedHashTableClient. This program makes a connection to the
Modified: incubator/etch/trunk/examples/distmap/src/main/java/etch/examples/distmap/MainDistributedHashTableListener.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/distmap/src/main/java/etch/examples/distmap/MainDistributedHashTableListener.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/examples/distmap/src/main/java/etch/examples/distmap/MainDistributedHashTableListener.java (original)
+++ incubator/etch/trunk/examples/distmap/src/main/java/etch/examples/distmap/MainDistributedHashTableListener.java Thu Jan 29 16:37:49 2009
@@ -21,8 +21,9 @@
import java.util.HashMap;
import java.util.Map;
-import etch.bindings.java.support.ServerFactory;
-import etch.util.core.io.Transport;
+import org.apache.etch.bindings.java.support.ServerFactory;
+import org.apache.etch.util.core.io.Transport;
+
/**
* Main program for DistributedHashTableServer. This program makes a listener to accept
Modified: incubator/etch/trunk/examples/distmap/src/test/java/etch/examples/distmap/TestRemoteDistributedHashTableServer.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/distmap/src/test/java/etch/examples/distmap/TestRemoteDistributedHashTableServer.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/examples/distmap/src/test/java/etch/examples/distmap/TestRemoteDistributedHashTableServer.java (original)
+++ incubator/etch/trunk/examples/distmap/src/test/java/etch/examples/distmap/TestRemoteDistributedHashTableServer.java Thu Jan 29 16:37:49 2009
@@ -24,20 +24,20 @@
import java.util.HashMap;
import java.util.Map;
+import org.apache.etch.bindings.java.support.ServerFactory;
+import org.apache.etch.util.Log;
+import org.apache.etch.util.core.io.Transport;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import etch.bindings.java.support.ServerFactory;
import etch.examples.distmap.DistributedHashTableHelper;
import etch.examples.distmap.MainDistributedHashTableClient;
import etch.examples.distmap.MainDistributedHashTableListener;
import etch.examples.distmap.RemoteDistributedHashTableServer;
import etch.examples.distmap.DistributedHashTable.Entry;
-import etch.util.Log;
-import etch.util.core.io.Transport;
/**
* Tests the RemoteDistributedHashTableServer interface. Start the
Modified: incubator/etch/trunk/examples/example/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/example/build.xml?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/examples/example/build.xml (original)
+++ incubator/etch/trunk/examples/example/build.xml Thu Jan 29 16:37:49 2009
@@ -22,7 +22,7 @@
<property name="Etch.buildSupportDirectory" location="../../build-support" />
<!-- compute etch.version -->
- <condition property="etch.version" value="1.0.1" >
+ <condition property="etch.version" value="1.1.0" >
<not><isset property="etch.version" /></not>
</condition>
Modified: incubator/etch/trunk/examples/example/dist-build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/example/dist-build.xml?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/examples/example/dist-build.xml (original)
+++ incubator/etch/trunk/examples/example/dist-build.xml Thu Jan 29 16:37:49 2009
@@ -3,7 +3,7 @@
<description>Example Example</description>
<property name="etch.home" location="${basedir}/../.."/>
- <property name="etch.version" value="1.0.1"/>
+ <property name="etch.version" value="1.1.0"/>
<property name="etch-java-runtime-name" value="etch-java-runtime-${etch.version}.jar"/>
<property name="etch-ant-plugin.jar" location="${etch.home}/lib/etch-ant-plugin-${etch.version}.jar"/>
Modified: incubator/etch/trunk/examples/example/src/main/java/etch/examples/example/MainExampleListener.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/example/src/main/java/etch/examples/example/MainExampleListener.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/examples/example/src/main/java/etch/examples/example/MainExampleListener.java (original)
+++ incubator/etch/trunk/examples/example/src/main/java/etch/examples/example/MainExampleListener.java Thu Jan 29 16:37:49 2009
@@ -17,8 +17,9 @@
package etch.examples.example;
-import etch.bindings.java.support.ServerFactory;
-import etch.util.core.io.Transport;
+import org.apache.etch.bindings.java.support.ServerFactory;
+import org.apache.etch.util.core.io.Transport;
+
/**
* Main program for ExampleServer. This program makes a listener to accept
Modified: incubator/etch/trunk/examples/example/src/test/java/etch/examples/example/TestExampleServer.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/example/src/test/java/etch/examples/example/TestExampleServer.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/examples/example/src/test/java/etch/examples/example/TestExampleServer.java (original)
+++ incubator/etch/trunk/examples/example/src/test/java/etch/examples/example/TestExampleServer.java Thu Jan 29 16:37:49 2009
@@ -18,6 +18,9 @@
package etch.examples.example;
+import org.apache.etch.bindings.java.support.ServerFactory;
+import org.apache.etch.util.Log;
+import org.apache.etch.util.core.io.Transport;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
@@ -25,9 +28,6 @@
import org.junit.Test;
-import etch.bindings.java.support.ServerFactory;
-import etch.util.Log;
-import etch.util.core.io.Transport;
import junit.framework.Assert;
/**
Modified: incubator/etch/trunk/examples/perf/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/perf/build.xml?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/examples/perf/build.xml (original)
+++ incubator/etch/trunk/examples/perf/build.xml Thu Jan 29 16:37:49 2009
@@ -22,7 +22,7 @@
<property name="Etch.buildSupportDirectory" location="../../build-support" />
<!-- compute etch.version -->
- <condition property="etch.version" value="1.0.1" >
+ <condition property="etch.version" value="1.1.0" >
<not><isset property="etch.version" /></not>
</condition>
Modified: incubator/etch/trunk/examples/perf/dist-build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/perf/dist-build.xml?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/examples/perf/dist-build.xml (original)
+++ incubator/etch/trunk/examples/perf/dist-build.xml Thu Jan 29 16:37:49 2009
@@ -3,7 +3,7 @@
<description>Perf Perf</description>
<property name="etch.home" location="${basedir}/../.."/>
- <property name="etch.version" value="1.0.1"/>
+ <property name="etch.version" value="1.1.0"/>
<property name="etch-java-runtime-name" value="etch-java-runtime-${etch.version}.jar"/>
<property name="etch-ant-plugin.jar" location="${etch.home}/lib/etch-ant-plugin-${etch.version}.jar"/>
Modified: incubator/etch/trunk/examples/perf/src/main/java/etch/examples/perf/ImplPerfServer.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/perf/src/main/java/etch/examples/perf/ImplPerfServer.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/examples/perf/src/main/java/etch/examples/perf/ImplPerfServer.java (original)
+++ incubator/etch/trunk/examples/perf/src/main/java/etch/examples/perf/ImplPerfServer.java Thu Jan 29 16:37:49 2009
@@ -19,7 +19,8 @@
import java.util.Date;
-import etch.util.core.io.Session;
+import org.apache.etch.util.core.io.Session;
+
/**
* Your custom implementation of BasePerfServer. Add methods here to provide
Modified: incubator/etch/trunk/examples/perf/src/main/java/etch/examples/perf/MainPerfClient.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/perf/src/main/java/etch/examples/perf/MainPerfClient.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/examples/perf/src/main/java/etch/examples/perf/MainPerfClient.java (original)
+++ incubator/etch/trunk/examples/perf/src/main/java/etch/examples/perf/MainPerfClient.java Thu Jan 29 16:37:49 2009
@@ -20,15 +20,16 @@
import java.util.Date;
-import etch.bindings.java.support.Mailbox;
-import etch.bindings.java.support.ServerFactory;
+import org.apache.etch.bindings.java.support.Mailbox;
+import org.apache.etch.bindings.java.support.ServerFactory;
+import org.apache.etch.util.Assertion;
+import org.apache.etch.util.Log;
+import org.apache.etch.util.PerfTest;
+import org.apache.etch.util.core.io.Transport;
+
import etch.examples.perf.Perf.Point;
import etch.examples.perf.PerfHelper.PerfClientFactory;
import etch.examples.perf.PerfHelper.PerfServerFactory;
-import etch.util.Assertion;
-import etch.util.Log;
-import etch.util.PerfTest;
-import etch.util.core.io.Transport;
/**
* Main program for PerfClient. This program makes a connection to the listener
Modified: incubator/etch/trunk/examples/perf/src/main/java/etch/examples/perf/MainPerfListener.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/perf/src/main/java/etch/examples/perf/MainPerfListener.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/examples/perf/src/main/java/etch/examples/perf/MainPerfListener.java (original)
+++ incubator/etch/trunk/examples/perf/src/main/java/etch/examples/perf/MainPerfListener.java Thu Jan 29 16:37:49 2009
@@ -17,9 +17,10 @@
package etch.examples.perf;
-import etch.bindings.java.support.ServerFactory;
-import etch.util.Log;
-import etch.util.core.io.Transport;
+import org.apache.etch.bindings.java.support.ServerFactory;
+import org.apache.etch.util.Log;
+import org.apache.etch.util.core.io.Transport;
+
/**
* Main program for PerfServer. This program makes a listener to accept
Modified: incubator/etch/trunk/examples/perf/src/test/java/etch/examples/perf/TestPerfServer.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/perf/src/test/java/etch/examples/perf/TestPerfServer.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/examples/perf/src/test/java/etch/examples/perf/TestPerfServer.java (original)
+++ incubator/etch/trunk/examples/perf/src/test/java/etch/examples/perf/TestPerfServer.java Thu Jan 29 16:37:49 2009
@@ -21,17 +21,17 @@
import junit.framework.Assert;
+import org.apache.etch.bindings.java.support.ServerFactory;
+import org.apache.etch.util.Log;
+import org.apache.etch.util.core.io.Transport;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import etch.bindings.java.support.ServerFactory;
import etch.examples.perf.Perf.Point;
-import etch.util.Log;
-import etch.util.core.io.Transport;
/** */
public class TestPerfServer
{
Modified: incubator/etch/trunk/plugins/ant/src/main/java/etch/tools/ant/EtchCompileTask.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/plugins/ant/src/main/java/etch/tools/ant/EtchCompileTask.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/plugins/ant/src/main/java/etch/tools/ant/EtchCompileTask.java (original)
+++ incubator/etch/trunk/plugins/ant/src/main/java/etch/tools/ant/EtchCompileTask.java Thu Jan 29 16:37:49 2009
@@ -20,13 +20,13 @@
import java.io.File;
import java.util.StringTokenizer;
+import org.apache.etch.compiler.CmdLineOptions;
+import org.apache.etch.compiler.EtchCompiler;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.DirSet;
-import etch.compiler.CmdLineOptions;
-import etch.compiler.EtchCompiler;
/**
* Ant task for compiling Etch sources files.
Modified: incubator/etch/trunk/plugins/ant/src/test/resources/etch/examples/mixin/Foo.etch
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/plugins/ant/src/test/resources/etch/examples/mixin/Foo.etch?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/plugins/ant/src/test/resources/etch/examples/mixin/Foo.etch (original)
+++ incubator/etch/trunk/plugins/ant/src/test/resources/etch/examples/mixin/Foo.etch Thu Jan 29 16:37:49 2009
@@ -22,8 +22,8 @@
mixin etch.examples.mixin.bar.Bar
- @Extern( java, "etch.bindings.java.util.StrStrHashMap", "",
- "etch.bindings.java.util.StrStrHashMapSerializer", "" )
+ @Extern( java, "org.apache.etch.bindings.java.util.StrStrHashMap", "",
+ "org.apache.etch.bindings.java.util.StrStrHashMapSerializer", "" )
@Extern(csharp, "StrStrHashMap", "Etch.Util",
"StrStrHashMapSerializer", "")
extern FooTable
Modified: incubator/etch/trunk/plugins/ant/src/test/resources/etch/examples/mixin/bar/Bar.etch
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/plugins/ant/src/test/resources/etch/examples/mixin/bar/Bar.etch?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/plugins/ant/src/test/resources/etch/examples/mixin/bar/Bar.etch (original)
+++ incubator/etch/trunk/plugins/ant/src/test/resources/etch/examples/mixin/bar/Bar.etch Thu Jan 29 16:37:49 2009
@@ -21,8 +21,8 @@
{
mixin etch.examples.mixin.baz.Baz
- @Extern( java, "etch.bindings.java.util.StrStrHashMap", "",
- "etch.bindings.java.util.StrStrHashMapSerializer", "" )
+ @Extern( java, "org.apache.etch.bindings.java.util.StrStrHashMap", "",
+ "org.apache.etch.bindings.java.util.StrStrHashMapSerializer", "" )
@Extern(csharp, "StrStrHashMap", "Etch.Util",
"StrStrHashMapSerializer", "")
extern BarTable
Modified: incubator/etch/trunk/plugins/ant/src/test/resources/etch/examples/mixin/baz/Baz.etch
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/plugins/ant/src/test/resources/etch/examples/mixin/baz/Baz.etch?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/plugins/ant/src/test/resources/etch/examples/mixin/baz/Baz.etch (original)
+++ incubator/etch/trunk/plugins/ant/src/test/resources/etch/examples/mixin/baz/Baz.etch Thu Jan 29 16:37:49 2009
@@ -19,8 +19,8 @@
service Baz
{
- @Extern( java, "etch.bindings.java.util.StrStrHashMap", "",
- "etch.bindings.java.util.StrStrHashMapSerializer", "" )
+ @Extern( java, "org.apache.etch.bindings.java.util.StrStrHashMap", "",
+ "org.apache.etch.bindings.java.util.StrStrHashMapSerializer", "" )
@Extern(csharp, "StrStrHashMap", "Etch.Util",
"StrStrHashMapSerializer", "")
extern BazTable
Modified: incubator/etch/trunk/plugins/ant/src/test/resources/etch/tools/ant/Management.etch
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/plugins/ant/src/test/resources/etch/tools/ant/Management.etch?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/plugins/ant/src/test/resources/etch/tools/ant/Management.etch (original)
+++ incubator/etch/trunk/plugins/ant/src/test/resources/etch/tools/ant/Management.etch Thu Jan 29 16:37:49 2009
@@ -615,8 +615,8 @@
"cisco.uc.cuae.mgmt.util.StrTableSerializer", "" )
extern StrTable
- @Extern( java, "etch.bindings.java.util.StrStrHashMap", "",
- "etch.bindings.java.util.StrStrHashMapSerializer", "" )
+ @Extern( java, "org.apache.etch.bindings.java.util.StrStrHashMap", "",
+ "org.apache.etch.bindings.java.util.StrStrHashMapSerializer", "" )
extern StrStrMap
/**
Modified: incubator/etch/trunk/scripts/etch-eclipse.bat
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/scripts/etch-eclipse.bat?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/scripts/etch-eclipse.bat (original)
+++ incubator/etch/trunk/scripts/etch-eclipse.bat Thu Jan 29 16:37:49 2009
@@ -17,4 +17,4 @@
:run_etch
echo etch %*
-java -cp "%~dp0..\bin;%ETCH_DEPENDENT_JARS%" etch.compiler.EtchMain %*
+java -cp "%~dp0..\bin;%ETCH_DEPENDENT_JARS%" org.apache.etch.compiler.EtchMain %*
Modified: incubator/etch/trunk/tests/src/main/etch/Bar.etch
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/main/etch/Bar.etch?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/main/etch/Bar.etch (original)
+++ incubator/etch/trunk/tests/src/main/etch/Bar.etch Thu Jan 29 16:37:49 2009
@@ -21,8 +21,8 @@
{
mixin Baz
- @Extern( java, "etch.bindings.java.util.StrStrHashMap", "",
- "etch.bindings.java.util.StrStrHashMapSerializer", "" )
+ @Extern( java, "org.apache.etch.bindings.java.util.StrStrHashMap", "",
+ "org.apache.etch.bindings.java.util.StrStrHashMapSerializer", "" )
@Extern( csharp, "StrStrHashMap", "Etch.Util",
"StrStrHashMapSerializer", "" )
extern BarTable
Modified: incubator/etch/trunk/tests/src/main/etch/Baz.etch
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/main/etch/Baz.etch?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/main/etch/Baz.etch (original)
+++ incubator/etch/trunk/tests/src/main/etch/Baz.etch Thu Jan 29 16:37:49 2009
@@ -19,8 +19,8 @@
service Baz
{
- @Extern( java, "etch.bindings.java.util.StrStrHashMap", "",
- "etch.bindings.java.util.StrStrHashMapSerializer", "" )
+ @Extern( java, "org.apache.etch.bindings.java.util.StrStrHashMap", "",
+ "org.apache.etch.bindings.java.util.StrStrHashMapSerializer", "" )
@Extern(csharp, "StrStrHashMap", "Etch.Util",
"StrStrHashMapSerializer", "")
extern BazTable
Modified: incubator/etch/trunk/tests/src/main/etch/Foo.etch
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/main/etch/Foo.etch?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/main/etch/Foo.etch (original)
+++ incubator/etch/trunk/tests/src/main/etch/Foo.etch Thu Jan 29 16:37:49 2009
@@ -21,8 +21,8 @@
{
mixin Bar
- @Extern( java, "etch.bindings.java.util.StrStrHashMap", "",
- "etch.bindings.java.util.StrStrHashMapSerializer", "" )
+ @Extern( java, "org.apache.etch.bindings.java.util.StrStrHashMap", "",
+ "org.apache.etch.bindings.java.util.StrStrHashMapSerializer", "" )
@Extern(csharp, "StrStrHashMap", "Etch.Util",
"StrStrHashMapSerializer", "")
extern FooTable
Modified: incubator/etch/trunk/tests/src/main/etch/Test1.etch
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/main/etch/Test1.etch?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/main/etch/Test1.etch (original)
+++ incubator/etch/trunk/tests/src/main/etch/Test1.etch Thu Jan 29 16:37:49 2009
@@ -145,8 +145,8 @@
struct S4 ( /** value */ string tipe, /** value */ object[] x )
/** blah */
- @Extern(java, "StrIntHashMap", "etch.bindings.java.util.StrIntHashMap",
- "StrIntHashMapSerializer", "etch.bindings.java.util.StrIntHashMapSerializer")
+ @Extern(java, "StrIntHashMap", "org.apache.etch.bindings.java.util.StrIntHashMap",
+ "StrIntHashMapSerializer", "org.apache.etch.bindings.java.util.StrIntHashMapSerializer")
@Extern(csharp, "StrIntHashMap", "Etch.Util",
"StrIntHashMapSerializer", "Etch.Util")
extern Blob
Modified: incubator/etch/trunk/tests/src/main/java/etch/tests/ImplClosingClient.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/main/java/etch/tests/ImplClosingClient.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/main/java/etch/tests/ImplClosingClient.java (original)
+++ incubator/etch/trunk/tests/src/main/java/etch/tests/ImplClosingClient.java Thu Jan 29 16:37:49 2009
@@ -17,7 +17,7 @@
package etch.tests;
-import etch.util.Log;
+import org.apache.etch.util.Log;
/**
* Call to message translator for ClosingClient.
Modified: incubator/etch/trunk/tests/src/main/java/etch/tests/ImplClosingServer.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/main/java/etch/tests/ImplClosingServer.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/main/java/etch/tests/ImplClosingServer.java (original)
+++ incubator/etch/trunk/tests/src/main/java/etch/tests/ImplClosingServer.java Thu Jan 29 16:37:49 2009
@@ -17,8 +17,8 @@
package etch.tests;
-import etch.util.Log;
-import etch.util.core.io.TcpTransport;
+import org.apache.etch.util.Log;
+import org.apache.etch.util.core.io.TcpTransport;
/**
* Call to message translator for ClosingServer.
Modified: incubator/etch/trunk/tests/src/main/java/etch/tests/MainAsyncListener.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/main/java/etch/tests/MainAsyncListener.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/main/java/etch/tests/MainAsyncListener.java (original)
+++ incubator/etch/trunk/tests/src/main/java/etch/tests/MainAsyncListener.java Thu Jan 29 16:37:49 2009
@@ -17,9 +17,10 @@
package etch.tests;
-import etch.bindings.java.support.ServerFactory;
-import etch.util.Log;
-import etch.util.core.io.Transport;
+import org.apache.etch.bindings.java.support.ServerFactory;
+import org.apache.etch.util.Log;
+import org.apache.etch.util.core.io.Transport;
+
/**
* Main program for AsyncServer. This program makes a listener to accept
Modified: incubator/etch/trunk/tests/src/main/java/etch/tests/MainClosingClient.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/main/java/etch/tests/MainClosingClient.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/main/java/etch/tests/MainClosingClient.java (original)
+++ incubator/etch/trunk/tests/src/main/java/etch/tests/MainClosingClient.java Thu Jan 29 16:37:49 2009
@@ -17,7 +17,7 @@
package etch.tests;
-import etch.util.Log;
+import org.apache.etch.util.Log;
/**
* Main implementation for ClosingClient.
Modified: incubator/etch/trunk/tests/src/main/java/etch/tests/MainClosingListener.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/main/java/etch/tests/MainClosingListener.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/main/java/etch/tests/MainClosingListener.java (original)
+++ incubator/etch/trunk/tests/src/main/java/etch/tests/MainClosingListener.java Thu Jan 29 16:37:49 2009
@@ -19,10 +19,11 @@
import java.net.InetSocketAddress;
-import etch.bindings.java.support.ServerFactory;
-import etch.util.URL;
-import etch.util.core.io.TcpListener;
-import etch.util.core.io.Transport;
+import org.apache.etch.bindings.java.support.ServerFactory;
+import org.apache.etch.util.URL;
+import org.apache.etch.util.core.io.TcpListener;
+import org.apache.etch.util.core.io.Transport;
+
/**
* Main implementation for ClosingListener.
Modified: incubator/etch/trunk/tests/src/main/java/etch/tests/MainCuaeListener.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/main/java/etch/tests/MainCuaeListener.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/main/java/etch/tests/MainCuaeListener.java (original)
+++ incubator/etch/trunk/tests/src/main/java/etch/tests/MainCuaeListener.java Thu Jan 29 16:37:49 2009
@@ -17,11 +17,12 @@
package etch.tests;
-import etch.bindings.java.support.DeliveryService;
-import etch.bindings.java.support.Pool;
-import etch.bindings.java.support.ServerFactory;
-import etch.bindings.java.transport.SessionMessage;
-import etch.util.core.io.Transport;
+import org.apache.etch.bindings.java.support.DeliveryService;
+import org.apache.etch.bindings.java.support.Pool;
+import org.apache.etch.bindings.java.support.ServerFactory;
+import org.apache.etch.bindings.java.transport.SessionMessage;
+import org.apache.etch.util.core.io.Transport;
+
/**
* Main program for CuaeServer. This program makes a listener to accept
Modified: incubator/etch/trunk/tests/src/main/java/etch/tests/MainFooClient.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/main/java/etch/tests/MainFooClient.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/main/java/etch/tests/MainFooClient.java (original)
+++ incubator/etch/trunk/tests/src/main/java/etch/tests/MainFooClient.java Thu Jan 29 16:37:49 2009
@@ -17,7 +17,8 @@
package etch.tests;
-import etch.bindings.java.util.StrStrHashMap;
+import org.apache.etch.bindings.java.util.StrStrHashMap;
+
import etch.tests.Bar.BarData;
import etch.tests.Baz.BazData;
import etch.tests.Foo.FooData;
Modified: incubator/etch/trunk/tests/src/main/java/etch/tests/MainFooListener.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/main/java/etch/tests/MainFooListener.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/main/java/etch/tests/MainFooListener.java (original)
+++ incubator/etch/trunk/tests/src/main/java/etch/tests/MainFooListener.java Thu Jan 29 16:37:49 2009
@@ -17,9 +17,10 @@
package etch.tests;
-import etch.bindings.java.support.ServerFactory;
+import org.apache.etch.bindings.java.support.ServerFactory;
+import org.apache.etch.util.core.io.Transport;
+
import etch.tests.FooHelper.FooServerFactory;
-import etch.util.core.io.Transport;
/**
* Main implementation for FooListener.
Modified: incubator/etch/trunk/tests/src/main/java/etch/tests/MainInheritanceListener.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/main/java/etch/tests/MainInheritanceListener.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/main/java/etch/tests/MainInheritanceListener.java (original)
+++ incubator/etch/trunk/tests/src/main/java/etch/tests/MainInheritanceListener.java Thu Jan 29 16:37:49 2009
@@ -19,10 +19,11 @@
import java.net.InetSocketAddress;
-import etch.bindings.java.support.ServerFactory;
-import etch.util.URL;
-import etch.util.core.io.TcpListener;
-import etch.util.core.io.Transport;
+import org.apache.etch.bindings.java.support.ServerFactory;
+import org.apache.etch.util.URL;
+import org.apache.etch.util.core.io.TcpListener;
+import org.apache.etch.util.core.io.Transport;
+
/**
* Main program for InheritanceServer. This program makes a listener to accept
Modified: incubator/etch/trunk/tests/src/main/java/etch/tests/MainTypesClient.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/main/java/etch/tests/MainTypesClient.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/main/java/etch/tests/MainTypesClient.java (original)
+++ incubator/etch/trunk/tests/src/main/java/etch/tests/MainTypesClient.java Thu Jan 29 16:37:49 2009
@@ -26,7 +26,8 @@
import java.util.Set;
import java.util.TreeMap;
-import etch.util.Assertion;
+import org.apache.etch.util.Assertion;
+
/**
* Main program for TypesClient. This program makes a connection to the
Modified: incubator/etch/trunk/tests/src/main/java/etch/tests/MainTypesListener.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/main/java/etch/tests/MainTypesListener.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/main/java/etch/tests/MainTypesListener.java (original)
+++ incubator/etch/trunk/tests/src/main/java/etch/tests/MainTypesListener.java Thu Jan 29 16:37:49 2009
@@ -17,8 +17,9 @@
package etch.tests;
-import etch.bindings.java.support.ServerFactory;
-import etch.util.core.io.Transport;
+import org.apache.etch.bindings.java.support.ServerFactory;
+import org.apache.etch.util.core.io.Transport;
+
/**
* Main program for TypesServer. This program makes a listener to accept
Modified: incubator/etch/trunk/tests/src/main/java/etch/tests/MyCuaeHelper.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/main/java/etch/tests/MyCuaeHelper.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/main/java/etch/tests/MyCuaeHelper.java (original)
+++ incubator/etch/trunk/tests/src/main/java/etch/tests/MyCuaeHelper.java Thu Jan 29 16:37:49 2009
@@ -17,15 +17,16 @@
package etch.tests;
-import etch.bindings.java.msg.ValueFactory;
-import etch.bindings.java.support.DefaultServerFactory;
-import etch.bindings.java.support.DeliveryService;
-import etch.bindings.java.support.Pool;
-import etch.bindings.java.support.ServerFactory;
-import etch.bindings.java.support.TransportFactory;
-import etch.bindings.java.transport.SessionMessage;
-import etch.util.Resources;
-import etch.util.core.io.Transport;
+import org.apache.etch.bindings.java.msg.ValueFactory;
+import org.apache.etch.bindings.java.support.DefaultServerFactory;
+import org.apache.etch.bindings.java.support.DeliveryService;
+import org.apache.etch.bindings.java.support.Pool;
+import org.apache.etch.bindings.java.support.ServerFactory;
+import org.apache.etch.bindings.java.support.TransportFactory;
+import org.apache.etch.bindings.java.transport.SessionMessage;
+import org.apache.etch.util.Resources;
+import org.apache.etch.util.core.io.Transport;
+
/**
* Transport helper for Cuae. All methods are static.
Modified: incubator/etch/trunk/tests/src/main/java/etch/tests/MyCuaeServerStub.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/main/java/etch/tests/MyCuaeServerStub.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/main/java/etch/tests/MyCuaeServerStub.java (original)
+++ incubator/etch/trunk/tests/src/main/java/etch/tests/MyCuaeServerStub.java Thu Jan 29 16:37:49 2009
@@ -17,17 +17,18 @@
package etch.tests;
-import etch.bindings.java.msg.Message;
-import etch.bindings.java.msg.StructValue;
-import etch.bindings.java.support.DeliveryService;
-import etch.bindings.java.support.Mailbox;
-import etch.bindings.java.support.ObjSession;
-import etch.bindings.java.support.Pool;
-import etch.bindings.java.support.StubBase;
-import etch.bindings.java.support.StubHelper;
-import etch.util.Todo;
-import etch.util.TodoManager;
-import etch.util.core.Who;
+import org.apache.etch.bindings.java.msg.Message;
+import org.apache.etch.bindings.java.msg.StructValue;
+import org.apache.etch.bindings.java.support.DeliveryService;
+import org.apache.etch.bindings.java.support.Mailbox;
+import org.apache.etch.bindings.java.support.ObjSession;
+import org.apache.etch.bindings.java.support.Pool;
+import org.apache.etch.bindings.java.support.StubBase;
+import org.apache.etch.bindings.java.support.StubHelper;
+import org.apache.etch.util.Todo;
+import org.apache.etch.util.TodoManager;
+import org.apache.etch.util.core.Who;
+
/**
* Hand-built CuaeServerStub which dispatches to our raw impl.
Modified: incubator/etch/trunk/tests/src/main/java/etch/tests/MyValueFactoryCuae.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/main/java/etch/tests/MyValueFactoryCuae.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/main/java/etch/tests/MyValueFactoryCuae.java (original)
+++ incubator/etch/trunk/tests/src/main/java/etch/tests/MyValueFactoryCuae.java Thu Jan 29 16:37:49 2009
@@ -17,14 +17,14 @@
package etch.tests;
-import etch.bindings.java.msg.Field;
-import etch.bindings.java.msg.ImportExportHelper;
-import etch.bindings.java.msg.StructValue;
-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 org.apache.etch.bindings.java.msg.Field;
+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.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;
/**
* ValueFactory for Cuae.
@@ -186,66 +186,66 @@
{
// params for Request
- _mt_etch_examples_cuae_Cuae_Request.putValidator( _mf_code, etch.bindings.java.support.Validator_int.get( 0 ) );
+ _mt_etch_examples_cuae_Cuae_Request.putValidator( _mf_code, org.apache.etch.bindings.java.support.Validator_int.get( 0 ) );
// params for ReqWithMessage
- _mt_etch_examples_cuae_Cuae_ReqWithMessage.putValidator( _mf_code, etch.bindings.java.support.Validator_int.get( 0 ) );
- _mt_etch_examples_cuae_Cuae_ReqWithMessage.putValidator( _mf_msg, etch.bindings.java.support.Validator_string.get( 0 ) );
+ _mt_etch_examples_cuae_Cuae_ReqWithMessage.putValidator( _mf_code, org.apache.etch.bindings.java.support.Validator_int.get( 0 ) );
+ _mt_etch_examples_cuae_Cuae_ReqWithMessage.putValidator( _mf_msg, org.apache.etch.bindings.java.support.Validator_string.get( 0 ) );
// params for Response
- _mt_etch_examples_cuae_Cuae_Response.putValidator( _mf_msg, etch.bindings.java.support.Validator_string.get( 0 ) );
+ _mt_etch_examples_cuae_Cuae_Response.putValidator( _mf_msg, org.apache.etch.bindings.java.support.Validator_string.get( 0 ) );
// params for RespWithCode
- _mt_etch_examples_cuae_Cuae_RespWithCode.putValidator( _mf_msg, etch.bindings.java.support.Validator_string.get( 0 ) );
- _mt_etch_examples_cuae_Cuae_RespWithCode.putValidator( _mf_code, etch.bindings.java.support.Validator_int.get( 0 ) );
+ _mt_etch_examples_cuae_Cuae_RespWithCode.putValidator( _mf_msg, org.apache.etch.bindings.java.support.Validator_string.get( 0 ) );
+ _mt_etch_examples_cuae_Cuae_RespWithCode.putValidator( _mf_code, org.apache.etch.bindings.java.support.Validator_int.get( 0 ) );
// params for doit1
- _mt_etch_examples_cuae_CuaeServer_doit1.putValidator( _mf_req, etch.bindings.java.support.Validator_StructValue.get( _mt_etch_examples_cuae_Cuae_Request, 0 ) );
- _mt_etch_examples_cuae_CuaeServer_doit1.putValidator( _mf__messageId, etch.bindings.java.support.Validator_long.get( 0 ) );
+ _mt_etch_examples_cuae_CuaeServer_doit1.putValidator( _mf_req, org.apache.etch.bindings.java.support.Validator_StructValue.get( _mt_etch_examples_cuae_Cuae_Request, 0 ) );
+ _mt_etch_examples_cuae_CuaeServer_doit1.putValidator( _mf__messageId, org.apache.etch.bindings.java.support.Validator_long.get( 0 ) );
// params for _result_doit1
- _mt_etch_examples_cuae_CuaeClient__result_doit1.putValidator( _mf_result, etch.bindings.java.support.Validator_StructValue.get( _mt_etch_examples_cuae_Cuae_Response, 0 ) );
- _mt_etch_examples_cuae_CuaeClient__result_doit1.putValidator( _mf__messageId, etch.bindings.java.support.Validator_long.get( 0 ) );
- _mt_etch_examples_cuae_CuaeClient__result_doit1.putValidator( _mf_result, etch.bindings.java.support.Validator_RuntimeException.get() ); // thrown RuntimeException
- _mt_etch_examples_cuae_CuaeClient__result_doit1.putValidator( _mf__inReplyTo, etch.bindings.java.support.Validator_long.get( 0 ) );
+ _mt_etch_examples_cuae_CuaeClient__result_doit1.putValidator( _mf_result, org.apache.etch.bindings.java.support.Validator_StructValue.get( _mt_etch_examples_cuae_Cuae_Response, 0 ) );
+ _mt_etch_examples_cuae_CuaeClient__result_doit1.putValidator( _mf__messageId, org.apache.etch.bindings.java.support.Validator_long.get( 0 ) );
+ _mt_etch_examples_cuae_CuaeClient__result_doit1.putValidator( _mf_result, org.apache.etch.bindings.java.support.Validator_RuntimeException.get() ); // thrown RuntimeException
+ _mt_etch_examples_cuae_CuaeClient__result_doit1.putValidator( _mf__inReplyTo, org.apache.etch.bindings.java.support.Validator_long.get( 0 ) );
// params for doit2
- _mt_etch_examples_cuae_CuaeClient_doit2.putValidator( _mf_req, etch.bindings.java.support.Validator_StructValue.get( _mt_etch_examples_cuae_Cuae_Request, 0 ) );
- _mt_etch_examples_cuae_CuaeClient_doit2.putValidator( _mf__messageId, etch.bindings.java.support.Validator_long.get( 0 ) );
+ _mt_etch_examples_cuae_CuaeClient_doit2.putValidator( _mf_req, org.apache.etch.bindings.java.support.Validator_StructValue.get( _mt_etch_examples_cuae_Cuae_Request, 0 ) );
+ _mt_etch_examples_cuae_CuaeClient_doit2.putValidator( _mf__messageId, org.apache.etch.bindings.java.support.Validator_long.get( 0 ) );
// params for _result_doit2
- _mt_etch_examples_cuae_CuaeServer__result_doit2.putValidator( _mf_result, etch.bindings.java.support.Validator_StructValue.get( _mt_etch_examples_cuae_Cuae_Response, 0 ) );
- _mt_etch_examples_cuae_CuaeServer__result_doit2.putValidator( _mf__messageId, etch.bindings.java.support.Validator_long.get( 0 ) );
- _mt_etch_examples_cuae_CuaeServer__result_doit2.putValidator( _mf_result, etch.bindings.java.support.Validator_RuntimeException.get() ); // thrown RuntimeException
- _mt_etch_examples_cuae_CuaeServer__result_doit2.putValidator( _mf__inReplyTo, etch.bindings.java.support.Validator_long.get( 0 ) );
+ _mt_etch_examples_cuae_CuaeServer__result_doit2.putValidator( _mf_result, org.apache.etch.bindings.java.support.Validator_StructValue.get( _mt_etch_examples_cuae_Cuae_Response, 0 ) );
+ _mt_etch_examples_cuae_CuaeServer__result_doit2.putValidator( _mf__messageId, org.apache.etch.bindings.java.support.Validator_long.get( 0 ) );
+ _mt_etch_examples_cuae_CuaeServer__result_doit2.putValidator( _mf_result, org.apache.etch.bindings.java.support.Validator_RuntimeException.get() ); // thrown RuntimeException
+ _mt_etch_examples_cuae_CuaeServer__result_doit2.putValidator( _mf__inReplyTo, org.apache.etch.bindings.java.support.Validator_long.get( 0 ) );
// params for doit3
- _mt_etch_examples_cuae_Cuae_doit3.putValidator( _mf_req, etch.bindings.java.support.Validator_StructValue.get( _mt_etch_examples_cuae_Cuae_Request, 1 ) );
- _mt_etch_examples_cuae_Cuae_doit3.putValidator( _mf__messageId, etch.bindings.java.support.Validator_long.get( 0 ) );
+ _mt_etch_examples_cuae_Cuae_doit3.putValidator( _mf_req, org.apache.etch.bindings.java.support.Validator_StructValue.get( _mt_etch_examples_cuae_Cuae_Request, 1 ) );
+ _mt_etch_examples_cuae_Cuae_doit3.putValidator( _mf__messageId, org.apache.etch.bindings.java.support.Validator_long.get( 0 ) );
// params for _result_doit3
- _mt_etch_examples_cuae_Cuae__result_doit3.putValidator( _mf_result, etch.bindings.java.support.Validator_StructValue.get( _mt_etch_examples_cuae_Cuae_Response, 1 ) );
- _mt_etch_examples_cuae_Cuae__result_doit3.putValidator( _mf__messageId, etch.bindings.java.support.Validator_long.get( 0 ) );
- _mt_etch_examples_cuae_Cuae__result_doit3.putValidator( _mf_result, etch.bindings.java.support.Validator_RuntimeException.get() ); // thrown RuntimeException
- _mt_etch_examples_cuae_Cuae__result_doit3.putValidator( _mf__inReplyTo, etch.bindings.java.support.Validator_long.get( 0 ) );
+ _mt_etch_examples_cuae_Cuae__result_doit3.putValidator( _mf_result, org.apache.etch.bindings.java.support.Validator_StructValue.get( _mt_etch_examples_cuae_Cuae_Response, 1 ) );
+ _mt_etch_examples_cuae_Cuae__result_doit3.putValidator( _mf__messageId, org.apache.etch.bindings.java.support.Validator_long.get( 0 ) );
+ _mt_etch_examples_cuae_Cuae__result_doit3.putValidator( _mf_result, org.apache.etch.bindings.java.support.Validator_RuntimeException.get() ); // thrown RuntimeException
+ _mt_etch_examples_cuae_Cuae__result_doit3.putValidator( _mf__inReplyTo, org.apache.etch.bindings.java.support.Validator_long.get( 0 ) );
// params for doit4
- _mt_etch_examples_cuae_Cuae_doit4.putValidator( _mf__messageId, etch.bindings.java.support.Validator_long.get( 0 ) );
+ _mt_etch_examples_cuae_Cuae_doit4.putValidator( _mf__messageId, org.apache.etch.bindings.java.support.Validator_long.get( 0 ) );
// params for _result_doit4
- _mt_etch_examples_cuae_Cuae__result_doit4.putValidator( _mf_result, etch.bindings.java.support.Validator_void.get( 0 ) );
- _mt_etch_examples_cuae_Cuae__result_doit4.putValidator( _mf__messageId, etch.bindings.java.support.Validator_long.get( 0 ) );
- _mt_etch_examples_cuae_Cuae__result_doit4.putValidator( _mf_result, etch.bindings.java.support.Validator_RuntimeException.get() ); // thrown RuntimeException
- _mt_etch_examples_cuae_Cuae__result_doit4.putValidator( _mf__inReplyTo, etch.bindings.java.support.Validator_long.get( 0 ) );
+ _mt_etch_examples_cuae_Cuae__result_doit4.putValidator( _mf_result, org.apache.etch.bindings.java.support.Validator_void.get( 0 ) );
+ _mt_etch_examples_cuae_Cuae__result_doit4.putValidator( _mf__messageId, org.apache.etch.bindings.java.support.Validator_long.get( 0 ) );
+ _mt_etch_examples_cuae_Cuae__result_doit4.putValidator( _mf_result, org.apache.etch.bindings.java.support.Validator_RuntimeException.get() ); // thrown RuntimeException
+ _mt_etch_examples_cuae_Cuae__result_doit4.putValidator( _mf__inReplyTo, org.apache.etch.bindings.java.support.Validator_long.get( 0 ) );
// params for test1
- _mt_etch_examples_cuae_CuaeServer_test1.putValidator( _mf__messageId, etch.bindings.java.support.Validator_long.get( 0 ) );
+ _mt_etch_examples_cuae_CuaeServer_test1.putValidator( _mf__messageId, org.apache.etch.bindings.java.support.Validator_long.get( 0 ) );
// params for test2
- _mt_etch_examples_cuae_CuaeClient_test2.putValidator( _mf__messageId, etch.bindings.java.support.Validator_long.get( 0 ) );
+ _mt_etch_examples_cuae_CuaeClient_test2.putValidator( _mf__messageId, org.apache.etch.bindings.java.support.Validator_long.get( 0 ) );
// params for test3
- _mt_etch_examples_cuae_Cuae_test3.putValidator( _mf__messageId, etch.bindings.java.support.Validator_long.get( 0 ) );
+ _mt_etch_examples_cuae_Cuae_test3.putValidator( _mf__messageId, org.apache.etch.bindings.java.support.Validator_long.get( 0 ) );
}
static
Modified: incubator/etch/trunk/tests/src/test/java/etch/tests/FakeTest1.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/test/java/etch/tests/FakeTest1.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/test/java/etch/tests/FakeTest1.java (original)
+++ incubator/etch/trunk/tests/src/test/java/etch/tests/FakeTest1.java Thu Jan 29 16:37:49 2009
@@ -17,7 +17,7 @@
package etch.tests;
-import etch.bindings.java.util.StrIntHashMap;
+import org.apache.etch.bindings.java.util.StrIntHashMap;
/**
* Silly implementation of Test used for testing.
Modified: incubator/etch/trunk/tests/src/test/java/etch/tests/TestAsyncClient.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/test/java/etch/tests/TestAsyncClient.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/test/java/etch/tests/TestAsyncClient.java (original)
+++ incubator/etch/trunk/tests/src/test/java/etch/tests/TestAsyncClient.java Thu Jan 29 16:37:49 2009
@@ -19,11 +19,11 @@
import static org.junit.Assert.assertEquals;
+import org.apache.etch.util.Log;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-import etch.util.Log;
/**
* Main implementation for AsyncClient.
Modified: incubator/etch/trunk/tests/src/test/java/etch/tests/TestImplTest1.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/test/java/etch/tests/TestImplTest1.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/test/java/etch/tests/TestImplTest1.java (original)
+++ incubator/etch/trunk/tests/src/test/java/etch/tests/TestImplTest1.java Thu Jan 29 16:37:49 2009
@@ -17,10 +17,10 @@
package etch.tests;
+import org.apache.etch.bindings.java.util.StrIntHashMap;
import org.junit.Before;
import org.junit.Test;
-import etch.bindings.java.util.StrIntHashMap;
import etch.tests.Test1.E1;
import etch.tests.Test1.S1;
import etch.tests.Test1.S2;
Modified: incubator/etch/trunk/tests/src/test/java/etch/tests/TestMainTest1Client.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/test/java/etch/tests/TestMainTest1Client.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/test/java/etch/tests/TestMainTest1Client.java (original)
+++ incubator/etch/trunk/tests/src/test/java/etch/tests/TestMainTest1Client.java Thu Jan 29 16:37:49 2009
@@ -21,11 +21,11 @@
import java.util.concurrent.Semaphore;
+import org.apache.etch.bindings.java.util.StrIntHashMap;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import etch.bindings.java.util.StrIntHashMap;
/**
* @author rebarraz
Modified: incubator/etch/trunk/tests/src/test/java/etch/tests/TestMixin.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/test/java/etch/tests/TestMixin.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/test/java/etch/tests/TestMixin.java (original)
+++ incubator/etch/trunk/tests/src/test/java/etch/tests/TestMixin.java Thu Jan 29 16:37:49 2009
@@ -23,11 +23,11 @@
import java.util.HashSet;
import java.util.Set;
+import org.apache.etch.bindings.java.msg.Type;
+import org.apache.etch.bindings.java.msg.ValueFactory;
+import org.apache.etch.bindings.java.support.DefaultValueFactory;
import org.junit.Test;
-import etch.bindings.java.msg.Type;
-import etch.bindings.java.msg.ValueFactory;
-import etch.bindings.java.support.DefaultValueFactory;
import etch.tests.Bar.BarData;
import etch.tests.Baz.BazData;
import etch.tests.Foo.FooData;
Modified: incubator/etch/trunk/tests/src/test/java/etch/tests/TestMixinXml.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/test/java/etch/tests/TestMixinXml.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/test/java/etch/tests/TestMixinXml.java (original)
+++ incubator/etch/trunk/tests/src/test/java/etch/tests/TestMixinXml.java Thu Jan 29 16:37:49 2009
@@ -137,15 +137,15 @@
Node externNode = list.item(nodeCount++);
checkExternProperties(externNode, "FooTable", "1071837490", "etch.tests.Foo.FooTable");
- checkExternMapProperties(externNode, "java", "etch.bindings.java.util.StrStrHashMap", "", "etch.bindings.java.util.StrStrHashMapSerializer", "");
+ checkExternMapProperties(externNode, "java", "org.apache.etch.bindings.java.util.StrStrHashMap", "", "org.apache.etch.bindings.java.util.StrStrHashMapSerializer", "");
externNode = list.item( nodeCount++ );
checkExternProperties(externNode, "BazTable", "-1088676472", "etch.tests.Baz.BazTable");
- checkExternMapProperties(externNode, "java", "etch.bindings.java.util.StrStrHashMap", "", "etch.bindings.java.util.StrStrHashMapSerializer", "");
+ checkExternMapProperties(externNode, "java", "org.apache.etch.bindings.java.util.StrStrHashMap", "", "org.apache.etch.bindings.java.util.StrStrHashMapSerializer", "");
externNode = list.item( nodeCount++ );
checkExternProperties(externNode, "BarTable", "-2096954984", "etch.tests.Bar.BarTable");
- checkExternMapProperties(externNode, "java", "etch.bindings.java.util.StrStrHashMap", "", "etch.bindings.java.util.StrStrHashMapSerializer", "");
+ checkExternMapProperties(externNode, "java", "org.apache.etch.bindings.java.util.StrStrHashMap", "", "org.apache.etch.bindings.java.util.StrStrHashMapSerializer", "");
}
/** @throws Exception */
Modified: incubator/etch/trunk/tests/src/test/java/etch/tests/TestRemoteTest1DotJava.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/test/java/etch/tests/TestRemoteTest1DotJava.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/test/java/etch/tests/TestRemoteTest1DotJava.java (original)
+++ incubator/etch/trunk/tests/src/test/java/etch/tests/TestRemoteTest1DotJava.java Thu Jan 29 16:37:49 2009
@@ -25,19 +25,20 @@
import java.lang.reflect.Array;
-import etch.bindings.java.msg.Field;
-import etch.bindings.java.msg.Message;
-import etch.bindings.java.msg.Type;
-import etch.bindings.java.support.DeliveryService;
-import etch.bindings.java.support.Mailbox;
-import etch.bindings.java.transport.SessionMessage;
+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.support.DeliveryService;
+import org.apache.etch.bindings.java.support.Mailbox;
+import org.apache.etch.bindings.java.transport.SessionMessage;
+import org.apache.etch.util.core.Who;
+
import etch.tests.Test1.E1;
import etch.tests.Test1.Excp1;
import etch.tests.Test1.Excp3;
import etch.tests.Test1.Excp4;
import etch.tests.Test1.S1;
import etch.tests.Test1.S2;
-import etch.util.core.Who;
/** Test of RemoteTest1 */
public class TestRemoteTest1DotJava
Modified: incubator/etch/trunk/tests/src/test/java/etch/tests/TestStubTest1DotJava.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/test/java/etch/tests/TestStubTest1DotJava.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/test/java/etch/tests/TestStubTest1DotJava.java (original)
+++ incubator/etch/trunk/tests/src/test/java/etch/tests/TestStubTest1DotJava.java Thu Jan 29 16:37:49 2009
@@ -21,14 +21,16 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import etch.bindings.java.msg.Message;
-import etch.bindings.java.msg.Type;
-import etch.bindings.java.support.DeliveryService;
-import etch.bindings.java.support.Mailbox;
-import etch.bindings.java.support.Pool;
-import etch.bindings.java.support._Etch_AuthException;
-import etch.bindings.java.transport.SessionMessage;
-import etch.util.core.Who;
+
+import org.apache.etch.bindings.java.msg.Message;
+import org.apache.etch.bindings.java.msg.Type;
+import org.apache.etch.bindings.java.support.DeliveryService;
+import org.apache.etch.bindings.java.support.Mailbox;
+import org.apache.etch.bindings.java.support.Pool;
+import org.apache.etch.bindings.java.support._Etch_AuthException;
+import org.apache.etch.bindings.java.transport.SessionMessage;
+import org.apache.etch.util.core.Who;
+
/** Test of StubTest1 */
public class TestStubTest1DotJava
Modified: incubator/etch/trunk/tests/src/test/java/etch/tests/TestTest1Helper.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/test/java/etch/tests/TestTest1Helper.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/test/java/etch/tests/TestTest1Helper.java (original)
+++ incubator/etch/trunk/tests/src/test/java/etch/tests/TestTest1Helper.java Thu Jan 29 16:37:49 2009
@@ -17,14 +17,14 @@
package etch.tests;
+import org.apache.etch.bindings.java.support.ServerFactory;
+import org.apache.etch.bindings.java.support.TransportFactory;
+import org.apache.etch.bindings.java.transport.TcpTransportFactory;
+import org.apache.etch.util.core.io.Transport;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-import etch.bindings.java.support.ServerFactory;
-import etch.bindings.java.support.TransportFactory;
-import etch.bindings.java.transport.TcpTransportFactory;
-import etch.util.core.io.Transport;
/** Test of Test1Helper */
public class TestTest1Helper
Modified: incubator/etch/trunk/tests/src/test/java/etch/tests/TestValueFactoryTest1DotJava.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/test/java/etch/tests/TestValueFactoryTest1DotJava.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/test/java/etch/tests/TestValueFactoryTest1DotJava.java (original)
+++ incubator/etch/trunk/tests/src/test/java/etch/tests/TestValueFactoryTest1DotJava.java Thu Jan 29 16:37:49 2009
@@ -25,9 +25,10 @@
import java.util.Set;
-import etch.bindings.java.msg.Field;
-import etch.bindings.java.msg.StructValue;
-import etch.bindings.java.msg.Type;
+import org.apache.etch.bindings.java.msg.Field;
+import org.apache.etch.bindings.java.msg.StructValue;
+import org.apache.etch.bindings.java.msg.Type;
+
import etch.tests.Test1.E1;
import etch.tests.Test1.Excp1;
import etch.tests.Test1.Excp2;
Modified: incubator/etch/trunk/tests/src/test/java/etch/tests/TestXml.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/tests/src/test/java/etch/tests/TestXml.java?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/tests/src/test/java/etch/tests/TestXml.java (original)
+++ incubator/etch/trunk/tests/src/test/java/etch/tests/TestXml.java Thu Jan 29 16:37:49 2009
@@ -28,6 +28,7 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import org.apache.etch.compiler.EtchGrammarConstants;
import org.junit.After;
import org.junit.Before;
import org.w3c.dom.Document;
@@ -35,7 +36,6 @@
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import etch.compiler.EtchGrammarConstants;
/** */
public class TestXml {
@@ -188,7 +188,7 @@
Node externNode = list.item(nodeCount++);
checkExternProperties(externNode, "Blob", "1658093806", "etch.tests.Test1.Blob");
- checkExternMapProperties(externNode, "java", "StrIntHashMap", "etch.bindings.java.util.StrIntHashMap", "StrIntHashMapSerializer", "etch.bindings.java.util.StrIntHashMapSerializer");
+ checkExternMapProperties(externNode, "java", "StrIntHashMap", "org.apache.etch.bindings.java.util.StrIntHashMap", "StrIntHashMapSerializer", "org.apache.etch.bindings.java.util.StrIntHashMapSerializer");
checkExternMapProperties(externNode, "csharp", "StrIntHashMap", "Etch.Util", "StrIntHashMapSerializer", "Etch.Util");
}
Modified: incubator/etch/trunk/util/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/build.xml?rev=738915&r1=738914&r2=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/build.xml (original)
+++ incubator/etch/trunk/util/build.xml Thu Jan 29 16:37:49 2009
@@ -72,7 +72,7 @@
<attribute name="SVN-Revision" value="${Etch.runtime.revisionNumber}" />
</manifest>
<fileset dir="${classesDirectory}/main">
- <include name="etch/util/**" />
+ <include name="org/apache/etch/util/**" />
</fileset>
</jar>
@@ -93,7 +93,7 @@
<!-- package up etch-util src -->
<zip destfile="@{dist}/lib/${etch-util-src.zip}" >
<fileset dir="${src}/main/java" >
- <include name="etch/util/**/*.java" />
+ <include name="org/apache/etch/util/**/*.java" />
<exclude name="**/test/**" />
</fileset>
</zip>
Copied: incubator/etch/trunk/util/src/main/java/org/apache/etch/util/AbstractStartable.java (from r738231, incubator/etch/trunk/util/src/main/java/etch/util/AbstractStartable.java)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/src/main/java/org/apache/etch/util/AbstractStartable.java?p2=incubator/etch/trunk/util/src/main/java/org/apache/etch/util/AbstractStartable.java&p1=incubator/etch/trunk/util/src/main/java/etch/util/AbstractStartable.java&r1=738231&r2=738915&rev=738915&view=diff
==============================================================================
--- incubator/etch/trunk/util/src/main/java/etch/util/AbstractStartable.java (original)
+++ incubator/etch/trunk/util/src/main/java/org/apache/etch/util/AbstractStartable.java Thu Jan 29 16:37:49 2009
@@ -15,7 +15,7 @@
* under the License.
*/
-package etch.util;
+package org.apache.etch.util;
/**
* Generic implementation of Startable.