rename fooAMD to foo.AMD

19 files changed, 90 insertions, 146 deletions

diff --git a/java/build.xml b/java/build.xml
index e7e15e06b60..3279bc1bdcf 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -446,7 +446,6 @@
 	    <include name="test/Ice/background/"/>
 	    <include name="test/Ice/binding/"/>
 	    <include name="test/Ice/exceptions/"/>
-	    <include name="test/Ice/exceptionsAMD/"/>
 	    <include name="test/Ice/checksum/"/>
 	    <include name="test/Ice/facets/"/>
 	    <include name="test/Ice/faultTolerance/"/>
@@ -456,16 +455,12 @@
 	    <include name="test/Ice/location/"/>
 	    <include name="test/Ice/objects/"/>
 	    <include name="test/Ice/operations/"/>
-	    <include name="test/Ice/operationsAMD/"/>
 	    <include name="test/Ice/packagemd/"/>
 	    <include name="test/Ice/proxy/"/>
-	    <include name="test/Ice/proxyAMD/"/>
 	    <include name="test/Ice/retry/"/>
 	    <include name="test/Ice/serialize/"/>
 	    <include name="test/Ice/servantLocator/"/>
-	    <include name="test/Ice/servantLocatorAMD/"/>
 	    <include name="test/Ice/seqMapping/"/>
-	    <include name="test/Ice/seqMappingAMD/"/>
 	    <include name="test/Ice/slicing/exceptions/"/>
 	    <include name="test/Ice/slicing/objects/"/>
 	    <include name="test/Ice/stream/"/>
diff --git a/java/test/Ice/exceptions/AMDServer.java b/java/test/Ice/exceptions/AMDServer.java
index d77c94bc07b..a6f3f30e7a1 100644
--- a/java/test/Ice/exceptions/AMDServer.java
+++ b/java/test/Ice/exceptions/AMDServer.java
@@ -31,7 +31,7 @@ public class AMDServer extends test.Util.Application
         initData.logger = new DummyLogger();
 
         initData.properties = Ice.Util.createProperties(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.exceptionsAMD");
+        initData.properties.setProperty("Ice.Package.Test", "test.Ice.exceptions.AMD");
         initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp");
 
         // We don't need to disable warnings, because we have a dummy logger.
diff --git a/java/test/Ice/exceptions/AMDThrowerI.java b/java/test/Ice/exceptions/AMDThrowerI.java
index 86c84ca78de..b4b187a5ab1 100644
--- a/java/test/Ice/exceptions/AMDThrowerI.java
+++ b/java/test/Ice/exceptions/AMDThrowerI.java
@@ -9,27 +9,27 @@
 
 package test.Ice.exceptions;
 
-import test.Ice.exceptionsAMD.Test.A;
-import test.Ice.exceptionsAMD.Test.AMD_Thrower_shutdown;
-import test.Ice.exceptionsAMD.Test.AMD_Thrower_supportsAssertException;
-import test.Ice.exceptionsAMD.Test.AMD_Thrower_supportsUndeclaredExceptions;
-import test.Ice.exceptionsAMD.Test.AMD_Thrower_throwAasA;
-import test.Ice.exceptionsAMD.Test.AMD_Thrower_throwAorDasAorD;
-import test.Ice.exceptionsAMD.Test.AMD_Thrower_throwAssertException;
-import test.Ice.exceptionsAMD.Test.AMD_Thrower_throwBasA;
-import test.Ice.exceptionsAMD.Test.AMD_Thrower_throwBasB;
-import test.Ice.exceptionsAMD.Test.AMD_Thrower_throwCasA;
-import test.Ice.exceptionsAMD.Test.AMD_Thrower_throwCasB;
-import test.Ice.exceptionsAMD.Test.AMD_Thrower_throwCasC;
-import test.Ice.exceptionsAMD.Test.AMD_Thrower_throwLocalException;
-import test.Ice.exceptionsAMD.Test.AMD_Thrower_throwNonIceException;
-import test.Ice.exceptionsAMD.Test.AMD_Thrower_throwUndeclaredA;
-import test.Ice.exceptionsAMD.Test.AMD_Thrower_throwUndeclaredB;
-import test.Ice.exceptionsAMD.Test.AMD_Thrower_throwUndeclaredC;
-import test.Ice.exceptionsAMD.Test.B;
-import test.Ice.exceptionsAMD.Test.C;
-import test.Ice.exceptionsAMD.Test.D;
-import test.Ice.exceptionsAMD.Test._ThrowerDisp;
+import test.Ice.exceptions.AMD.Test.A;
+import test.Ice.exceptions.AMD.Test.AMD_Thrower_shutdown;
+import test.Ice.exceptions.AMD.Test.AMD_Thrower_supportsAssertException;
+import test.Ice.exceptions.AMD.Test.AMD_Thrower_supportsUndeclaredExceptions;
+import test.Ice.exceptions.AMD.Test.AMD_Thrower_throwAasA;
+import test.Ice.exceptions.AMD.Test.AMD_Thrower_throwAorDasAorD;
+import test.Ice.exceptions.AMD.Test.AMD_Thrower_throwAssertException;
+import test.Ice.exceptions.AMD.Test.AMD_Thrower_throwBasA;
+import test.Ice.exceptions.AMD.Test.AMD_Thrower_throwBasB;
+import test.Ice.exceptions.AMD.Test.AMD_Thrower_throwCasA;
+import test.Ice.exceptions.AMD.Test.AMD_Thrower_throwCasB;
+import test.Ice.exceptions.AMD.Test.AMD_Thrower_throwCasC;
+import test.Ice.exceptions.AMD.Test.AMD_Thrower_throwLocalException;
+import test.Ice.exceptions.AMD.Test.AMD_Thrower_throwNonIceException;
+import test.Ice.exceptions.AMD.Test.AMD_Thrower_throwUndeclaredA;
+import test.Ice.exceptions.AMD.Test.AMD_Thrower_throwUndeclaredB;
+import test.Ice.exceptions.AMD.Test.AMD_Thrower_throwUndeclaredC;
+import test.Ice.exceptions.AMD.Test.B;
+import test.Ice.exceptions.AMD.Test.C;
+import test.Ice.exceptions.AMD.Test.D;
+import test.Ice.exceptions.AMD.Test._ThrowerDisp;
 
 public final class AMDThrowerI extends _ThrowerDisp
 {
diff --git a/java/test/Ice/exceptions/TestAMD.ice b/java/test/Ice/exceptions/TestAMD.ice
index c689f36e8f1..e76338b0af3 100644
--- a/java/test/Ice/exceptions/TestAMD.ice
+++ b/java/test/Ice/exceptions/TestAMD.ice
@@ -10,7 +10,7 @@
 #ifndef TEST_AMD_ICE
 #define TEST_AMD_ICE
 
-[["java:package:test.Ice.exceptionsAMD"]]
+[["java:package:test.Ice.exceptions.AMD"]]
 module Test
 {
 
diff --git a/java/test/Ice/operations/AMDMyDerivedClassI.java b/java/test/Ice/operations/AMDMyDerivedClassI.java
index ca679e22779..1997bbba3d8 100644
--- a/java/test/Ice/operations/AMDMyDerivedClassI.java
+++ b/java/test/Ice/operations/AMDMyDerivedClassI.java
@@ -9,44 +9,44 @@
 
 package test.Ice.operations;
 
-import test.Ice.operationsAMD.Test.AMD_MyClass_opBool;
-import test.Ice.operationsAMD.Test.AMD_MyClass_opBoolS;
-import test.Ice.operationsAMD.Test.AMD_MyClass_opBoolSS;
-import test.Ice.operationsAMD.Test.AMD_MyClass_opByte;
-import test.Ice.operationsAMD.Test.AMD_MyClass_opByteBoolD;
-import test.Ice.operationsAMD.Test.AMD_MyClass_opByteS;
-import test.Ice.operationsAMD.Test.AMD_MyClass_opByteSOneway;
-import test.Ice.operationsAMD.Test.AMD_MyClass_opByteSS;
-import test.Ice.operationsAMD.Test.AMD_MyClass_opContext;
-import test.Ice.operationsAMD.Test.AMD_MyClass_opDoubleMarshaling;
-import test.Ice.operationsAMD.Test.AMD_MyClass_opFloatDouble;
-import test.Ice.operationsAMD.Test.AMD_MyClass_opFloatDoubleS;
-import test.Ice.operationsAMD.Test.AMD_MyClass_opFloatDoubleSS;
-import test.Ice.operationsAMD.Test.AMD_MyClass_opIntS;
-import test.Ice.operationsAMD.Test.AMD_MyClass_opLongFloatD;
-import test.Ice.operationsAMD.Test.AMD_MyClass_opMyClass;
-import test.Ice.operationsAMD.Test.AMD_MyClass_opMyEnum;
-import test.Ice.operationsAMD.Test.AMD_MyClass_opMyStructMyEnumD;
-import test.Ice.operationsAMD.Test.AMD_MyClass_opShortIntD;
-import test.Ice.operationsAMD.Test.AMD_MyClass_opShortIntLong;
-import test.Ice.operationsAMD.Test.AMD_MyClass_opShortIntLongS;
-import test.Ice.operationsAMD.Test.AMD_MyClass_opShortIntLongSS;
-import test.Ice.operationsAMD.Test.AMD_MyClass_opString;
-import test.Ice.operationsAMD.Test.AMD_MyClass_opStringMyEnumD;
-import test.Ice.operationsAMD.Test.AMD_MyClass_opStringS;
-import test.Ice.operationsAMD.Test.AMD_MyClass_opStringSS;
-import test.Ice.operationsAMD.Test.AMD_MyClass_opStringSSS;
-import test.Ice.operationsAMD.Test.AMD_MyClass_opStringStringD;
-import test.Ice.operationsAMD.Test.AMD_MyClass_opStruct;
-import test.Ice.operationsAMD.Test.AMD_MyClass_opVoid;
-import test.Ice.operationsAMD.Test.AMD_MyClass_shutdown;
-import test.Ice.operationsAMD.Test.AMD_MyDerivedClass_opDerived;
-import test.Ice.operationsAMD.Test.MyClassPrx;
-import test.Ice.operationsAMD.Test.MyClassPrxHelper;
-import test.Ice.operationsAMD.Test.MyDerivedClass;
-import test.Ice.operationsAMD.Test.MyEnum;
-import test.Ice.operationsAMD.Test.MyStruct;
-import test.Ice.operationsAMD.Test.Structure;
+import test.Ice.operations.AMD.Test.AMD_MyClass_opBool;
+import test.Ice.operations.AMD.Test.AMD_MyClass_opBoolS;
+import test.Ice.operations.AMD.Test.AMD_MyClass_opBoolSS;
+import test.Ice.operations.AMD.Test.AMD_MyClass_opByte;
+import test.Ice.operations.AMD.Test.AMD_MyClass_opByteBoolD;
+import test.Ice.operations.AMD.Test.AMD_MyClass_opByteS;
+import test.Ice.operations.AMD.Test.AMD_MyClass_opByteSOneway;
+import test.Ice.operations.AMD.Test.AMD_MyClass_opByteSS;
+import test.Ice.operations.AMD.Test.AMD_MyClass_opContext;
+import test.Ice.operations.AMD.Test.AMD_MyClass_opDoubleMarshaling;
+import test.Ice.operations.AMD.Test.AMD_MyClass_opFloatDouble;
+import test.Ice.operations.AMD.Test.AMD_MyClass_opFloatDoubleS;
+import test.Ice.operations.AMD.Test.AMD_MyClass_opFloatDoubleSS;
+import test.Ice.operations.AMD.Test.AMD_MyClass_opIntS;
+import test.Ice.operations.AMD.Test.AMD_MyClass_opLongFloatD;
+import test.Ice.operations.AMD.Test.AMD_MyClass_opMyClass;
+import test.Ice.operations.AMD.Test.AMD_MyClass_opMyEnum;
+import test.Ice.operations.AMD.Test.AMD_MyClass_opMyStructMyEnumD;
+import test.Ice.operations.AMD.Test.AMD_MyClass_opShortIntD;
+import test.Ice.operations.AMD.Test.AMD_MyClass_opShortIntLong;
+import test.Ice.operations.AMD.Test.AMD_MyClass_opShortIntLongS;
+import test.Ice.operations.AMD.Test.AMD_MyClass_opShortIntLongSS;
+import test.Ice.operations.AMD.Test.AMD_MyClass_opString;
+import test.Ice.operations.AMD.Test.AMD_MyClass_opStringMyEnumD;
+import test.Ice.operations.AMD.Test.AMD_MyClass_opStringS;
+import test.Ice.operations.AMD.Test.AMD_MyClass_opStringSS;
+import test.Ice.operations.AMD.Test.AMD_MyClass_opStringSSS;
+import test.Ice.operations.AMD.Test.AMD_MyClass_opStringStringD;
+import test.Ice.operations.AMD.Test.AMD_MyClass_opStruct;
+import test.Ice.operations.AMD.Test.AMD_MyClass_opVoid;
+import test.Ice.operations.AMD.Test.AMD_MyClass_shutdown;
+import test.Ice.operations.AMD.Test.AMD_MyDerivedClass_opDerived;
+import test.Ice.operations.AMD.Test.MyClassPrx;
+import test.Ice.operations.AMD.Test.MyClassPrxHelper;
+import test.Ice.operations.AMD.Test.MyDerivedClass;
+import test.Ice.operations.AMD.Test.MyEnum;
+import test.Ice.operations.AMD.Test.MyStruct;
+import test.Ice.operations.AMD.Test.Structure;
 
 public final class AMDMyDerivedClassI extends MyDerivedClass
 {
diff --git a/java/test/Ice/operations/AMDServer.java b/java/test/Ice/operations/AMDServer.java
index a58adbfb0a3..880f3cb23bc 100644
--- a/java/test/Ice/operations/AMDServer.java
+++ b/java/test/Ice/operations/AMDServer.java
@@ -30,7 +30,7 @@ public class AMDServer extends test.Util.Application
         // scheduling so we supress this warning.
         //
         initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.operationsAMD");
+        initData.properties.setProperty("Ice.Package.Test", "test.Ice.operations.AMD");
         initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 20000:udp");
 
         return initData;
diff --git a/java/test/Ice/operations/TestAMD.ice b/java/test/Ice/operations/TestAMD.ice
index bec8c048457..9a296e36523 100644
--- a/java/test/Ice/operations/TestAMD.ice
+++ b/java/test/Ice/operations/TestAMD.ice
@@ -12,7 +12,7 @@
 
 #include<Ice/Current.ice>
 
-[["java:package:test.Ice.operationsAMD"]]
+[["java:package:test.Ice.operations.AMD"]]
 module Test
 {
 
diff --git a/java/test/Ice/proxy/AMDMyDerivedClassI.java b/java/test/Ice/proxy/AMDMyDerivedClassI.java
index 3e5cff990b5..8e99c55af76 100644
--- a/java/test/Ice/proxy/AMDMyDerivedClassI.java
+++ b/java/test/Ice/proxy/AMDMyDerivedClassI.java
@@ -8,10 +8,10 @@
 // **********************************************************************
 
 package test.Ice.proxy;
-import test.Ice.proxyAMD.Test.AMD_MyClass_getContext;
-import test.Ice.proxyAMD.Test.AMD_MyClass_shutdown;
-import test.Ice.proxyAMD.Test.AMD_MyDerivedClass_echo;
-import test.Ice.proxyAMD.Test.MyDerivedClass;
+import test.Ice.proxy.AMD.Test.AMD_MyClass_getContext;
+import test.Ice.proxy.AMD.Test.AMD_MyClass_shutdown;
+import test.Ice.proxy.AMD.Test.AMD_MyDerivedClass_echo;
+import test.Ice.proxy.AMD.Test.MyDerivedClass;
 
 public final class AMDMyDerivedClassI extends MyDerivedClass
 {
diff --git a/java/test/Ice/proxy/AMDServer.java b/java/test/Ice/proxy/AMDServer.java
index 3520fc171f2..ccca44fc02a 100644
--- a/java/test/Ice/proxy/AMDServer.java
+++ b/java/test/Ice/proxy/AMDServer.java
@@ -25,7 +25,7 @@ public class AMDServer extends test.Util.Application
     {
         Ice.InitializationData initData = new Ice.InitializationData();
         initData.properties = Ice.Util.createProperties(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.proxy");
+        initData.properties.setProperty("Ice.Package.Test", "test.Ice.proxy.AMD");
         initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp");
         return initData;
     }
diff --git a/java/test/Ice/proxy/TestAMD.ice b/java/test/Ice/proxy/TestAMD.ice
index 330b2bce087..3361640a9da 100644
--- a/java/test/Ice/proxy/TestAMD.ice
+++ b/java/test/Ice/proxy/TestAMD.ice
@@ -12,7 +12,7 @@
 
 #include<Ice/Current.ice>
 
-[["java:package:test.Ice.proxyAMD"]]
+[["java:package:test.Ice.proxy.AMD"]]
 module Test
 {
 
diff --git a/java/test/Ice/seqMapping/AMDMyClassI.java b/java/test/Ice/seqMapping/AMDMyClassI.java
index 0866e4d113a..b7502ba976e 100644
--- a/java/test/Ice/seqMapping/AMDMyClassI.java
+++ b/java/test/Ice/seqMapping/AMDMyClassI.java
@@ -9,7 +9,7 @@
 
 package test.Ice.seqMapping;
 
-import test.Ice.seqMappingAMD.Test.*;
+import test.Ice.seqMapping.AMD.Test.*;
 import test.Ice.seqMapping.Serialize.*;
 
 public final class AMDMyClassI extends MyClass
diff --git a/java/test/Ice/seqMapping/AMDServer.java b/java/test/Ice/seqMapping/AMDServer.java
index f6d7ada57c9..0671b3b9739 100644
--- a/java/test/Ice/seqMapping/AMDServer.java
+++ b/java/test/Ice/seqMapping/AMDServer.java
@@ -25,7 +25,7 @@ public class AMDServer extends test.Util.Application
     {
         Ice.InitializationData initData = new Ice.InitializationData();
         initData.properties = Ice.Util.createProperties(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.seqMappingAMD");
+        initData.properties.setProperty("Ice.Package.Test", "test.Ice.seqMapping.AMD");
         initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
         return initData;
     }
diff --git a/java/test/Ice/seqMapping/TestAMD.ice b/java/test/Ice/seqMapping/TestAMD.ice
index ec95bdf2c7a..c32d951d62e 100644
--- a/java/test/Ice/seqMapping/TestAMD.ice
+++ b/java/test/Ice/seqMapping/TestAMD.ice
@@ -10,7 +10,7 @@
 #ifndef TEST_ICE
 #define TEST_ICE
 
-[["java:package:test.Ice.seqMappingAMD"]]
+[["java:package:test.Ice.seqMapping.AMD"]]
 module Test
 {
 
diff --git a/java/test/Ice/servantLocator/AMDCookieI.java b/java/test/Ice/servantLocator/AMDCookieI.java
index f3c1313fac8..fb4eb6b18e6 100644
--- a/java/test/Ice/servantLocator/AMDCookieI.java
+++ b/java/test/Ice/servantLocator/AMDCookieI.java
@@ -9,7 +9,7 @@
 
 package test.Ice.servantLocator;
 
-import test.Ice.servantLocatorAMD.Test.Cookie;
+import test.Ice.servantLocator.AMD.Test.Cookie;
 
 public final class AMDCookieI extends Cookie
 {
diff --git a/java/test/Ice/servantLocator/AMDServantLocatorI.java b/java/test/Ice/servantLocator/AMDServantLocatorI.java
index 020989c5fca..a8db66690d8 100644
--- a/java/test/Ice/servantLocator/AMDServantLocatorI.java
+++ b/java/test/Ice/servantLocator/AMDServantLocatorI.java
@@ -9,9 +9,9 @@
 
 package test.Ice.servantLocator;
 
-import test.Ice.servantLocatorAMD.Test.Cookie;
-import test.Ice.servantLocatorAMD.Test.TestImpossibleException;
-import test.Ice.servantLocatorAMD.Test.TestIntfUserException;
+import test.Ice.servantLocator.AMD.Test.Cookie;
+import test.Ice.servantLocator.AMD.Test.TestImpossibleException;
+import test.Ice.servantLocator.AMD.Test.TestIntfUserException;
 import Ice.ObjectNotExistException;
 import Ice.SocketException;
 import Ice.UnknownException;
diff --git a/java/test/Ice/servantLocator/AMDServer.java b/java/test/Ice/servantLocator/AMDServer.java
index 32168d24aab..38764531a6a 100644
--- a/java/test/Ice/servantLocator/AMDServer.java
+++ b/java/test/Ice/servantLocator/AMDServer.java
@@ -26,7 +26,7 @@ public class AMDServer extends test.Util.Application
     {
         Ice.InitializationData initData = new Ice.InitializationData();
         initData.properties = Ice.Util.createProperties(argsH);
-        initData.properties.setProperty("Ice.Package.Test", "test.Ice.servantLocator");
+        initData.properties.setProperty("Ice.Package.Test", "test.Ice.servantLocator.AMD");
         initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
         initData.properties.setProperty("Ice.Warn.Dispatch", "0");
 
diff --git a/java/test/Ice/servantLocator/AMDTestI.java b/java/test/Ice/servantLocator/AMDTestI.java
index df3bd63a89b..6971054de7b 100644
--- a/java/test/Ice/servantLocator/AMDTestI.java
+++ b/java/test/Ice/servantLocator/AMDTestI.java
@@ -9,18 +9,18 @@
 
 package test.Ice.servantLocator;
 
-import test.Ice.servantLocatorAMD.Test.AMD_TestIntf_impossibleException;
-import test.Ice.servantLocatorAMD.Test.AMD_TestIntf_intfUserException;
-import test.Ice.servantLocatorAMD.Test.AMD_TestIntf_javaException;
-import test.Ice.servantLocatorAMD.Test.AMD_TestIntf_localException;
-import test.Ice.servantLocatorAMD.Test.AMD_TestIntf_requestFailedException;
-import test.Ice.servantLocatorAMD.Test.AMD_TestIntf_shutdown;
-import test.Ice.servantLocatorAMD.Test.AMD_TestIntf_unknownException;
-import test.Ice.servantLocatorAMD.Test.AMD_TestIntf_unknownLocalException;
-import test.Ice.servantLocatorAMD.Test.AMD_TestIntf_unknownUserException;
-import test.Ice.servantLocatorAMD.Test.TestImpossibleException;
-import test.Ice.servantLocatorAMD.Test.TestIntfUserException;
-import test.Ice.servantLocatorAMD.Test._TestIntfDisp;
+import test.Ice.servantLocator.AMD.Test.AMD_TestIntf_impossibleException;
+import test.Ice.servantLocator.AMD.Test.AMD_TestIntf_intfUserException;
+import test.Ice.servantLocator.AMD.Test.AMD_TestIntf_javaException;
+import test.Ice.servantLocator.AMD.Test.AMD_TestIntf_localException;
+import test.Ice.servantLocator.AMD.Test.AMD_TestIntf_requestFailedException;
+import test.Ice.servantLocator.AMD.Test.AMD_TestIntf_shutdown;
+import test.Ice.servantLocator.AMD.Test.AMD_TestIntf_unknownException;
+import test.Ice.servantLocator.AMD.Test.AMD_TestIntf_unknownLocalException;
+import test.Ice.servantLocator.AMD.Test.AMD_TestIntf_unknownUserException;
+import test.Ice.servantLocator.AMD.Test.TestImpossibleException;
+import test.Ice.servantLocator.AMD.Test.TestIntfUserException;
+import test.Ice.servantLocator.AMD.Test._TestIntfDisp;
 
 public final class AMDTestI extends _TestIntfDisp
 {
diff --git a/java/test/Ice/servantLocator/TestAMD.ice b/java/test/Ice/servantLocator/TestAMD.ice
index 4b8ef93414c..cd1f2a9eedf 100644
--- a/java/test/Ice/servantLocator/TestAMD.ice
+++ b/java/test/Ice/servantLocator/TestAMD.ice
@@ -10,7 +10,7 @@
 #ifndef TEST_ICE
 #define TEST_ICE
 
-[["java:package:test.Ice.servantLocatorAMD"]]
+[["java:package:test.Ice.servantLocator.AMD"]]
 module Test
 {
 
diff --git a/java/test/Slice/keyword/build.xml b/java/test/Slice/keyword/build.xml
deleted file mode 100644
index 232871cd181..00000000000
--- a/java/test/Slice/keyword/build.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--
- **********************************************************************
-
- Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.
-
- This copy of Ice is licensed to you under the terms described in the
- ICE_LICENSE file included in this distribution.
-
- **********************************************************************
--->
-
-<project name="test_Slice_keyword" default="all" basedir=".">
-
-    <!-- set global properties for this build -->
-    <property name="top.dir" value="../../.."/>
-
-    <!-- import common definitions -->
-    <import file="${top.dir}/config/common.xml"/>
-
-    <target name="generate" depends="init">
-        <!-- Create the output directory for generated code -->
-        <mkdir dir="${generated.dir}"/>
-        <slice2java outputdir="${generated.dir}">
-	    <meta value="${java2metadata}"/>
-            <fileset dir="." includes="Key.ice"/>
-            <includepath>
-                <pathelement path="${slice.dir}" />
-            </includepath>
-        </slice2java>
-    </target>
-
-    <target name="compile" depends="generate">
-        <mkdir dir="${class.dir}"/>
-        <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    classpathref="ice.classpath" debug="${debug}">
-	    <compilerarg value="${javac.lint}"/>
-	</javac>
-	<javac srcdir="." destdir="${class.dir}"
-	    classpathref="ice.classpath" excludes="generated/**" debug="${debug}">
-	    <compilerarg value="${javac.lint}"/>
-	</javac>
-    </target>
-
-    <target name="all" depends="compile"/>
-
-    <target name="clean">
-        <delete dir="${generated.dir}"/>
-        <delete dir="${class.dir}"/>
-    </target>
-
-</project>