summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rwxr-xr-xjava/makedist.py2
-rw-r--r--java/src/IceInternal/PropertyNames.java3
2 files changed, 2 insertions, 3 deletions
diff --git a/java/makedist.py b/java/makedist.py
index 61674902fc5..7367ee55da2 100755
--- a/java/makedist.py
+++ b/java/makedist.py
@@ -233,7 +233,7 @@ for x in filesToRemove:
#
# Remove other unnecessary subdirectories.
#
-shutil.rmtree("admin")
+#shutil.rmtree("admin")
shutil.rmtree("depcache")
os.chdir(cwd)
diff --git a/java/src/IceInternal/PropertyNames.java b/java/src/IceInternal/PropertyNames.java
index 57cb93273c7..933522910e3 100644
--- a/java/src/IceInternal/PropertyNames.java
+++ b/java/src/IceInternal/PropertyNames.java
@@ -7,7 +7,7 @@
//
// **********************************************************************
-// Generated by makeprops.py from file `../config/PropertyNames.def', Thu Jun 15 15:56:17 2006
+// Generated by makeprops.py from file `../config/PropertyNames.def', Thu Jun 15 16:21:49 2006
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
@@ -301,7 +301,6 @@ public final class PropertyNames
"^Glacier2\\.Client\\.Trace\\.Request$",
"^Glacier2\\.Filter\\.Address\\.Reject$",
"^Glacier2\\.Filter\\.Address\\.Accept$",
- "^Glacier2\\.Filter\\.Address\\.AcceptOverride$",
"^Glacier2\\.Filter\\.MaxProxyLength$",
"^Glacier2\\.Filter\\.Category\\.Accept$",
"^Glacier2\\.Filter\\.AdapterId\\.Accept$",