diff options
Diffstat (limited to 'java/src')
561 files changed, 862 insertions, 0 deletions
diff --git a/java/src/Freeze/build.gradle b/java/src/Freeze/build.gradle new file mode 100644 index 00000000000..5d666377deb --- /dev/null +++ b/java/src/Freeze/build.gradle @@ -0,0 +1,48 @@ +slice { + java { + include = ["${sliceDir}"] + args = "--ice" + files = files(fileTree(dir: "$sliceDir/Freeze", includes:['*.ice'], excludes:["*F.ice"]), + file("./src/main/java/Freeze/PingObject.ice")) + } + freezej { + files = [file("${sliceDir}/Ice/BuiltinSequences.ice"), + file("${sliceDir}/Freeze/CatalogData.ice")] + args = "--ice" + dict { + CatalogData { + javaType = "Freeze.Catalog" + key = "string" + value = "Freeze::CatalogData" + } + } + dict { + CatalogIndexList { + javaType = "Freeze.CatalogIndexList" + key = "string" + value = "Ice::StringSeq" + } + } + } +} + +dependencies { + compile project(':src/Ice') + compile 'com.sleepycat:db:5.3.28' +} + +idea.module { + excludeDirs -= file(buildDir) + buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it } +} + +jar { + archiveName = "Freeze.jar" + destinationDir = new File("$rootProject.projectDir/lib/") +} + +task copyJars(type: Copy) { + from new File("$rootProject.projectDir/lib/Freeze.jar") + into "${prefix}/lib" +} +task install(dependsOn: copyJars) diff --git a/java/src/Freeze/BackgroundSaveEvictorI.java b/java/src/Freeze/src/main/java/Freeze/BackgroundSaveEvictorI.java index 867f686efd4..867f686efd4 100644 --- a/java/src/Freeze/BackgroundSaveEvictorI.java +++ b/java/src/Freeze/src/main/java/Freeze/BackgroundSaveEvictorI.java diff --git a/java/src/Freeze/ConnectionI.java b/java/src/Freeze/src/main/java/Freeze/ConnectionI.java index 194fe82cf31..194fe82cf31 100644 --- a/java/src/Freeze/ConnectionI.java +++ b/java/src/Freeze/src/main/java/Freeze/ConnectionI.java diff --git a/java/src/Freeze/EvictorElement.java b/java/src/Freeze/src/main/java/Freeze/EvictorElement.java index bf75d451ed9..bf75d451ed9 100644 --- a/java/src/Freeze/EvictorElement.java +++ b/java/src/Freeze/src/main/java/Freeze/EvictorElement.java diff --git a/java/src/Freeze/EvictorI.java b/java/src/Freeze/src/main/java/Freeze/EvictorI.java index 21644257092..21644257092 100644 --- a/java/src/Freeze/EvictorI.java +++ b/java/src/Freeze/src/main/java/Freeze/EvictorI.java diff --git a/java/src/Freeze/EvictorIteratorI.java b/java/src/Freeze/src/main/java/Freeze/EvictorIteratorI.java index e92dd671705..e92dd671705 100644 --- a/java/src/Freeze/EvictorIteratorI.java +++ b/java/src/Freeze/src/main/java/Freeze/EvictorIteratorI.java diff --git a/java/src/Freeze/FatalErrorCallback.java b/java/src/Freeze/src/main/java/Freeze/FatalErrorCallback.java index b911df70b62..b911df70b62 100644 --- a/java/src/Freeze/FatalErrorCallback.java +++ b/java/src/Freeze/src/main/java/Freeze/FatalErrorCallback.java diff --git a/java/src/Freeze/Index.java b/java/src/Freeze/src/main/java/Freeze/Index.java index 922c5f52c84..922c5f52c84 100644 --- a/java/src/Freeze/Index.java +++ b/java/src/Freeze/src/main/java/Freeze/Index.java diff --git a/java/src/Freeze/LinkedList.java b/java/src/Freeze/src/main/java/Freeze/LinkedList.java index dbeccf854a1..dbeccf854a1 100644 --- a/java/src/Freeze/LinkedList.java +++ b/java/src/Freeze/src/main/java/Freeze/LinkedList.java diff --git a/java/src/Freeze/Map.java b/java/src/Freeze/src/main/java/Freeze/Map.java index ddfef609246..ddfef609246 100644 --- a/java/src/Freeze/Map.java +++ b/java/src/Freeze/src/main/java/Freeze/Map.java diff --git a/java/src/Freeze/MapDb.java b/java/src/Freeze/src/main/java/Freeze/MapDb.java index 61c921b8312..61c921b8312 100644 --- a/java/src/Freeze/MapDb.java +++ b/java/src/Freeze/src/main/java/Freeze/MapDb.java diff --git a/java/src/Freeze/MapIndex.java b/java/src/Freeze/src/main/java/Freeze/MapIndex.java index 5084c67efed..5084c67efed 100644 --- a/java/src/Freeze/MapIndex.java +++ b/java/src/Freeze/src/main/java/Freeze/MapIndex.java diff --git a/java/src/Freeze/MapInternal/EntryI.java b/java/src/Freeze/src/main/java/Freeze/MapInternal/EntryI.java index e6d402e28b1..e6d402e28b1 100644 --- a/java/src/Freeze/MapInternal/EntryI.java +++ b/java/src/Freeze/src/main/java/Freeze/MapInternal/EntryI.java diff --git a/java/src/Freeze/MapInternal/Index.java b/java/src/Freeze/src/main/java/Freeze/MapInternal/Index.java index 331f14272f4..331f14272f4 100644 --- a/java/src/Freeze/MapInternal/Index.java +++ b/java/src/Freeze/src/main/java/Freeze/MapInternal/Index.java diff --git a/java/src/Freeze/MapInternal/IndexedSubMap.java b/java/src/Freeze/src/main/java/Freeze/MapInternal/IndexedSubMap.java index e2bb0b51ee0..e2bb0b51ee0 100644 --- a/java/src/Freeze/MapInternal/IndexedSubMap.java +++ b/java/src/Freeze/src/main/java/Freeze/MapInternal/IndexedSubMap.java diff --git a/java/src/Freeze/MapInternal/IteratorI.java b/java/src/Freeze/src/main/java/Freeze/MapInternal/IteratorI.java index d65c28403e4..d65c28403e4 100644 --- a/java/src/Freeze/MapInternal/IteratorI.java +++ b/java/src/Freeze/src/main/java/Freeze/MapInternal/IteratorI.java diff --git a/java/src/Freeze/MapInternal/IteratorModel.java b/java/src/Freeze/src/main/java/Freeze/MapInternal/IteratorModel.java index feb60255d6e..feb60255d6e 100644 --- a/java/src/Freeze/MapInternal/IteratorModel.java +++ b/java/src/Freeze/src/main/java/Freeze/MapInternal/IteratorModel.java diff --git a/java/src/Freeze/MapInternal/KeyCodec.java b/java/src/Freeze/src/main/java/Freeze/MapInternal/KeyCodec.java index f633efd8340..f633efd8340 100644 --- a/java/src/Freeze/MapInternal/KeyCodec.java +++ b/java/src/Freeze/src/main/java/Freeze/MapInternal/KeyCodec.java diff --git a/java/src/Freeze/MapInternal/MapI.java b/java/src/Freeze/src/main/java/Freeze/MapInternal/MapI.java index 389e935ed41..389e935ed41 100644 --- a/java/src/Freeze/MapInternal/MapI.java +++ b/java/src/Freeze/src/main/java/Freeze/MapInternal/MapI.java diff --git a/java/src/Freeze/MapInternal/Search.java b/java/src/Freeze/src/main/java/Freeze/MapInternal/Search.java index 0579e4fd1aa..0579e4fd1aa 100644 --- a/java/src/Freeze/MapInternal/Search.java +++ b/java/src/Freeze/src/main/java/Freeze/MapInternal/Search.java diff --git a/java/src/Freeze/MapInternal/SubMap.java b/java/src/Freeze/src/main/java/Freeze/MapInternal/SubMap.java index 5f9fdff28c1..5f9fdff28c1 100644 --- a/java/src/Freeze/MapInternal/SubMap.java +++ b/java/src/Freeze/src/main/java/Freeze/MapInternal/SubMap.java diff --git a/java/src/Freeze/MapInternal/TraceLevels.java b/java/src/Freeze/src/main/java/Freeze/MapInternal/TraceLevels.java index 1ebf6c3aa37..1ebf6c3aa37 100644 --- a/java/src/Freeze/MapInternal/TraceLevels.java +++ b/java/src/Freeze/src/main/java/Freeze/MapInternal/TraceLevels.java diff --git a/java/src/Freeze/MapInternal/UtilI.java b/java/src/Freeze/src/main/java/Freeze/MapInternal/UtilI.java index 433324308cc..433324308cc 100644 --- a/java/src/Freeze/MapInternal/UtilI.java +++ b/java/src/Freeze/src/main/java/Freeze/MapInternal/UtilI.java diff --git a/java/src/Freeze/NavigableMap.java b/java/src/Freeze/src/main/java/Freeze/NavigableMap.java index aa76f6d0207..aa76f6d0207 100644 --- a/java/src/Freeze/NavigableMap.java +++ b/java/src/Freeze/src/main/java/Freeze/NavigableMap.java diff --git a/java/src/Freeze/ObjectStore.java b/java/src/Freeze/src/main/java/Freeze/ObjectStore.java index fcd3253dab0..fcd3253dab0 100644 --- a/java/src/Freeze/ObjectStore.java +++ b/java/src/Freeze/src/main/java/Freeze/ObjectStore.java diff --git a/java/src/Freeze/PingObject.ice b/java/src/Freeze/src/main/java/Freeze/PingObject.ice index c74e7236e4f..c74e7236e4f 100644 --- a/java/src/Freeze/PingObject.ice +++ b/java/src/Freeze/src/main/java/Freeze/PingObject.ice diff --git a/java/src/Freeze/PostCompletionCallback.java b/java/src/Freeze/src/main/java/Freeze/PostCompletionCallback.java index 6621a4d2ed9..6621a4d2ed9 100644 --- a/java/src/Freeze/PostCompletionCallback.java +++ b/java/src/Freeze/src/main/java/Freeze/PostCompletionCallback.java diff --git a/java/src/Freeze/SharedDbEnv.java b/java/src/Freeze/src/main/java/Freeze/SharedDbEnv.java index 4ad294c771e..4ad294c771e 100644 --- a/java/src/Freeze/SharedDbEnv.java +++ b/java/src/Freeze/src/main/java/Freeze/SharedDbEnv.java diff --git a/java/src/Freeze/TransactionI.java b/java/src/Freeze/src/main/java/Freeze/TransactionI.java index 55f61e5e217..55f61e5e217 100644 --- a/java/src/Freeze/TransactionI.java +++ b/java/src/Freeze/src/main/java/Freeze/TransactionI.java diff --git a/java/src/Freeze/TransactionalEvictorContext.java b/java/src/Freeze/src/main/java/Freeze/TransactionalEvictorContext.java index 21e1b6d6597..21e1b6d6597 100644 --- a/java/src/Freeze/TransactionalEvictorContext.java +++ b/java/src/Freeze/src/main/java/Freeze/TransactionalEvictorContext.java diff --git a/java/src/Freeze/TransactionalEvictorDeadlockException.java b/java/src/Freeze/src/main/java/Freeze/TransactionalEvictorDeadlockException.java index 2515691dd19..2515691dd19 100644 --- a/java/src/Freeze/TransactionalEvictorDeadlockException.java +++ b/java/src/Freeze/src/main/java/Freeze/TransactionalEvictorDeadlockException.java diff --git a/java/src/Freeze/TransactionalEvictorI.java b/java/src/Freeze/src/main/java/Freeze/TransactionalEvictorI.java index 75a693786dd..75a693786dd 100644 --- a/java/src/Freeze/TransactionalEvictorI.java +++ b/java/src/Freeze/src/main/java/Freeze/TransactionalEvictorI.java diff --git a/java/src/Freeze/Util.java b/java/src/Freeze/src/main/java/Freeze/Util.java index 555b28281a1..555b28281a1 100644 --- a/java/src/Freeze/Util.java +++ b/java/src/Freeze/src/main/java/Freeze/Util.java diff --git a/java/src/Freeze/src_Freeze.iml b/java/src/Freeze/src_Freeze.iml new file mode 100644 index 00000000000..50af0d3b383 --- /dev/null +++ b/java/src/Freeze/src_Freeze.iml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/build/classes/main" /> + <output-test url="file://$MODULE_DIR$/build/classes/test" /> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> + <excludeFolder url="file://$MODULE_DIR$/.gradle" /> + <excludeFolder url="file://$MODULE_DIR$/build/classes" /> + <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" /> + <excludeFolder url="file://$MODULE_DIR$/build/tmp" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="src_Ice" exported="" /> + <orderEntry type="library" exported="" name="Gradle: db-5.3.28" level="project" /> + </component> +</module> + diff --git a/java/src/Glacier2/build.gradle b/java/src/Glacier2/build.gradle new file mode 100644 index 00000000000..eda876c78a2 --- /dev/null +++ b/java/src/Glacier2/build.gradle @@ -0,0 +1,27 @@ +slice { + java { + include = ["${sliceDir}"] + args = "--ice --tie --checksum Glacier2.SliceChecksums" + files = fileTree(dir: "$sliceDir/Glacier2", includes:['*.ice'], excludes:["*F.ice"]) + } +} + +idea.module { + excludeDirs -= file(buildDir) + buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it } +} + +dependencies { + compile project(':src/Ice') +} + +jar { + archiveName = "Glacier2.jar" + destinationDir = new File("$rootProject.projectDir/lib/") +} + +task copyJars(type: Copy) { + from new File("$rootProject.projectDir/lib/Glacier2.jar") + into "${prefix}/lib" +} +task install(dependsOn: copyJars) diff --git a/java/src/Glacier2/Application.java b/java/src/Glacier2/src/main/java/Glacier2/Application.java index 6217b4fa4cb..6217b4fa4cb 100644 --- a/java/src/Glacier2/Application.java +++ b/java/src/Glacier2/src/main/java/Glacier2/Application.java diff --git a/java/src/Glacier2/SessionCallback.java b/java/src/Glacier2/src/main/java/Glacier2/SessionCallback.java index 0e7f0149850..0e7f0149850 100644 --- a/java/src/Glacier2/SessionCallback.java +++ b/java/src/Glacier2/src/main/java/Glacier2/SessionCallback.java diff --git a/java/src/Glacier2/SessionFactoryHelper.java b/java/src/Glacier2/src/main/java/Glacier2/SessionFactoryHelper.java index dc7f7beec0e..dc7f7beec0e 100644 --- a/java/src/Glacier2/SessionFactoryHelper.java +++ b/java/src/Glacier2/src/main/java/Glacier2/SessionFactoryHelper.java diff --git a/java/src/Glacier2/SessionHelper.java b/java/src/Glacier2/src/main/java/Glacier2/SessionHelper.java index 30b9f2aa616..30b9f2aa616 100644 --- a/java/src/Glacier2/SessionHelper.java +++ b/java/src/Glacier2/src/main/java/Glacier2/SessionHelper.java diff --git a/java/src/Glacier2/src_Glacier2.iml b/java/src/Glacier2/src_Glacier2.iml new file mode 100644 index 00000000000..b96135a8ded --- /dev/null +++ b/java/src/Glacier2/src_Glacier2.iml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/build/classes/main" /> + <output-test url="file://$MODULE_DIR$/build/classes/test" /> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> + <excludeFolder url="file://$MODULE_DIR$/.gradle" /> + <excludeFolder url="file://$MODULE_DIR$/build/classes" /> + <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" /> + <excludeFolder url="file://$MODULE_DIR$/build/tmp" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="src_Ice" exported="" /> + </component> +</module> + diff --git a/java/src/Ice/build.gradle b/java/src/Ice/build.gradle new file mode 100644 index 00000000000..9b3e230a00d --- /dev/null +++ b/java/src/Ice/build.gradle @@ -0,0 +1,30 @@ +slice { + java { + stream { + args = "--ice --stream" + files = [file("$sliceDir/Ice/BuiltinSequences.ice")] + } + nostream { + include = ["${sliceDir}"] + args = "--ice" + files = fileTree(dir: "$sliceDir", includes:['Ice/*.ice', 'IceSSL/*.ice'], + excludes:['Ice/*F.ice', 'Ice/BuiltinSequences.ice']) + } + } +} + +idea.module { + excludeDirs -= file(buildDir) + buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it } +} + +jar { + archiveName = "Ice.jar" + destinationDir = new File("$rootProject.projectDir/lib/") +} + +task copyJars(type: Copy) { + from new File("$rootProject.projectDir/lib/Ice.jar") + into "${prefix}/lib" +} +task install(dependsOn: copyJars) diff --git a/java/src/Ice/AMDCallback.java b/java/src/Ice/src/main/java/Ice/AMDCallback.java index 724a6661c92..724a6661c92 100644 --- a/java/src/Ice/AMDCallback.java +++ b/java/src/Ice/src/main/java/Ice/AMDCallback.java diff --git a/java/src/Ice/AMD_Object_ice_invoke.java b/java/src/Ice/src/main/java/Ice/AMD_Object_ice_invoke.java index 6ef7849b964..6ef7849b964 100644 --- a/java/src/Ice/AMD_Object_ice_invoke.java +++ b/java/src/Ice/src/main/java/Ice/AMD_Object_ice_invoke.java diff --git a/java/src/Ice/Application.java b/java/src/Ice/src/main/java/Ice/Application.java index ab9a72f272d..ab9a72f272d 100644 --- a/java/src/Ice/Application.java +++ b/java/src/Ice/src/main/java/Ice/Application.java diff --git a/java/src/Ice/AsyncCallback.java b/java/src/Ice/src/main/java/Ice/AsyncCallback.java index ca458930d2f..ca458930d2f 100644 --- a/java/src/Ice/AsyncCallback.java +++ b/java/src/Ice/src/main/java/Ice/AsyncCallback.java diff --git a/java/src/Ice/AsyncResult.java b/java/src/Ice/src/main/java/Ice/AsyncResult.java index da6154bf1bd..da6154bf1bd 100644 --- a/java/src/Ice/AsyncResult.java +++ b/java/src/Ice/src/main/java/Ice/AsyncResult.java diff --git a/java/src/Ice/Blobject.java b/java/src/Ice/src/main/java/Ice/Blobject.java index 2861ac1116f..2861ac1116f 100644 --- a/java/src/Ice/Blobject.java +++ b/java/src/Ice/src/main/java/Ice/Blobject.java diff --git a/java/src/Ice/BlobjectAsync.java b/java/src/Ice/src/main/java/Ice/BlobjectAsync.java index e52ff6d7070..e52ff6d7070 100644 --- a/java/src/Ice/BlobjectAsync.java +++ b/java/src/Ice/src/main/java/Ice/BlobjectAsync.java diff --git a/java/src/Ice/BooleanHolder.java b/java/src/Ice/src/main/java/Ice/BooleanHolder.java index 5fd2d7b9b18..5fd2d7b9b18 100644 --- a/java/src/Ice/BooleanHolder.java +++ b/java/src/Ice/src/main/java/Ice/BooleanHolder.java diff --git a/java/src/Ice/BooleanOptional.java b/java/src/Ice/src/main/java/Ice/BooleanOptional.java index 4ee96828129..4ee96828129 100644 --- a/java/src/Ice/BooleanOptional.java +++ b/java/src/Ice/src/main/java/Ice/BooleanOptional.java diff --git a/java/src/Ice/ByteHolder.java b/java/src/Ice/src/main/java/Ice/ByteHolder.java index f98aa94421e..f98aa94421e 100644 --- a/java/src/Ice/ByteHolder.java +++ b/java/src/Ice/src/main/java/Ice/ByteHolder.java diff --git a/java/src/Ice/ByteOptional.java b/java/src/Ice/src/main/java/Ice/ByteOptional.java index 0e7678026e9..0e7678026e9 100644 --- a/java/src/Ice/ByteOptional.java +++ b/java/src/Ice/src/main/java/Ice/ByteOptional.java diff --git a/java/src/Ice/Callback.java b/java/src/Ice/src/main/java/Ice/Callback.java index b4cabf9a30e..b4cabf9a30e 100644 --- a/java/src/Ice/Callback.java +++ b/java/src/Ice/src/main/java/Ice/Callback.java diff --git a/java/src/Ice/Callback_Communicator_flushBatchRequests.java b/java/src/Ice/src/main/java/Ice/Callback_Communicator_flushBatchRequests.java index 3ebab69b4e4..3ebab69b4e4 100644 --- a/java/src/Ice/Callback_Communicator_flushBatchRequests.java +++ b/java/src/Ice/src/main/java/Ice/Callback_Communicator_flushBatchRequests.java diff --git a/java/src/Ice/Callback_Connection_flushBatchRequests.java b/java/src/Ice/src/main/java/Ice/Callback_Connection_flushBatchRequests.java index ceea4e06140..ceea4e06140 100644 --- a/java/src/Ice/Callback_Connection_flushBatchRequests.java +++ b/java/src/Ice/src/main/java/Ice/Callback_Connection_flushBatchRequests.java diff --git a/java/src/Ice/Callback_Object_ice_flushBatchRequests.java b/java/src/Ice/src/main/java/Ice/Callback_Object_ice_flushBatchRequests.java index 4ad2d4d8642..4ad2d4d8642 100644 --- a/java/src/Ice/Callback_Object_ice_flushBatchRequests.java +++ b/java/src/Ice/src/main/java/Ice/Callback_Object_ice_flushBatchRequests.java diff --git a/java/src/Ice/Callback_Object_ice_getConnection.java b/java/src/Ice/src/main/java/Ice/Callback_Object_ice_getConnection.java index 14b5de10939..14b5de10939 100644 --- a/java/src/Ice/Callback_Object_ice_getConnection.java +++ b/java/src/Ice/src/main/java/Ice/Callback_Object_ice_getConnection.java diff --git a/java/src/Ice/Callback_Object_ice_id.java b/java/src/Ice/src/main/java/Ice/Callback_Object_ice_id.java index 9ecfe651133..9ecfe651133 100644 --- a/java/src/Ice/Callback_Object_ice_id.java +++ b/java/src/Ice/src/main/java/Ice/Callback_Object_ice_id.java diff --git a/java/src/Ice/Callback_Object_ice_ids.java b/java/src/Ice/src/main/java/Ice/Callback_Object_ice_ids.java index cfe7adbf87a..cfe7adbf87a 100644 --- a/java/src/Ice/Callback_Object_ice_ids.java +++ b/java/src/Ice/src/main/java/Ice/Callback_Object_ice_ids.java diff --git a/java/src/Ice/Callback_Object_ice_invoke.java b/java/src/Ice/src/main/java/Ice/Callback_Object_ice_invoke.java index 5d43c563117..5d43c563117 100644 --- a/java/src/Ice/Callback_Object_ice_invoke.java +++ b/java/src/Ice/src/main/java/Ice/Callback_Object_ice_invoke.java diff --git a/java/src/Ice/Callback_Object_ice_isA.java b/java/src/Ice/src/main/java/Ice/Callback_Object_ice_isA.java index ede633b21db..ede633b21db 100644 --- a/java/src/Ice/Callback_Object_ice_isA.java +++ b/java/src/Ice/src/main/java/Ice/Callback_Object_ice_isA.java diff --git a/java/src/Ice/Callback_Object_ice_ping.java b/java/src/Ice/src/main/java/Ice/Callback_Object_ice_ping.java index ce9226c6833..ce9226c6833 100644 --- a/java/src/Ice/Callback_Object_ice_ping.java +++ b/java/src/Ice/src/main/java/Ice/Callback_Object_ice_ping.java diff --git a/java/src/Ice/CommunicatorI.java b/java/src/Ice/src/main/java/Ice/CommunicatorI.java index fab8cf98605..fab8cf98605 100644 --- a/java/src/Ice/CommunicatorI.java +++ b/java/src/Ice/src/main/java/Ice/CommunicatorI.java diff --git a/java/src/Ice/CompactIdResolver.java b/java/src/Ice/src/main/java/Ice/CompactIdResolver.java index 89761b63510..89761b63510 100644 --- a/java/src/Ice/CompactIdResolver.java +++ b/java/src/Ice/src/main/java/Ice/CompactIdResolver.java diff --git a/java/src/Ice/ConnectionI.java b/java/src/Ice/src/main/java/Ice/ConnectionI.java index c0b74d70bac..c0b74d70bac 100644 --- a/java/src/Ice/ConnectionI.java +++ b/java/src/Ice/src/main/java/Ice/ConnectionI.java diff --git a/java/src/Ice/DispatchInterceptor.java b/java/src/Ice/src/main/java/Ice/DispatchInterceptor.java index 276a17d50b4..276a17d50b4 100644 --- a/java/src/Ice/DispatchInterceptor.java +++ b/java/src/Ice/src/main/java/Ice/DispatchInterceptor.java diff --git a/java/src/Ice/DispatchInterceptorAsyncCallback.java b/java/src/Ice/src/main/java/Ice/DispatchInterceptorAsyncCallback.java index fdbf42ebe06..fdbf42ebe06 100644 --- a/java/src/Ice/DispatchInterceptorAsyncCallback.java +++ b/java/src/Ice/src/main/java/Ice/DispatchInterceptorAsyncCallback.java diff --git a/java/src/Ice/DispatchStatus.java b/java/src/Ice/src/main/java/Ice/DispatchStatus.java index 17183455814..17183455814 100644 --- a/java/src/Ice/DispatchStatus.java +++ b/java/src/Ice/src/main/java/Ice/DispatchStatus.java diff --git a/java/src/Ice/Dispatcher.java b/java/src/Ice/src/main/java/Ice/Dispatcher.java index 5a2a7dc65cd..5a2a7dc65cd 100644 --- a/java/src/Ice/Dispatcher.java +++ b/java/src/Ice/src/main/java/Ice/Dispatcher.java diff --git a/java/src/Ice/DoubleHolder.java b/java/src/Ice/src/main/java/Ice/DoubleHolder.java index 053ba06d8f2..053ba06d8f2 100644 --- a/java/src/Ice/DoubleHolder.java +++ b/java/src/Ice/src/main/java/Ice/DoubleHolder.java diff --git a/java/src/Ice/DoubleOptional.java b/java/src/Ice/src/main/java/Ice/DoubleOptional.java index a63892a8230..a63892a8230 100644 --- a/java/src/Ice/DoubleOptional.java +++ b/java/src/Ice/src/main/java/Ice/DoubleOptional.java diff --git a/java/src/Ice/Exception.java b/java/src/Ice/src/main/java/Ice/Exception.java index f2ad7ab33c1..f2ad7ab33c1 100644 --- a/java/src/Ice/Exception.java +++ b/java/src/Ice/src/main/java/Ice/Exception.java diff --git a/java/src/Ice/FloatHolder.java b/java/src/Ice/src/main/java/Ice/FloatHolder.java index c8fbcc2dc3e..c8fbcc2dc3e 100644 --- a/java/src/Ice/FloatHolder.java +++ b/java/src/Ice/src/main/java/Ice/FloatHolder.java diff --git a/java/src/Ice/FloatOptional.java b/java/src/Ice/src/main/java/Ice/FloatOptional.java index 1766d4fe186..1766d4fe186 100644 --- a/java/src/Ice/FloatOptional.java +++ b/java/src/Ice/src/main/java/Ice/FloatOptional.java diff --git a/java/src/Ice/FormatType.java b/java/src/Ice/src/main/java/Ice/FormatType.java index 2ef45ec721b..2ef45ec721b 100644 --- a/java/src/Ice/FormatType.java +++ b/java/src/Ice/src/main/java/Ice/FormatType.java diff --git a/java/src/Ice/Holder.java b/java/src/Ice/src/main/java/Ice/Holder.java index 03b98972840..03b98972840 100644 --- a/java/src/Ice/Holder.java +++ b/java/src/Ice/src/main/java/Ice/Holder.java diff --git a/java/src/Ice/ImplicitContextI.java b/java/src/Ice/src/main/java/Ice/ImplicitContextI.java index 1ca53b9c4da..1ca53b9c4da 100644 --- a/java/src/Ice/ImplicitContextI.java +++ b/java/src/Ice/src/main/java/Ice/ImplicitContextI.java diff --git a/java/src/Ice/InitializationData.java b/java/src/Ice/src/main/java/Ice/InitializationData.java index 7dde4c0baf5..7dde4c0baf5 100644 --- a/java/src/Ice/InitializationData.java +++ b/java/src/Ice/src/main/java/Ice/InitializationData.java diff --git a/java/src/Ice/InputStream.java b/java/src/Ice/src/main/java/Ice/InputStream.java index b835c2107c8..b835c2107c8 100644 --- a/java/src/Ice/InputStream.java +++ b/java/src/Ice/src/main/java/Ice/InputStream.java diff --git a/java/src/Ice/InputStreamI.java b/java/src/Ice/src/main/java/Ice/InputStreamI.java index a05e64de5ac..a05e64de5ac 100644 --- a/java/src/Ice/InputStreamI.java +++ b/java/src/Ice/src/main/java/Ice/InputStreamI.java diff --git a/java/src/Ice/IntHolder.java b/java/src/Ice/src/main/java/Ice/IntHolder.java index 3e81cab5b36..3e81cab5b36 100644 --- a/java/src/Ice/IntHolder.java +++ b/java/src/Ice/src/main/java/Ice/IntHolder.java diff --git a/java/src/Ice/IntOptional.java b/java/src/Ice/src/main/java/Ice/IntOptional.java index 1c9a0685135..1c9a0685135 100644 --- a/java/src/Ice/IntOptional.java +++ b/java/src/Ice/src/main/java/Ice/IntOptional.java diff --git a/java/src/Ice/LocalException.java b/java/src/Ice/src/main/java/Ice/LocalException.java index f521ce01fe5..f521ce01fe5 100644 --- a/java/src/Ice/LocalException.java +++ b/java/src/Ice/src/main/java/Ice/LocalException.java diff --git a/java/src/Ice/LocalObjectHolder.java b/java/src/Ice/src/main/java/Ice/LocalObjectHolder.java index 05e13dc3687..05e13dc3687 100644 --- a/java/src/Ice/LocalObjectHolder.java +++ b/java/src/Ice/src/main/java/Ice/LocalObjectHolder.java diff --git a/java/src/Ice/LoggerI.java b/java/src/Ice/src/main/java/Ice/LoggerI.java index e2c381ae383..e2c381ae383 100644 --- a/java/src/Ice/LoggerI.java +++ b/java/src/Ice/src/main/java/Ice/LoggerI.java diff --git a/java/src/Ice/LoggerPlugin.java b/java/src/Ice/src/main/java/Ice/LoggerPlugin.java index dd0ae4767fa..dd0ae4767fa 100644 --- a/java/src/Ice/LoggerPlugin.java +++ b/java/src/Ice/src/main/java/Ice/LoggerPlugin.java diff --git a/java/src/Ice/LongHolder.java b/java/src/Ice/src/main/java/Ice/LongHolder.java index ee6a18f752a..ee6a18f752a 100644 --- a/java/src/Ice/LongHolder.java +++ b/java/src/Ice/src/main/java/Ice/LongHolder.java diff --git a/java/src/Ice/LongOptional.java b/java/src/Ice/src/main/java/Ice/LongOptional.java index 9a0e3a841b6..9a0e3a841b6 100644 --- a/java/src/Ice/LongOptional.java +++ b/java/src/Ice/src/main/java/Ice/LongOptional.java diff --git a/java/src/Ice/NativePropertiesAdmin.java b/java/src/Ice/src/main/java/Ice/NativePropertiesAdmin.java index c5b13bad937..c5b13bad937 100644 --- a/java/src/Ice/NativePropertiesAdmin.java +++ b/java/src/Ice/src/main/java/Ice/NativePropertiesAdmin.java diff --git a/java/src/Ice/Object.java b/java/src/Ice/src/main/java/Ice/Object.java index b4712e8df24..b4712e8df24 100644 --- a/java/src/Ice/Object.java +++ b/java/src/Ice/src/main/java/Ice/Object.java diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/src/main/java/Ice/ObjectAdapterI.java index 48ad2739082..48ad2739082 100644 --- a/java/src/Ice/ObjectAdapterI.java +++ b/java/src/Ice/src/main/java/Ice/ObjectAdapterI.java diff --git a/java/src/Ice/ObjectHolder.java b/java/src/Ice/src/main/java/Ice/ObjectHolder.java index 0fc2d4b6a8c..0fc2d4b6a8c 100644 --- a/java/src/Ice/ObjectHolder.java +++ b/java/src/Ice/src/main/java/Ice/ObjectHolder.java diff --git a/java/src/Ice/ObjectHolderBase.java b/java/src/Ice/src/main/java/Ice/ObjectHolderBase.java index 45762db86bd..45762db86bd 100644 --- a/java/src/Ice/ObjectHolderBase.java +++ b/java/src/Ice/src/main/java/Ice/ObjectHolderBase.java diff --git a/java/src/Ice/ObjectImpl.java b/java/src/Ice/src/main/java/Ice/ObjectImpl.java index 0f2924a9de5..0f2924a9de5 100644 --- a/java/src/Ice/ObjectImpl.java +++ b/java/src/Ice/src/main/java/Ice/ObjectImpl.java diff --git a/java/src/Ice/ObjectInputStream.java b/java/src/Ice/src/main/java/Ice/ObjectInputStream.java index aeaa706f915..aeaa706f915 100644 --- a/java/src/Ice/ObjectInputStream.java +++ b/java/src/Ice/src/main/java/Ice/ObjectInputStream.java diff --git a/java/src/Ice/ObjectPrx.java b/java/src/Ice/src/main/java/Ice/ObjectPrx.java index 57f30adaff8..57f30adaff8 100644 --- a/java/src/Ice/ObjectPrx.java +++ b/java/src/Ice/src/main/java/Ice/ObjectPrx.java diff --git a/java/src/Ice/ObjectPrxHelper.java b/java/src/Ice/src/main/java/Ice/ObjectPrxHelper.java index c390823e61f..c390823e61f 100644 --- a/java/src/Ice/ObjectPrxHelper.java +++ b/java/src/Ice/src/main/java/Ice/ObjectPrxHelper.java diff --git a/java/src/Ice/ObjectPrxHelperBase.java b/java/src/Ice/src/main/java/Ice/ObjectPrxHelperBase.java index 2c763f56cc2..2c763f56cc2 100644 --- a/java/src/Ice/ObjectPrxHelperBase.java +++ b/java/src/Ice/src/main/java/Ice/ObjectPrxHelperBase.java diff --git a/java/src/Ice/ObjectPrxHolder.java b/java/src/Ice/src/main/java/Ice/ObjectPrxHolder.java index 7c0b84364c4..7c0b84364c4 100644 --- a/java/src/Ice/ObjectPrxHolder.java +++ b/java/src/Ice/src/main/java/Ice/ObjectPrxHolder.java diff --git a/java/src/Ice/ObjectReader.java b/java/src/Ice/src/main/java/Ice/ObjectReader.java index 9ccecd38446..9ccecd38446 100644 --- a/java/src/Ice/ObjectReader.java +++ b/java/src/Ice/src/main/java/Ice/ObjectReader.java diff --git a/java/src/Ice/ObjectWriter.java b/java/src/Ice/src/main/java/Ice/ObjectWriter.java index 4ae8a087075..4ae8a087075 100644 --- a/java/src/Ice/ObjectWriter.java +++ b/java/src/Ice/src/main/java/Ice/ObjectWriter.java diff --git a/java/src/Ice/OnewayCallback.java b/java/src/Ice/src/main/java/Ice/OnewayCallback.java index 3401c98fc9d..3401c98fc9d 100644 --- a/java/src/Ice/OnewayCallback.java +++ b/java/src/Ice/src/main/java/Ice/OnewayCallback.java diff --git a/java/src/Ice/Optional.java b/java/src/Ice/src/main/java/Ice/Optional.java index 1b44f4148a2..1b44f4148a2 100644 --- a/java/src/Ice/Optional.java +++ b/java/src/Ice/src/main/java/Ice/Optional.java diff --git a/java/src/Ice/OptionalFormat.java b/java/src/Ice/src/main/java/Ice/OptionalFormat.java index 86b14d686e5..86b14d686e5 100644 --- a/java/src/Ice/OptionalFormat.java +++ b/java/src/Ice/src/main/java/Ice/OptionalFormat.java diff --git a/java/src/Ice/OptionalObject.java b/java/src/Ice/src/main/java/Ice/OptionalObject.java index ef113f68971..ef113f68971 100644 --- a/java/src/Ice/OptionalObject.java +++ b/java/src/Ice/src/main/java/Ice/OptionalObject.java diff --git a/java/src/Ice/OutputStream.java b/java/src/Ice/src/main/java/Ice/OutputStream.java index 3d8980ccef4..3d8980ccef4 100644 --- a/java/src/Ice/OutputStream.java +++ b/java/src/Ice/src/main/java/Ice/OutputStream.java diff --git a/java/src/Ice/OutputStreamI.java b/java/src/Ice/src/main/java/Ice/OutputStreamI.java index a5b8836c5cf..a5b8836c5cf 100644 --- a/java/src/Ice/OutputStreamI.java +++ b/java/src/Ice/src/main/java/Ice/OutputStreamI.java diff --git a/java/src/Ice/PluginFactory.java b/java/src/Ice/src/main/java/Ice/PluginFactory.java index a7fb40db6f7..a7fb40db6f7 100644 --- a/java/src/Ice/PluginFactory.java +++ b/java/src/Ice/src/main/java/Ice/PluginFactory.java diff --git a/java/src/Ice/PluginManagerI.java b/java/src/Ice/src/main/java/Ice/PluginManagerI.java index 96cc2c18ae4..96cc2c18ae4 100644 --- a/java/src/Ice/PluginManagerI.java +++ b/java/src/Ice/src/main/java/Ice/PluginManagerI.java diff --git a/java/src/Ice/PropertiesAdminUpdateCallback.java b/java/src/Ice/src/main/java/Ice/PropertiesAdminUpdateCallback.java index a645bde98c8..a645bde98c8 100644 --- a/java/src/Ice/PropertiesAdminUpdateCallback.java +++ b/java/src/Ice/src/main/java/Ice/PropertiesAdminUpdateCallback.java diff --git a/java/src/Ice/PropertiesI.java b/java/src/Ice/src/main/java/Ice/PropertiesI.java index 48a005a9838..48a005a9838 100644 --- a/java/src/Ice/PropertiesI.java +++ b/java/src/Ice/src/main/java/Ice/PropertiesI.java diff --git a/java/src/Ice/ProxyIdentityFacetKey.java b/java/src/Ice/src/main/java/Ice/ProxyIdentityFacetKey.java index fd870eaae73..fd870eaae73 100644 --- a/java/src/Ice/ProxyIdentityFacetKey.java +++ b/java/src/Ice/src/main/java/Ice/ProxyIdentityFacetKey.java diff --git a/java/src/Ice/ProxyIdentityKey.java b/java/src/Ice/src/main/java/Ice/ProxyIdentityKey.java index 63c4f64a6da..63c4f64a6da 100644 --- a/java/src/Ice/ProxyIdentityKey.java +++ b/java/src/Ice/src/main/java/Ice/ProxyIdentityKey.java diff --git a/java/src/Ice/ReadObjectCallback.java b/java/src/Ice/src/main/java/Ice/ReadObjectCallback.java index b13be745816..b13be745816 100644 --- a/java/src/Ice/ReadObjectCallback.java +++ b/java/src/Ice/src/main/java/Ice/ReadObjectCallback.java diff --git a/java/src/Ice/Request.java b/java/src/Ice/src/main/java/Ice/Request.java index 6ee6f0b0ccd..6ee6f0b0ccd 100644 --- a/java/src/Ice/Request.java +++ b/java/src/Ice/src/main/java/Ice/Request.java diff --git a/java/src/Ice/ShortHolder.java b/java/src/Ice/src/main/java/Ice/ShortHolder.java index ed21981ef79..ed21981ef79 100644 --- a/java/src/Ice/ShortHolder.java +++ b/java/src/Ice/src/main/java/Ice/ShortHolder.java diff --git a/java/src/Ice/ShortOptional.java b/java/src/Ice/src/main/java/Ice/ShortOptional.java index 7037f20da73..7037f20da73 100644 --- a/java/src/Ice/ShortOptional.java +++ b/java/src/Ice/src/main/java/Ice/ShortOptional.java diff --git a/java/src/Ice/SignalPolicy.java b/java/src/Ice/src/main/java/Ice/SignalPolicy.java index 85505ed3239..85505ed3239 100644 --- a/java/src/Ice/SignalPolicy.java +++ b/java/src/Ice/src/main/java/Ice/SignalPolicy.java diff --git a/java/src/Ice/SliceInfo.java b/java/src/Ice/src/main/java/Ice/SliceInfo.java index d86a6be5543..d86a6be5543 100644 --- a/java/src/Ice/SliceInfo.java +++ b/java/src/Ice/src/main/java/Ice/SliceInfo.java diff --git a/java/src/Ice/SlicedData.java b/java/src/Ice/src/main/java/Ice/SlicedData.java index 10e9354bcfe..10e9354bcfe 100644 --- a/java/src/Ice/SlicedData.java +++ b/java/src/Ice/src/main/java/Ice/SlicedData.java diff --git a/java/src/Ice/StringHolder.java b/java/src/Ice/src/main/java/Ice/StringHolder.java index 074f81988ff..074f81988ff 100644 --- a/java/src/Ice/StringHolder.java +++ b/java/src/Ice/src/main/java/Ice/StringHolder.java diff --git a/java/src/Ice/SysLoggerI.java b/java/src/Ice/src/main/java/Ice/SysLoggerI.java index 5076a53f790..5076a53f790 100644 --- a/java/src/Ice/SysLoggerI.java +++ b/java/src/Ice/src/main/java/Ice/SysLoggerI.java diff --git a/java/src/Ice/SystemException.java b/java/src/Ice/src/main/java/Ice/SystemException.java index c00492fc6d0..c00492fc6d0 100644 --- a/java/src/Ice/SystemException.java +++ b/java/src/Ice/src/main/java/Ice/SystemException.java diff --git a/java/src/Ice/ThreadHookPlugin.java b/java/src/Ice/src/main/java/Ice/ThreadHookPlugin.java index d50ca5e7440..d50ca5e7440 100644 --- a/java/src/Ice/ThreadHookPlugin.java +++ b/java/src/Ice/src/main/java/Ice/ThreadHookPlugin.java diff --git a/java/src/Ice/ThreadNotification.java b/java/src/Ice/src/main/java/Ice/ThreadNotification.java index f98e7570fa8..f98e7570fa8 100644 --- a/java/src/Ice/ThreadNotification.java +++ b/java/src/Ice/src/main/java/Ice/ThreadNotification.java diff --git a/java/src/Ice/TieBase.java b/java/src/Ice/src/main/java/Ice/TieBase.java index d6b6c8df5a7..d6b6c8df5a7 100644 --- a/java/src/Ice/TieBase.java +++ b/java/src/Ice/src/main/java/Ice/TieBase.java diff --git a/java/src/Ice/TwowayCallback.java b/java/src/Ice/src/main/java/Ice/TwowayCallback.java index fbb035ca408..fbb035ca408 100644 --- a/java/src/Ice/TwowayCallback.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallback.java diff --git a/java/src/Ice/TwowayCallbackArg1.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackArg1.java index 9bf7dacae1d..9bf7dacae1d 100644 --- a/java/src/Ice/TwowayCallbackArg1.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackArg1.java diff --git a/java/src/Ice/TwowayCallbackArg1UE.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackArg1UE.java index b157b5d6555..b157b5d6555 100644 --- a/java/src/Ice/TwowayCallbackArg1UE.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackArg1UE.java diff --git a/java/src/Ice/TwowayCallbackBool.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackBool.java index 0c737e027a3..0c737e027a3 100644 --- a/java/src/Ice/TwowayCallbackBool.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackBool.java diff --git a/java/src/Ice/TwowayCallbackBoolUE.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackBoolUE.java index f94fdc42190..f94fdc42190 100644 --- a/java/src/Ice/TwowayCallbackBoolUE.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackBoolUE.java diff --git a/java/src/Ice/TwowayCallbackByte.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackByte.java index a08eb9bd377..a08eb9bd377 100644 --- a/java/src/Ice/TwowayCallbackByte.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackByte.java diff --git a/java/src/Ice/TwowayCallbackByteUE.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackByteUE.java index 7154f9e2a62..7154f9e2a62 100644 --- a/java/src/Ice/TwowayCallbackByteUE.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackByteUE.java diff --git a/java/src/Ice/TwowayCallbackDouble.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackDouble.java index 852d4c0a969..852d4c0a969 100644 --- a/java/src/Ice/TwowayCallbackDouble.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackDouble.java diff --git a/java/src/Ice/TwowayCallbackDoubleUE.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackDoubleUE.java index 295ee63d16d..295ee63d16d 100644 --- a/java/src/Ice/TwowayCallbackDoubleUE.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackDoubleUE.java diff --git a/java/src/Ice/TwowayCallbackFloat.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackFloat.java index effe49dff51..effe49dff51 100644 --- a/java/src/Ice/TwowayCallbackFloat.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackFloat.java diff --git a/java/src/Ice/TwowayCallbackFloatUE.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackFloatUE.java index 4a2018c842b..4a2018c842b 100644 --- a/java/src/Ice/TwowayCallbackFloatUE.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackFloatUE.java diff --git a/java/src/Ice/TwowayCallbackInt.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackInt.java index cd15516426a..cd15516426a 100644 --- a/java/src/Ice/TwowayCallbackInt.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackInt.java diff --git a/java/src/Ice/TwowayCallbackIntUE.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackIntUE.java index a70ebcaef02..a70ebcaef02 100644 --- a/java/src/Ice/TwowayCallbackIntUE.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackIntUE.java diff --git a/java/src/Ice/TwowayCallbackLong.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackLong.java index 3a6106613cd..3a6106613cd 100644 --- a/java/src/Ice/TwowayCallbackLong.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackLong.java diff --git a/java/src/Ice/TwowayCallbackLongUE.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackLongUE.java index f238fb49bce..f238fb49bce 100644 --- a/java/src/Ice/TwowayCallbackLongUE.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackLongUE.java diff --git a/java/src/Ice/TwowayCallbackShort.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackShort.java index 7fd705ff950..7fd705ff950 100644 --- a/java/src/Ice/TwowayCallbackShort.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackShort.java diff --git a/java/src/Ice/TwowayCallbackShortUE.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackShortUE.java index ffff7e63ce7..ffff7e63ce7 100644 --- a/java/src/Ice/TwowayCallbackShortUE.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackShortUE.java diff --git a/java/src/Ice/TwowayCallbackUE.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackUE.java index ce72cb79e64..ce72cb79e64 100644 --- a/java/src/Ice/TwowayCallbackUE.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackUE.java diff --git a/java/src/Ice/TwowayCallbackVoidUE.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackVoidUE.java index 7bcbf69b5ad..7bcbf69b5ad 100644 --- a/java/src/Ice/TwowayCallbackVoidUE.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackVoidUE.java diff --git a/java/src/Ice/UnknownSlicedObject.java b/java/src/Ice/src/main/java/Ice/UnknownSlicedObject.java index 0e75ab9ae6b..0e75ab9ae6b 100644 --- a/java/src/Ice/UnknownSlicedObject.java +++ b/java/src/Ice/src/main/java/Ice/UnknownSlicedObject.java diff --git a/java/src/Ice/UserException.java b/java/src/Ice/src/main/java/Ice/UserException.java index bb32af0e28c..bb32af0e28c 100644 --- a/java/src/Ice/UserException.java +++ b/java/src/Ice/src/main/java/Ice/UserException.java diff --git a/java/src/Ice/UserExceptionReader.java b/java/src/Ice/src/main/java/Ice/UserExceptionReader.java index 8ffc897ae1d..8ffc897ae1d 100644 --- a/java/src/Ice/UserExceptionReader.java +++ b/java/src/Ice/src/main/java/Ice/UserExceptionReader.java diff --git a/java/src/Ice/UserExceptionReaderFactory.java b/java/src/Ice/src/main/java/Ice/UserExceptionReaderFactory.java index 4f7c36cd82f..4f7c36cd82f 100644 --- a/java/src/Ice/UserExceptionReaderFactory.java +++ b/java/src/Ice/src/main/java/Ice/UserExceptionReaderFactory.java diff --git a/java/src/Ice/UserExceptionWriter.java b/java/src/Ice/src/main/java/Ice/UserExceptionWriter.java index 841d4513449..841d4513449 100644 --- a/java/src/Ice/UserExceptionWriter.java +++ b/java/src/Ice/src/main/java/Ice/UserExceptionWriter.java diff --git a/java/src/Ice/Util.java b/java/src/Ice/src/main/java/Ice/Util.java index dfcfa6cfbef..dfcfa6cfbef 100644 --- a/java/src/Ice/Util.java +++ b/java/src/Ice/src/main/java/Ice/Util.java diff --git a/java/src/Ice/_AMD_Object_ice_invoke.java b/java/src/Ice/src/main/java/Ice/_AMD_Object_ice_invoke.java index 5e4e160eff7..5e4e160eff7 100644 --- a/java/src/Ice/_AMD_Object_ice_invoke.java +++ b/java/src/Ice/src/main/java/Ice/_AMD_Object_ice_invoke.java diff --git a/java/src/Ice/_Callback_Object_ice_invoke.java b/java/src/Ice/src/main/java/Ice/_Callback_Object_ice_invoke.java index 4efabd91943..4efabd91943 100644 --- a/java/src/Ice/_Callback_Object_ice_invoke.java +++ b/java/src/Ice/src/main/java/Ice/_Callback_Object_ice_invoke.java diff --git a/java/src/IceInternal/ACMConfig.java b/java/src/Ice/src/main/java/IceInternal/ACMConfig.java index f7dcf5653cb..f7dcf5653cb 100644 --- a/java/src/IceInternal/ACMConfig.java +++ b/java/src/Ice/src/main/java/IceInternal/ACMConfig.java diff --git a/java/src/IceInternal/ACMMonitor.java b/java/src/Ice/src/main/java/IceInternal/ACMMonitor.java index 7b9fad1bc3d..7b9fad1bc3d 100644 --- a/java/src/IceInternal/ACMMonitor.java +++ b/java/src/Ice/src/main/java/IceInternal/ACMMonitor.java diff --git a/java/src/IceInternal/Acceptor.java b/java/src/Ice/src/main/java/IceInternal/Acceptor.java index 8efcc04dcb3..8efcc04dcb3 100644 --- a/java/src/IceInternal/Acceptor.java +++ b/java/src/Ice/src/main/java/IceInternal/Acceptor.java diff --git a/java/src/IceInternal/AsyncResultI.java b/java/src/Ice/src/main/java/IceInternal/AsyncResultI.java index 6c31dfb8e38..6c31dfb8e38 100644 --- a/java/src/IceInternal/AsyncResultI.java +++ b/java/src/Ice/src/main/java/IceInternal/AsyncResultI.java diff --git a/java/src/IceInternal/AsyncStatus.java b/java/src/Ice/src/main/java/IceInternal/AsyncStatus.java index 2a70f685caa..2a70f685caa 100644 --- a/java/src/IceInternal/AsyncStatus.java +++ b/java/src/Ice/src/main/java/IceInternal/AsyncStatus.java diff --git a/java/src/IceInternal/BasicStream.java b/java/src/Ice/src/main/java/IceInternal/BasicStream.java index ac2fcc3fdaa..ac2fcc3fdaa 100644 --- a/java/src/IceInternal/BasicStream.java +++ b/java/src/Ice/src/main/java/IceInternal/BasicStream.java diff --git a/java/src/IceInternal/Buffer.java b/java/src/Ice/src/main/java/IceInternal/Buffer.java index fc7f88966c1..fc7f88966c1 100644 --- a/java/src/IceInternal/Buffer.java +++ b/java/src/Ice/src/main/java/IceInternal/Buffer.java diff --git a/java/src/IceInternal/CallbackBase.java b/java/src/Ice/src/main/java/IceInternal/CallbackBase.java index 13c9e40f708..13c9e40f708 100644 --- a/java/src/IceInternal/CallbackBase.java +++ b/java/src/Ice/src/main/java/IceInternal/CallbackBase.java diff --git a/java/src/IceInternal/CancellationHandler.java b/java/src/Ice/src/main/java/IceInternal/CancellationHandler.java index 0182f403cb4..0182f403cb4 100644 --- a/java/src/IceInternal/CancellationHandler.java +++ b/java/src/Ice/src/main/java/IceInternal/CancellationHandler.java diff --git a/java/src/IceInternal/CollocatedObserverI.java b/java/src/Ice/src/main/java/IceInternal/CollocatedObserverI.java index 809cd502d7b..809cd502d7b 100644 --- a/java/src/IceInternal/CollocatedObserverI.java +++ b/java/src/Ice/src/main/java/IceInternal/CollocatedObserverI.java diff --git a/java/src/IceInternal/CollocatedRequestHandler.java b/java/src/Ice/src/main/java/IceInternal/CollocatedRequestHandler.java index e3f5f045f58..e3f5f045f58 100644 --- a/java/src/IceInternal/CollocatedRequestHandler.java +++ b/java/src/Ice/src/main/java/IceInternal/CollocatedRequestHandler.java diff --git a/java/src/IceInternal/CommunicatorFlushBatch.java b/java/src/Ice/src/main/java/IceInternal/CommunicatorFlushBatch.java index 19e55ecc91c..19e55ecc91c 100644 --- a/java/src/IceInternal/CommunicatorFlushBatch.java +++ b/java/src/Ice/src/main/java/IceInternal/CommunicatorFlushBatch.java diff --git a/java/src/IceInternal/CommunicatorObserverI.java b/java/src/Ice/src/main/java/IceInternal/CommunicatorObserverI.java index 76e7e2b7d6c..76e7e2b7d6c 100644 --- a/java/src/IceInternal/CommunicatorObserverI.java +++ b/java/src/Ice/src/main/java/IceInternal/CommunicatorObserverI.java diff --git a/java/src/IceInternal/ConnectRequestHandler.java b/java/src/Ice/src/main/java/IceInternal/ConnectRequestHandler.java index a5f92ac090c..a5f92ac090c 100644 --- a/java/src/IceInternal/ConnectRequestHandler.java +++ b/java/src/Ice/src/main/java/IceInternal/ConnectRequestHandler.java diff --git a/java/src/IceInternal/ConnectionACMMonitor.java b/java/src/Ice/src/main/java/IceInternal/ConnectionACMMonitor.java index c0a135123fa..c0a135123fa 100644 --- a/java/src/IceInternal/ConnectionACMMonitor.java +++ b/java/src/Ice/src/main/java/IceInternal/ConnectionACMMonitor.java diff --git a/java/src/IceInternal/ConnectionFlushBatch.java b/java/src/Ice/src/main/java/IceInternal/ConnectionFlushBatch.java index 4b3da0bcb5e..4b3da0bcb5e 100644 --- a/java/src/IceInternal/ConnectionFlushBatch.java +++ b/java/src/Ice/src/main/java/IceInternal/ConnectionFlushBatch.java diff --git a/java/src/IceInternal/ConnectionObserverI.java b/java/src/Ice/src/main/java/IceInternal/ConnectionObserverI.java index 89dd07aec5d..89dd07aec5d 100644 --- a/java/src/IceInternal/ConnectionObserverI.java +++ b/java/src/Ice/src/main/java/IceInternal/ConnectionObserverI.java diff --git a/java/src/IceInternal/ConnectionRequestHandler.java b/java/src/Ice/src/main/java/IceInternal/ConnectionRequestHandler.java index 924b633e670..924b633e670 100644 --- a/java/src/IceInternal/ConnectionRequestHandler.java +++ b/java/src/Ice/src/main/java/IceInternal/ConnectionRequestHandler.java diff --git a/java/src/IceInternal/Connector.java b/java/src/Ice/src/main/java/IceInternal/Connector.java index be814de04df..be814de04df 100644 --- a/java/src/IceInternal/Connector.java +++ b/java/src/Ice/src/main/java/IceInternal/Connector.java diff --git a/java/src/IceInternal/DefaultsAndOverrides.java b/java/src/Ice/src/main/java/IceInternal/DefaultsAndOverrides.java index 916ca3b899d..916ca3b899d 100644 --- a/java/src/IceInternal/DefaultsAndOverrides.java +++ b/java/src/Ice/src/main/java/IceInternal/DefaultsAndOverrides.java diff --git a/java/src/IceInternal/DictionaryPatcher.java b/java/src/Ice/src/main/java/IceInternal/DictionaryPatcher.java index 6413c73444e..6413c73444e 100644 --- a/java/src/IceInternal/DictionaryPatcher.java +++ b/java/src/Ice/src/main/java/IceInternal/DictionaryPatcher.java diff --git a/java/src/IceInternal/DispatchObserverI.java b/java/src/Ice/src/main/java/IceInternal/DispatchObserverI.java index 6dbc20c2066..6dbc20c2066 100644 --- a/java/src/IceInternal/DispatchObserverI.java +++ b/java/src/Ice/src/main/java/IceInternal/DispatchObserverI.java diff --git a/java/src/IceInternal/DispatchWorkItem.java b/java/src/Ice/src/main/java/IceInternal/DispatchWorkItem.java index 32eb98a6f9f..32eb98a6f9f 100644 --- a/java/src/IceInternal/DispatchWorkItem.java +++ b/java/src/Ice/src/main/java/IceInternal/DispatchWorkItem.java diff --git a/java/src/IceInternal/EndpointFactory.java b/java/src/Ice/src/main/java/IceInternal/EndpointFactory.java index 61425287f5c..61425287f5c 100644 --- a/java/src/IceInternal/EndpointFactory.java +++ b/java/src/Ice/src/main/java/IceInternal/EndpointFactory.java diff --git a/java/src/IceInternal/EndpointFactoryManager.java b/java/src/Ice/src/main/java/IceInternal/EndpointFactoryManager.java index a0b2b1511d2..a0b2b1511d2 100644 --- a/java/src/IceInternal/EndpointFactoryManager.java +++ b/java/src/Ice/src/main/java/IceInternal/EndpointFactoryManager.java diff --git a/java/src/IceInternal/EndpointHostResolver.java b/java/src/Ice/src/main/java/IceInternal/EndpointHostResolver.java index 896eb21b8a1..896eb21b8a1 100644 --- a/java/src/IceInternal/EndpointHostResolver.java +++ b/java/src/Ice/src/main/java/IceInternal/EndpointHostResolver.java diff --git a/java/src/IceInternal/EndpointI.java b/java/src/Ice/src/main/java/IceInternal/EndpointI.java index 7e6d487f7f2..7e6d487f7f2 100644 --- a/java/src/IceInternal/EndpointI.java +++ b/java/src/Ice/src/main/java/IceInternal/EndpointI.java diff --git a/java/src/IceInternal/EndpointIHolder.java b/java/src/Ice/src/main/java/IceInternal/EndpointIHolder.java index f7a5ae6a8c7..f7a5ae6a8c7 100644 --- a/java/src/IceInternal/EndpointIHolder.java +++ b/java/src/Ice/src/main/java/IceInternal/EndpointIHolder.java diff --git a/java/src/IceInternal/EndpointI_connectors.java b/java/src/Ice/src/main/java/IceInternal/EndpointI_connectors.java index c25e80e1e73..c25e80e1e73 100644 --- a/java/src/IceInternal/EndpointI_connectors.java +++ b/java/src/Ice/src/main/java/IceInternal/EndpointI_connectors.java diff --git a/java/src/IceInternal/EventHandler.java b/java/src/Ice/src/main/java/IceInternal/EventHandler.java index 3d5ceabdc8e..3d5ceabdc8e 100644 --- a/java/src/IceInternal/EventHandler.java +++ b/java/src/Ice/src/main/java/IceInternal/EventHandler.java diff --git a/java/src/IceInternal/EventHandlerOpPair.java b/java/src/Ice/src/main/java/IceInternal/EventHandlerOpPair.java index 43325ecb4f5..43325ecb4f5 100644 --- a/java/src/IceInternal/EventHandlerOpPair.java +++ b/java/src/Ice/src/main/java/IceInternal/EventHandlerOpPair.java diff --git a/java/src/IceInternal/Ex.java b/java/src/Ice/src/main/java/IceInternal/Ex.java index 8c09d61781e..8c09d61781e 100644 --- a/java/src/IceInternal/Ex.java +++ b/java/src/Ice/src/main/java/IceInternal/Ex.java diff --git a/java/src/IceInternal/FactoryACMMonitor.java b/java/src/Ice/src/main/java/IceInternal/FactoryACMMonitor.java index 0f9b6d18f00..0f9b6d18f00 100644 --- a/java/src/IceInternal/FactoryACMMonitor.java +++ b/java/src/Ice/src/main/java/IceInternal/FactoryACMMonitor.java diff --git a/java/src/IceInternal/FixedReference.java b/java/src/Ice/src/main/java/IceInternal/FixedReference.java index 6a5d6fc6bc1..6a5d6fc6bc1 100644 --- a/java/src/IceInternal/FixedReference.java +++ b/java/src/Ice/src/main/java/IceInternal/FixedReference.java diff --git a/java/src/IceInternal/Functional_BoolCallback.java b/java/src/Ice/src/main/java/IceInternal/Functional_BoolCallback.java index 10ebefcce3e..10ebefcce3e 100644 --- a/java/src/IceInternal/Functional_BoolCallback.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_BoolCallback.java diff --git a/java/src/IceInternal/Functional_ByteCallback.java b/java/src/Ice/src/main/java/IceInternal/Functional_ByteCallback.java index fbfe4f88eb1..fbfe4f88eb1 100644 --- a/java/src/IceInternal/Functional_ByteCallback.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_ByteCallback.java diff --git a/java/src/IceInternal/Functional_CallbackBase.java b/java/src/Ice/src/main/java/IceInternal/Functional_CallbackBase.java index 5e344f32141..5e344f32141 100644 --- a/java/src/IceInternal/Functional_CallbackBase.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_CallbackBase.java diff --git a/java/src/IceInternal/Functional_DoubleCallback.java b/java/src/Ice/src/main/java/IceInternal/Functional_DoubleCallback.java index bcbebef9085..bcbebef9085 100644 --- a/java/src/IceInternal/Functional_DoubleCallback.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_DoubleCallback.java diff --git a/java/src/IceInternal/Functional_FloatCallback.java b/java/src/Ice/src/main/java/IceInternal/Functional_FloatCallback.java index 45b75fb7110..45b75fb7110 100644 --- a/java/src/IceInternal/Functional_FloatCallback.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_FloatCallback.java diff --git a/java/src/IceInternal/Functional_GenericCallback1.java b/java/src/Ice/src/main/java/IceInternal/Functional_GenericCallback1.java index 5ffb9f3a305..5ffb9f3a305 100644 --- a/java/src/IceInternal/Functional_GenericCallback1.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_GenericCallback1.java diff --git a/java/src/IceInternal/Functional_IntCallback.java b/java/src/Ice/src/main/java/IceInternal/Functional_IntCallback.java index ebd5c6615da..ebd5c6615da 100644 --- a/java/src/IceInternal/Functional_IntCallback.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_IntCallback.java diff --git a/java/src/IceInternal/Functional_LongCallback.java b/java/src/Ice/src/main/java/IceInternal/Functional_LongCallback.java index 44087884215..44087884215 100644 --- a/java/src/IceInternal/Functional_LongCallback.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_LongCallback.java diff --git a/java/src/IceInternal/Functional_OnewayCallback.java b/java/src/Ice/src/main/java/IceInternal/Functional_OnewayCallback.java index d9f77c1359f..d9f77c1359f 100644 --- a/java/src/IceInternal/Functional_OnewayCallback.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_OnewayCallback.java diff --git a/java/src/IceInternal/Functional_ShortCallback.java b/java/src/Ice/src/main/java/IceInternal/Functional_ShortCallback.java index 21e091dd5c4..21e091dd5c4 100644 --- a/java/src/IceInternal/Functional_ShortCallback.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_ShortCallback.java diff --git a/java/src/IceInternal/Functional_TwowayCallback.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallback.java index 80fe83192b5..80fe83192b5 100644 --- a/java/src/IceInternal/Functional_TwowayCallback.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallback.java diff --git a/java/src/IceInternal/Functional_TwowayCallbackArg1.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1.java index 7c3d471c023..7c3d471c023 100644 --- a/java/src/IceInternal/Functional_TwowayCallbackArg1.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1.java diff --git a/java/src/IceInternal/Functional_TwowayCallbackArg1UE.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1UE.java index 30383c7b56a..30383c7b56a 100644 --- a/java/src/IceInternal/Functional_TwowayCallbackArg1UE.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1UE.java diff --git a/java/src/IceInternal/Functional_TwowayCallbackBool.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBool.java index b2a3c2a4fd1..b2a3c2a4fd1 100644 --- a/java/src/IceInternal/Functional_TwowayCallbackBool.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBool.java diff --git a/java/src/IceInternal/Functional_TwowayCallbackBoolUE.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBoolUE.java index 0c463cd6143..0c463cd6143 100644 --- a/java/src/IceInternal/Functional_TwowayCallbackBoolUE.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBoolUE.java diff --git a/java/src/IceInternal/Functional_TwowayCallbackByte.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByte.java index cf08edcf445..cf08edcf445 100644 --- a/java/src/IceInternal/Functional_TwowayCallbackByte.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByte.java diff --git a/java/src/IceInternal/Functional_TwowayCallbackByteUE.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByteUE.java index 974606311f5..974606311f5 100644 --- a/java/src/IceInternal/Functional_TwowayCallbackByteUE.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByteUE.java diff --git a/java/src/IceInternal/Functional_TwowayCallbackDouble.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDouble.java index b198b1439ca..b198b1439ca 100644 --- a/java/src/IceInternal/Functional_TwowayCallbackDouble.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDouble.java diff --git a/java/src/IceInternal/Functional_TwowayCallbackDoubleUE.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDoubleUE.java index 4ef97e8ad56..4ef97e8ad56 100644 --- a/java/src/IceInternal/Functional_TwowayCallbackDoubleUE.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDoubleUE.java diff --git a/java/src/IceInternal/Functional_TwowayCallbackFloat.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloat.java index 6f8b446ee1b..6f8b446ee1b 100644 --- a/java/src/IceInternal/Functional_TwowayCallbackFloat.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloat.java diff --git a/java/src/IceInternal/Functional_TwowayCallbackFloatUE.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloatUE.java index 0b3d9fb6f4c..0b3d9fb6f4c 100644 --- a/java/src/IceInternal/Functional_TwowayCallbackFloatUE.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloatUE.java diff --git a/java/src/IceInternal/Functional_TwowayCallbackInt.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackInt.java index 82a051a8aa9..82a051a8aa9 100644 --- a/java/src/IceInternal/Functional_TwowayCallbackInt.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackInt.java diff --git a/java/src/IceInternal/Functional_TwowayCallbackIntUE.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackIntUE.java index be7d88855a3..be7d88855a3 100644 --- a/java/src/IceInternal/Functional_TwowayCallbackIntUE.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackIntUE.java diff --git a/java/src/IceInternal/Functional_TwowayCallbackLong.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLong.java index ae9d08a2f24..ae9d08a2f24 100644 --- a/java/src/IceInternal/Functional_TwowayCallbackLong.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLong.java diff --git a/java/src/IceInternal/Functional_TwowayCallbackLongUE.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLongUE.java index d7db99cfc41..d7db99cfc41 100644 --- a/java/src/IceInternal/Functional_TwowayCallbackLongUE.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLongUE.java diff --git a/java/src/IceInternal/Functional_TwowayCallbackShort.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShort.java index 6a499cdcc0d..6a499cdcc0d 100644 --- a/java/src/IceInternal/Functional_TwowayCallbackShort.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShort.java diff --git a/java/src/IceInternal/Functional_TwowayCallbackShortUE.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShortUE.java index 7b896887d89..7b896887d89 100644 --- a/java/src/IceInternal/Functional_TwowayCallbackShortUE.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShortUE.java diff --git a/java/src/IceInternal/Functional_TwowayCallbackUE.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackUE.java index db8978d2677..db8978d2677 100644 --- a/java/src/IceInternal/Functional_TwowayCallbackUE.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackUE.java diff --git a/java/src/IceInternal/Functional_TwowayCallbackVoidUE.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackVoidUE.java index 537333a5808..537333a5808 100644 --- a/java/src/IceInternal/Functional_TwowayCallbackVoidUE.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackVoidUE.java diff --git a/java/src/IceInternal/Functional_VoidCallback.java b/java/src/Ice/src/main/java/IceInternal/Functional_VoidCallback.java index 96fdcabfd2e..96fdcabfd2e 100644 --- a/java/src/IceInternal/Functional_VoidCallback.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_VoidCallback.java diff --git a/java/src/IceInternal/HTTPNetworkProxy.java b/java/src/Ice/src/main/java/IceInternal/HTTPNetworkProxy.java index 2eb9e7a2a41..2eb9e7a2a41 100644 --- a/java/src/IceInternal/HTTPNetworkProxy.java +++ b/java/src/Ice/src/main/java/IceInternal/HTTPNetworkProxy.java diff --git a/java/src/IceInternal/HashUtil.java b/java/src/Ice/src/main/java/IceInternal/HashUtil.java index 018c76841b5..018c76841b5 100644 --- a/java/src/IceInternal/HashUtil.java +++ b/java/src/Ice/src/main/java/IceInternal/HashUtil.java diff --git a/java/src/IceInternal/HttpParser.java b/java/src/Ice/src/main/java/IceInternal/HttpParser.java index c3532393cbd..c3532393cbd 100644 --- a/java/src/IceInternal/HttpParser.java +++ b/java/src/Ice/src/main/java/IceInternal/HttpParser.java diff --git a/java/src/IceInternal/IPEndpointI.java b/java/src/Ice/src/main/java/IceInternal/IPEndpointI.java index fbea1b8a690..fbea1b8a690 100644 --- a/java/src/IceInternal/IPEndpointI.java +++ b/java/src/Ice/src/main/java/IceInternal/IPEndpointI.java diff --git a/java/src/IceInternal/Incoming.java b/java/src/Ice/src/main/java/IceInternal/Incoming.java index cc9742cd295..cc9742cd295 100644 --- a/java/src/IceInternal/Incoming.java +++ b/java/src/Ice/src/main/java/IceInternal/Incoming.java diff --git a/java/src/IceInternal/IncomingAsync.java b/java/src/Ice/src/main/java/IceInternal/IncomingAsync.java index c8ea7cbf6e7..c8ea7cbf6e7 100644 --- a/java/src/IceInternal/IncomingAsync.java +++ b/java/src/Ice/src/main/java/IceInternal/IncomingAsync.java diff --git a/java/src/IceInternal/IncomingBase.java b/java/src/Ice/src/main/java/IceInternal/IncomingBase.java index 6879e8cdf2f..6879e8cdf2f 100644 --- a/java/src/IceInternal/IncomingBase.java +++ b/java/src/Ice/src/main/java/IceInternal/IncomingBase.java diff --git a/java/src/IceInternal/IncomingConnectionFactory.java b/java/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java index 4e187728281..4e187728281 100644 --- a/java/src/IceInternal/IncomingConnectionFactory.java +++ b/java/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java diff --git a/java/src/IceInternal/InputStreamWrapper.java b/java/src/Ice/src/main/java/IceInternal/InputStreamWrapper.java index 12654f60771..12654f60771 100644 --- a/java/src/IceInternal/InputStreamWrapper.java +++ b/java/src/Ice/src/main/java/IceInternal/InputStreamWrapper.java diff --git a/java/src/IceInternal/Instance.java b/java/src/Ice/src/main/java/IceInternal/Instance.java index 900784eafd5..900784eafd5 100644 --- a/java/src/IceInternal/Instance.java +++ b/java/src/Ice/src/main/java/IceInternal/Instance.java diff --git a/java/src/IceInternal/InvocationObserverI.java b/java/src/Ice/src/main/java/IceInternal/InvocationObserverI.java index bf96a9c0d0d..bf96a9c0d0d 100644 --- a/java/src/IceInternal/InvocationObserverI.java +++ b/java/src/Ice/src/main/java/IceInternal/InvocationObserverI.java diff --git a/java/src/IceInternal/ListPatcher.java b/java/src/Ice/src/main/java/IceInternal/ListPatcher.java index 9b44590cc9d..9b44590cc9d 100644 --- a/java/src/IceInternal/ListPatcher.java +++ b/java/src/Ice/src/main/java/IceInternal/ListPatcher.java diff --git a/java/src/IceInternal/LocatorInfo.java b/java/src/Ice/src/main/java/IceInternal/LocatorInfo.java index fe20942a315..fe20942a315 100644 --- a/java/src/IceInternal/LocatorInfo.java +++ b/java/src/Ice/src/main/java/IceInternal/LocatorInfo.java diff --git a/java/src/IceInternal/LocatorManager.java b/java/src/Ice/src/main/java/IceInternal/LocatorManager.java index 0e651b5935c..0e651b5935c 100644 --- a/java/src/IceInternal/LocatorManager.java +++ b/java/src/Ice/src/main/java/IceInternal/LocatorManager.java diff --git a/java/src/IceInternal/LocatorTable.java b/java/src/Ice/src/main/java/IceInternal/LocatorTable.java index 6cc8c7a117a..6cc8c7a117a 100644 --- a/java/src/IceInternal/LocatorTable.java +++ b/java/src/Ice/src/main/java/IceInternal/LocatorTable.java diff --git a/java/src/IceInternal/LoggerAdminI.java b/java/src/Ice/src/main/java/IceInternal/LoggerAdminI.java index 723584bdcd4..723584bdcd4 100644 --- a/java/src/IceInternal/LoggerAdminI.java +++ b/java/src/Ice/src/main/java/IceInternal/LoggerAdminI.java diff --git a/java/src/IceInternal/LoggerAdminLogger.java b/java/src/Ice/src/main/java/IceInternal/LoggerAdminLogger.java index 32fee020c3c..32fee020c3c 100644 --- a/java/src/IceInternal/LoggerAdminLogger.java +++ b/java/src/Ice/src/main/java/IceInternal/LoggerAdminLogger.java diff --git a/java/src/IceInternal/LoggerAdminLoggerI.java b/java/src/Ice/src/main/java/IceInternal/LoggerAdminLoggerI.java index 868ef0d46ec..868ef0d46ec 100644 --- a/java/src/IceInternal/LoggerAdminLoggerI.java +++ b/java/src/Ice/src/main/java/IceInternal/LoggerAdminLoggerI.java diff --git a/java/src/IceInternal/MetricsAdminI.java b/java/src/Ice/src/main/java/IceInternal/MetricsAdminI.java index 8f8eec0667f..8f8eec0667f 100644 --- a/java/src/IceInternal/MetricsAdminI.java +++ b/java/src/Ice/src/main/java/IceInternal/MetricsAdminI.java diff --git a/java/src/IceInternal/MetricsMap.java b/java/src/Ice/src/main/java/IceInternal/MetricsMap.java index c69af08cce2..c69af08cce2 100644 --- a/java/src/IceInternal/MetricsMap.java +++ b/java/src/Ice/src/main/java/IceInternal/MetricsMap.java diff --git a/java/src/IceInternal/MetricsViewI.java b/java/src/Ice/src/main/java/IceInternal/MetricsViewI.java index 2f535e234f3..2f535e234f3 100644 --- a/java/src/IceInternal/MetricsViewI.java +++ b/java/src/Ice/src/main/java/IceInternal/MetricsViewI.java diff --git a/java/src/IceInternal/Network.java b/java/src/Ice/src/main/java/IceInternal/Network.java index 4bf221eb315..4bf221eb315 100644 --- a/java/src/IceInternal/Network.java +++ b/java/src/Ice/src/main/java/IceInternal/Network.java diff --git a/java/src/IceInternal/NetworkProxy.java b/java/src/Ice/src/main/java/IceInternal/NetworkProxy.java index 48932f18327..48932f18327 100644 --- a/java/src/IceInternal/NetworkProxy.java +++ b/java/src/Ice/src/main/java/IceInternal/NetworkProxy.java diff --git a/java/src/IceInternal/ObjectAdapterFactory.java b/java/src/Ice/src/main/java/IceInternal/ObjectAdapterFactory.java index a723537cd7e..a723537cd7e 100644 --- a/java/src/IceInternal/ObjectAdapterFactory.java +++ b/java/src/Ice/src/main/java/IceInternal/ObjectAdapterFactory.java diff --git a/java/src/IceInternal/ObjectFactoryManager.java b/java/src/Ice/src/main/java/IceInternal/ObjectFactoryManager.java index c8ffdef9ca9..c8ffdef9ca9 100644 --- a/java/src/IceInternal/ObjectFactoryManager.java +++ b/java/src/Ice/src/main/java/IceInternal/ObjectFactoryManager.java diff --git a/java/src/IceInternal/ObjectInputStream.java b/java/src/Ice/src/main/java/IceInternal/ObjectInputStream.java index d8c619f5281..d8c619f5281 100644 --- a/java/src/IceInternal/ObjectInputStream.java +++ b/java/src/Ice/src/main/java/IceInternal/ObjectInputStream.java diff --git a/java/src/IceInternal/ObserverHelper.java b/java/src/Ice/src/main/java/IceInternal/ObserverHelper.java index bb6edb015c1..bb6edb015c1 100644 --- a/java/src/IceInternal/ObserverHelper.java +++ b/java/src/Ice/src/main/java/IceInternal/ObserverHelper.java diff --git a/java/src/IceInternal/OpaqueEndpointI.java b/java/src/Ice/src/main/java/IceInternal/OpaqueEndpointI.java index 3a3ab472863..3a3ab472863 100644 --- a/java/src/IceInternal/OpaqueEndpointI.java +++ b/java/src/Ice/src/main/java/IceInternal/OpaqueEndpointI.java diff --git a/java/src/IceInternal/OutgoingAsync.java b/java/src/Ice/src/main/java/IceInternal/OutgoingAsync.java index 11758171135..11758171135 100644 --- a/java/src/IceInternal/OutgoingAsync.java +++ b/java/src/Ice/src/main/java/IceInternal/OutgoingAsync.java diff --git a/java/src/IceInternal/OutgoingAsyncBase.java b/java/src/Ice/src/main/java/IceInternal/OutgoingAsyncBase.java index f04b09ea941..f04b09ea941 100644 --- a/java/src/IceInternal/OutgoingAsyncBase.java +++ b/java/src/Ice/src/main/java/IceInternal/OutgoingAsyncBase.java diff --git a/java/src/IceInternal/OutgoingConnectionFactory.java b/java/src/Ice/src/main/java/IceInternal/OutgoingConnectionFactory.java index 116038ad537..116038ad537 100644 --- a/java/src/IceInternal/OutgoingConnectionFactory.java +++ b/java/src/Ice/src/main/java/IceInternal/OutgoingConnectionFactory.java diff --git a/java/src/IceInternal/OutputStreamWrapper.java b/java/src/Ice/src/main/java/IceInternal/OutputStreamWrapper.java index 722f420603a..722f420603a 100644 --- a/java/src/IceInternal/OutputStreamWrapper.java +++ b/java/src/Ice/src/main/java/IceInternal/OutputStreamWrapper.java diff --git a/java/src/IceInternal/Patcher.java b/java/src/Ice/src/main/java/IceInternal/Patcher.java index 2a69e9799c7..2a69e9799c7 100644 --- a/java/src/IceInternal/Patcher.java +++ b/java/src/Ice/src/main/java/IceInternal/Patcher.java diff --git a/java/src/IceInternal/ProcessI.java b/java/src/Ice/src/main/java/IceInternal/ProcessI.java index 63112845c83..63112845c83 100644 --- a/java/src/IceInternal/ProcessI.java +++ b/java/src/Ice/src/main/java/IceInternal/ProcessI.java diff --git a/java/src/IceInternal/PropertiesAdminI.java b/java/src/Ice/src/main/java/IceInternal/PropertiesAdminI.java index c5ce244fa6e..c5ce244fa6e 100644 --- a/java/src/IceInternal/PropertiesAdminI.java +++ b/java/src/Ice/src/main/java/IceInternal/PropertiesAdminI.java diff --git a/java/src/IceInternal/Property.java b/java/src/Ice/src/main/java/IceInternal/Property.java index 3c38861c383..3c38861c383 100644 --- a/java/src/IceInternal/Property.java +++ b/java/src/Ice/src/main/java/IceInternal/Property.java diff --git a/java/src/IceInternal/PropertyNames.java b/java/src/Ice/src/main/java/IceInternal/PropertyNames.java index c7800e61d62..c7800e61d62 100644 --- a/java/src/IceInternal/PropertyNames.java +++ b/java/src/Ice/src/main/java/IceInternal/PropertyNames.java diff --git a/java/src/IceInternal/Protocol.java b/java/src/Ice/src/main/java/IceInternal/Protocol.java index 6e68fd1cf7f..6e68fd1cf7f 100644 --- a/java/src/IceInternal/Protocol.java +++ b/java/src/Ice/src/main/java/IceInternal/Protocol.java diff --git a/java/src/IceInternal/ProtocolInstance.java b/java/src/Ice/src/main/java/IceInternal/ProtocolInstance.java index 9e217d9df4a..9e217d9df4a 100644 --- a/java/src/IceInternal/ProtocolInstance.java +++ b/java/src/Ice/src/main/java/IceInternal/ProtocolInstance.java diff --git a/java/src/IceInternal/ProtocolPluginFacade.java b/java/src/Ice/src/main/java/IceInternal/ProtocolPluginFacade.java index 07080ea383e..07080ea383e 100644 --- a/java/src/IceInternal/ProtocolPluginFacade.java +++ b/java/src/Ice/src/main/java/IceInternal/ProtocolPluginFacade.java diff --git a/java/src/IceInternal/ProtocolPluginFacadeI.java b/java/src/Ice/src/main/java/IceInternal/ProtocolPluginFacadeI.java index 2a49474b159..2a49474b159 100644 --- a/java/src/IceInternal/ProtocolPluginFacadeI.java +++ b/java/src/Ice/src/main/java/IceInternal/ProtocolPluginFacadeI.java diff --git a/java/src/IceInternal/ProxyFactory.java b/java/src/Ice/src/main/java/IceInternal/ProxyFactory.java index a5165c37374..a5165c37374 100644 --- a/java/src/IceInternal/ProxyFactory.java +++ b/java/src/Ice/src/main/java/IceInternal/ProxyFactory.java diff --git a/java/src/IceInternal/ProxyFlushBatch.java b/java/src/Ice/src/main/java/IceInternal/ProxyFlushBatch.java index 522dd00d345..522dd00d345 100644 --- a/java/src/IceInternal/ProxyFlushBatch.java +++ b/java/src/Ice/src/main/java/IceInternal/ProxyFlushBatch.java diff --git a/java/src/IceInternal/ProxyGetConnection.java b/java/src/Ice/src/main/java/IceInternal/ProxyGetConnection.java index 9f5388218db..9f5388218db 100644 --- a/java/src/IceInternal/ProxyGetConnection.java +++ b/java/src/Ice/src/main/java/IceInternal/ProxyGetConnection.java diff --git a/java/src/IceInternal/ProxyOutgoingAsyncBase.java b/java/src/Ice/src/main/java/IceInternal/ProxyOutgoingAsyncBase.java index 29779078111..29779078111 100644 --- a/java/src/IceInternal/ProxyOutgoingAsyncBase.java +++ b/java/src/Ice/src/main/java/IceInternal/ProxyOutgoingAsyncBase.java diff --git a/java/src/IceInternal/QueueRequestHandler.java b/java/src/Ice/src/main/java/IceInternal/QueueRequestHandler.java index fdb7a672e2a..fdb7a672e2a 100644 --- a/java/src/IceInternal/QueueRequestHandler.java +++ b/java/src/Ice/src/main/java/IceInternal/QueueRequestHandler.java diff --git a/java/src/IceInternal/Reference.java b/java/src/Ice/src/main/java/IceInternal/Reference.java index e4789875723..e4789875723 100644 --- a/java/src/IceInternal/Reference.java +++ b/java/src/Ice/src/main/java/IceInternal/Reference.java diff --git a/java/src/IceInternal/ReferenceFactory.java b/java/src/Ice/src/main/java/IceInternal/ReferenceFactory.java index 53d6e4c7873..53d6e4c7873 100644 --- a/java/src/IceInternal/ReferenceFactory.java +++ b/java/src/Ice/src/main/java/IceInternal/ReferenceFactory.java diff --git a/java/src/IceInternal/RemoteObserverI.java b/java/src/Ice/src/main/java/IceInternal/RemoteObserverI.java index c3c3c13e75e..c3c3c13e75e 100644 --- a/java/src/IceInternal/RemoteObserverI.java +++ b/java/src/Ice/src/main/java/IceInternal/RemoteObserverI.java diff --git a/java/src/IceInternal/ReplyStatus.java b/java/src/Ice/src/main/java/IceInternal/ReplyStatus.java index 767d4c7a1a6..767d4c7a1a6 100644 --- a/java/src/IceInternal/ReplyStatus.java +++ b/java/src/Ice/src/main/java/IceInternal/ReplyStatus.java diff --git a/java/src/IceInternal/RequestHandler.java b/java/src/Ice/src/main/java/IceInternal/RequestHandler.java index f87b215919f..f87b215919f 100644 --- a/java/src/IceInternal/RequestHandler.java +++ b/java/src/Ice/src/main/java/IceInternal/RequestHandler.java diff --git a/java/src/IceInternal/ResponseHandler.java b/java/src/Ice/src/main/java/IceInternal/ResponseHandler.java index 88f3678b5b2..88f3678b5b2 100644 --- a/java/src/IceInternal/ResponseHandler.java +++ b/java/src/Ice/src/main/java/IceInternal/ResponseHandler.java diff --git a/java/src/IceInternal/RetryException.java b/java/src/Ice/src/main/java/IceInternal/RetryException.java index 350a0d3ac18..350a0d3ac18 100644 --- a/java/src/IceInternal/RetryException.java +++ b/java/src/Ice/src/main/java/IceInternal/RetryException.java diff --git a/java/src/IceInternal/RetryQueue.java b/java/src/Ice/src/main/java/IceInternal/RetryQueue.java index 28c10b7bd48..28c10b7bd48 100644 --- a/java/src/IceInternal/RetryQueue.java +++ b/java/src/Ice/src/main/java/IceInternal/RetryQueue.java diff --git a/java/src/IceInternal/RetryTask.java b/java/src/Ice/src/main/java/IceInternal/RetryTask.java index b847dc69f33..b847dc69f33 100644 --- a/java/src/IceInternal/RetryTask.java +++ b/java/src/Ice/src/main/java/IceInternal/RetryTask.java diff --git a/java/src/IceInternal/RoutableReference.java b/java/src/Ice/src/main/java/IceInternal/RoutableReference.java index 8e89f69cd15..8e89f69cd15 100644 --- a/java/src/IceInternal/RoutableReference.java +++ b/java/src/Ice/src/main/java/IceInternal/RoutableReference.java diff --git a/java/src/IceInternal/RouterInfo.java b/java/src/Ice/src/main/java/IceInternal/RouterInfo.java index 5eecff2298c..5eecff2298c 100644 --- a/java/src/IceInternal/RouterInfo.java +++ b/java/src/Ice/src/main/java/IceInternal/RouterInfo.java diff --git a/java/src/IceInternal/RouterManager.java b/java/src/Ice/src/main/java/IceInternal/RouterManager.java index c97a51a4899..c97a51a4899 100644 --- a/java/src/IceInternal/RouterManager.java +++ b/java/src/Ice/src/main/java/IceInternal/RouterManager.java diff --git a/java/src/IceInternal/SOCKSNetworkProxy.java b/java/src/Ice/src/main/java/IceInternal/SOCKSNetworkProxy.java index 5335c110828..5335c110828 100644 --- a/java/src/IceInternal/SOCKSNetworkProxy.java +++ b/java/src/Ice/src/main/java/IceInternal/SOCKSNetworkProxy.java diff --git a/java/src/IceInternal/Selector.java b/java/src/Ice/src/main/java/IceInternal/Selector.java index 03e683420ba..03e683420ba 100644 --- a/java/src/IceInternal/Selector.java +++ b/java/src/Ice/src/main/java/IceInternal/Selector.java diff --git a/java/src/IceInternal/SequencePatcher.java b/java/src/Ice/src/main/java/IceInternal/SequencePatcher.java index ca75b0ed919..ca75b0ed919 100644 --- a/java/src/IceInternal/SequencePatcher.java +++ b/java/src/Ice/src/main/java/IceInternal/SequencePatcher.java diff --git a/java/src/IceInternal/ServantManager.java b/java/src/Ice/src/main/java/IceInternal/ServantManager.java index 6089a56caf1..6089a56caf1 100644 --- a/java/src/IceInternal/ServantManager.java +++ b/java/src/Ice/src/main/java/IceInternal/ServantManager.java diff --git a/java/src/IceInternal/SocketOperation.java b/java/src/Ice/src/main/java/IceInternal/SocketOperation.java index 497464e2f3b..497464e2f3b 100644 --- a/java/src/IceInternal/SocketOperation.java +++ b/java/src/Ice/src/main/java/IceInternal/SocketOperation.java diff --git a/java/src/IceInternal/StreamSocket.java b/java/src/Ice/src/main/java/IceInternal/StreamSocket.java index 63b26361668..63b26361668 100644 --- a/java/src/IceInternal/StreamSocket.java +++ b/java/src/Ice/src/main/java/IceInternal/StreamSocket.java diff --git a/java/src/IceInternal/TcpAcceptor.java b/java/src/Ice/src/main/java/IceInternal/TcpAcceptor.java index 3f593624188..3f593624188 100644 --- a/java/src/IceInternal/TcpAcceptor.java +++ b/java/src/Ice/src/main/java/IceInternal/TcpAcceptor.java diff --git a/java/src/IceInternal/TcpConnector.java b/java/src/Ice/src/main/java/IceInternal/TcpConnector.java index 8c4c6ccabd7..8c4c6ccabd7 100644 --- a/java/src/IceInternal/TcpConnector.java +++ b/java/src/Ice/src/main/java/IceInternal/TcpConnector.java diff --git a/java/src/IceInternal/TcpEndpointFactory.java b/java/src/Ice/src/main/java/IceInternal/TcpEndpointFactory.java index c7caafdf56a..c7caafdf56a 100644 --- a/java/src/IceInternal/TcpEndpointFactory.java +++ b/java/src/Ice/src/main/java/IceInternal/TcpEndpointFactory.java diff --git a/java/src/IceInternal/TcpEndpointI.java b/java/src/Ice/src/main/java/IceInternal/TcpEndpointI.java index 3e35321ecc2..3e35321ecc2 100644 --- a/java/src/IceInternal/TcpEndpointI.java +++ b/java/src/Ice/src/main/java/IceInternal/TcpEndpointI.java diff --git a/java/src/IceInternal/TcpTransceiver.java b/java/src/Ice/src/main/java/IceInternal/TcpTransceiver.java index 5e8d33fb672..5e8d33fb672 100644 --- a/java/src/IceInternal/TcpTransceiver.java +++ b/java/src/Ice/src/main/java/IceInternal/TcpTransceiver.java diff --git a/java/src/IceInternal/ThreadObserverI.java b/java/src/Ice/src/main/java/IceInternal/ThreadObserverI.java index 41bb79253f8..41bb79253f8 100644 --- a/java/src/IceInternal/ThreadObserverI.java +++ b/java/src/Ice/src/main/java/IceInternal/ThreadObserverI.java diff --git a/java/src/IceInternal/ThreadPool.java b/java/src/Ice/src/main/java/IceInternal/ThreadPool.java index c21305d2395..c21305d2395 100644 --- a/java/src/IceInternal/ThreadPool.java +++ b/java/src/Ice/src/main/java/IceInternal/ThreadPool.java diff --git a/java/src/IceInternal/ThreadPoolCurrent.java b/java/src/Ice/src/main/java/IceInternal/ThreadPoolCurrent.java index 06e739bfe85..06e739bfe85 100644 --- a/java/src/IceInternal/ThreadPoolCurrent.java +++ b/java/src/Ice/src/main/java/IceInternal/ThreadPoolCurrent.java diff --git a/java/src/IceInternal/ThreadPoolWorkItem.java b/java/src/Ice/src/main/java/IceInternal/ThreadPoolWorkItem.java index 1feb74682e0..1feb74682e0 100644 --- a/java/src/IceInternal/ThreadPoolWorkItem.java +++ b/java/src/Ice/src/main/java/IceInternal/ThreadPoolWorkItem.java diff --git a/java/src/IceInternal/ThreadPoolWorkQueue.java b/java/src/Ice/src/main/java/IceInternal/ThreadPoolWorkQueue.java index 30a013f6dc4..30a013f6dc4 100644 --- a/java/src/IceInternal/ThreadPoolWorkQueue.java +++ b/java/src/Ice/src/main/java/IceInternal/ThreadPoolWorkQueue.java diff --git a/java/src/IceInternal/Time.java b/java/src/Ice/src/main/java/IceInternal/Time.java index 455d8844dbb..455d8844dbb 100644 --- a/java/src/IceInternal/Time.java +++ b/java/src/Ice/src/main/java/IceInternal/Time.java diff --git a/java/src/IceInternal/TraceLevels.java b/java/src/Ice/src/main/java/IceInternal/TraceLevels.java index 373cf2cdd6c..373cf2cdd6c 100644 --- a/java/src/IceInternal/TraceLevels.java +++ b/java/src/Ice/src/main/java/IceInternal/TraceLevels.java diff --git a/java/src/IceInternal/TraceUtil.java b/java/src/Ice/src/main/java/IceInternal/TraceUtil.java index f3c269aa9d5..f3c269aa9d5 100644 --- a/java/src/IceInternal/TraceUtil.java +++ b/java/src/Ice/src/main/java/IceInternal/TraceUtil.java diff --git a/java/src/IceInternal/Transceiver.java b/java/src/Ice/src/main/java/IceInternal/Transceiver.java index f9889df74f8..f9889df74f8 100644 --- a/java/src/IceInternal/Transceiver.java +++ b/java/src/Ice/src/main/java/IceInternal/Transceiver.java diff --git a/java/src/IceInternal/TwowayCallback.java b/java/src/Ice/src/main/java/IceInternal/TwowayCallback.java index 55c9044e6d6..55c9044e6d6 100644 --- a/java/src/IceInternal/TwowayCallback.java +++ b/java/src/Ice/src/main/java/IceInternal/TwowayCallback.java diff --git a/java/src/IceInternal/UdpConnector.java b/java/src/Ice/src/main/java/IceInternal/UdpConnector.java index e42e75561de..e42e75561de 100644 --- a/java/src/IceInternal/UdpConnector.java +++ b/java/src/Ice/src/main/java/IceInternal/UdpConnector.java diff --git a/java/src/IceInternal/UdpEndpointFactory.java b/java/src/Ice/src/main/java/IceInternal/UdpEndpointFactory.java index 97815a9aff5..97815a9aff5 100644 --- a/java/src/IceInternal/UdpEndpointFactory.java +++ b/java/src/Ice/src/main/java/IceInternal/UdpEndpointFactory.java diff --git a/java/src/IceInternal/UdpEndpointI.java b/java/src/Ice/src/main/java/IceInternal/UdpEndpointI.java index 797f5f25138..797f5f25138 100644 --- a/java/src/IceInternal/UdpEndpointI.java +++ b/java/src/Ice/src/main/java/IceInternal/UdpEndpointI.java diff --git a/java/src/IceInternal/UdpTransceiver.java b/java/src/Ice/src/main/java/IceInternal/UdpTransceiver.java index 78e1de99371..78e1de99371 100644 --- a/java/src/IceInternal/UdpTransceiver.java +++ b/java/src/Ice/src/main/java/IceInternal/UdpTransceiver.java diff --git a/java/src/IceInternal/UserExceptionFactory.java b/java/src/Ice/src/main/java/IceInternal/UserExceptionFactory.java index 80fb13937fe..80fb13937fe 100644 --- a/java/src/IceInternal/UserExceptionFactory.java +++ b/java/src/Ice/src/main/java/IceInternal/UserExceptionFactory.java diff --git a/java/src/IceInternal/Util.java b/java/src/Ice/src/main/java/IceInternal/Util.java index 1e32d032771..1e32d032771 100644 --- a/java/src/IceInternal/Util.java +++ b/java/src/Ice/src/main/java/IceInternal/Util.java diff --git a/java/src/IceInternal/ValueWriter.java b/java/src/Ice/src/main/java/IceInternal/ValueWriter.java index 67d508e713d..67d508e713d 100644 --- a/java/src/IceInternal/ValueWriter.java +++ b/java/src/Ice/src/main/java/IceInternal/ValueWriter.java diff --git a/java/src/IceInternal/WSAcceptor.java b/java/src/Ice/src/main/java/IceInternal/WSAcceptor.java index cc11b1ff8e8..cc11b1ff8e8 100644 --- a/java/src/IceInternal/WSAcceptor.java +++ b/java/src/Ice/src/main/java/IceInternal/WSAcceptor.java diff --git a/java/src/IceInternal/WSConnector.java b/java/src/Ice/src/main/java/IceInternal/WSConnector.java index afada18d445..afada18d445 100644 --- a/java/src/IceInternal/WSConnector.java +++ b/java/src/Ice/src/main/java/IceInternal/WSConnector.java diff --git a/java/src/IceInternal/WSEndpoint.java b/java/src/Ice/src/main/java/IceInternal/WSEndpoint.java index f8f248beb00..f8f248beb00 100644 --- a/java/src/IceInternal/WSEndpoint.java +++ b/java/src/Ice/src/main/java/IceInternal/WSEndpoint.java diff --git a/java/src/IceInternal/WSEndpointFactory.java b/java/src/Ice/src/main/java/IceInternal/WSEndpointFactory.java index 2129a7a4efa..2129a7a4efa 100644 --- a/java/src/IceInternal/WSEndpointFactory.java +++ b/java/src/Ice/src/main/java/IceInternal/WSEndpointFactory.java diff --git a/java/src/IceInternal/WSTransceiver.java b/java/src/Ice/src/main/java/IceInternal/WSTransceiver.java index 43560c51945..43560c51945 100644 --- a/java/src/IceInternal/WSTransceiver.java +++ b/java/src/Ice/src/main/java/IceInternal/WSTransceiver.java diff --git a/java/src/IceInternal/WebSocketException.java b/java/src/Ice/src/main/java/IceInternal/WebSocketException.java index 3e70ddcc4a5..3e70ddcc4a5 100644 --- a/java/src/IceInternal/WebSocketException.java +++ b/java/src/Ice/src/main/java/IceInternal/WebSocketException.java diff --git a/java/src/IceMX/MetricsHelper.java b/java/src/Ice/src/main/java/IceMX/MetricsHelper.java index 7300aefe1bd..7300aefe1bd 100644 --- a/java/src/IceMX/MetricsHelper.java +++ b/java/src/Ice/src/main/java/IceMX/MetricsHelper.java diff --git a/java/src/IceMX/Observer.java b/java/src/Ice/src/main/java/IceMX/Observer.java index 1ca0d9aba76..1ca0d9aba76 100644 --- a/java/src/IceMX/Observer.java +++ b/java/src/Ice/src/main/java/IceMX/Observer.java diff --git a/java/src/IceMX/ObserverFactory.java b/java/src/Ice/src/main/java/IceMX/ObserverFactory.java index 2039836bdfe..2039836bdfe 100644 --- a/java/src/IceMX/ObserverFactory.java +++ b/java/src/Ice/src/main/java/IceMX/ObserverFactory.java diff --git a/java/src/IceMX/ObserverFactoryWithDelegate.java b/java/src/Ice/src/main/java/IceMX/ObserverFactoryWithDelegate.java index ed19cb6456b..ed19cb6456b 100644 --- a/java/src/IceMX/ObserverFactoryWithDelegate.java +++ b/java/src/Ice/src/main/java/IceMX/ObserverFactoryWithDelegate.java diff --git a/java/src/IceMX/ObserverWithDelegate.java b/java/src/Ice/src/main/java/IceMX/ObserverWithDelegate.java index 31341a5af71..31341a5af71 100644 --- a/java/src/IceMX/ObserverWithDelegate.java +++ b/java/src/Ice/src/main/java/IceMX/ObserverWithDelegate.java diff --git a/java/src/IceMX/ObserverWithDelegateI.java b/java/src/Ice/src/main/java/IceMX/ObserverWithDelegateI.java index 00d928ffcf8..00d928ffcf8 100644 --- a/java/src/IceMX/ObserverWithDelegateI.java +++ b/java/src/Ice/src/main/java/IceMX/ObserverWithDelegateI.java diff --git a/java/src/IceSSL/AcceptorI.java b/java/src/Ice/src/main/java/IceSSL/AcceptorI.java index 4a853cc73da..4a853cc73da 100644 --- a/java/src/IceSSL/AcceptorI.java +++ b/java/src/Ice/src/main/java/IceSSL/AcceptorI.java diff --git a/java/src/IceSSL/CertificateVerifier.java b/java/src/Ice/src/main/java/IceSSL/CertificateVerifier.java index 9c5ecb46e26..9c5ecb46e26 100644 --- a/java/src/IceSSL/CertificateVerifier.java +++ b/java/src/Ice/src/main/java/IceSSL/CertificateVerifier.java diff --git a/java/src/IceSSL/ConnectorI.java b/java/src/Ice/src/main/java/IceSSL/ConnectorI.java index b1b4edb64c4..b1b4edb64c4 100644 --- a/java/src/IceSSL/ConnectorI.java +++ b/java/src/Ice/src/main/java/IceSSL/ConnectorI.java diff --git a/java/src/IceSSL/EndpointFactoryI.java b/java/src/Ice/src/main/java/IceSSL/EndpointFactoryI.java index 18354104ef7..18354104ef7 100644 --- a/java/src/IceSSL/EndpointFactoryI.java +++ b/java/src/Ice/src/main/java/IceSSL/EndpointFactoryI.java diff --git a/java/src/IceSSL/EndpointI.java b/java/src/Ice/src/main/java/IceSSL/EndpointI.java index 6fe9416d166..6fe9416d166 100644 --- a/java/src/IceSSL/EndpointI.java +++ b/java/src/Ice/src/main/java/IceSSL/EndpointI.java diff --git a/java/src/IceSSL/Instance.java b/java/src/Ice/src/main/java/IceSSL/Instance.java index 9d9930ec250..9d9930ec250 100644 --- a/java/src/IceSSL/Instance.java +++ b/java/src/Ice/src/main/java/IceSSL/Instance.java diff --git a/java/src/IceSSL/NativeConnectionInfo.java b/java/src/Ice/src/main/java/IceSSL/NativeConnectionInfo.java index 04f84ce4d6e..04f84ce4d6e 100644 --- a/java/src/IceSSL/NativeConnectionInfo.java +++ b/java/src/Ice/src/main/java/IceSSL/NativeConnectionInfo.java diff --git a/java/src/IceSSL/PasswordCallback.java b/java/src/Ice/src/main/java/IceSSL/PasswordCallback.java index 177faf1cc83..177faf1cc83 100644 --- a/java/src/IceSSL/PasswordCallback.java +++ b/java/src/Ice/src/main/java/IceSSL/PasswordCallback.java diff --git a/java/src/IceSSL/Plugin.java b/java/src/Ice/src/main/java/IceSSL/Plugin.java index 608b5202a68..608b5202a68 100644 --- a/java/src/IceSSL/Plugin.java +++ b/java/src/Ice/src/main/java/IceSSL/Plugin.java diff --git a/java/src/IceSSL/PluginFactory.java b/java/src/Ice/src/main/java/IceSSL/PluginFactory.java index 5fb43644b03..5fb43644b03 100644 --- a/java/src/IceSSL/PluginFactory.java +++ b/java/src/Ice/src/main/java/IceSSL/PluginFactory.java diff --git a/java/src/IceSSL/PluginI.java b/java/src/Ice/src/main/java/IceSSL/PluginI.java index feff8390fb0..feff8390fb0 100644 --- a/java/src/IceSSL/PluginI.java +++ b/java/src/Ice/src/main/java/IceSSL/PluginI.java diff --git a/java/src/IceSSL/RFC2253.java b/java/src/Ice/src/main/java/IceSSL/RFC2253.java index 291cb67b897..291cb67b897 100644 --- a/java/src/IceSSL/RFC2253.java +++ b/java/src/Ice/src/main/java/IceSSL/RFC2253.java diff --git a/java/src/IceSSL/SSLEngine.java b/java/src/Ice/src/main/java/IceSSL/SSLEngine.java index d8e4361e344..d8e4361e344 100644 --- a/java/src/IceSSL/SSLEngine.java +++ b/java/src/Ice/src/main/java/IceSSL/SSLEngine.java diff --git a/java/src/IceSSL/TransceiverI.java b/java/src/Ice/src/main/java/IceSSL/TransceiverI.java index c2a63efaf0b..c2a63efaf0b 100644 --- a/java/src/IceSSL/TransceiverI.java +++ b/java/src/Ice/src/main/java/IceSSL/TransceiverI.java diff --git a/java/src/IceSSL/TrustManager.java b/java/src/Ice/src/main/java/IceSSL/TrustManager.java index 858f176b9ae..858f176b9ae 100644 --- a/java/src/IceSSL/TrustManager.java +++ b/java/src/Ice/src/main/java/IceSSL/TrustManager.java diff --git a/java/src/IceSSL/Util.java b/java/src/Ice/src/main/java/IceSSL/Util.java index 1d948d62df4..1d948d62df4 100644 --- a/java/src/IceSSL/Util.java +++ b/java/src/Ice/src/main/java/IceSSL/Util.java diff --git a/java/src/IceSSL/X509KeyManagerI.java b/java/src/Ice/src/main/java/IceSSL/X509KeyManagerI.java index 31a8500180f..31a8500180f 100644 --- a/java/src/IceSSL/X509KeyManagerI.java +++ b/java/src/Ice/src/main/java/IceSSL/X509KeyManagerI.java diff --git a/java/src/IceSSL/X509TrustManagerI.java b/java/src/Ice/src/main/java/IceSSL/X509TrustManagerI.java index 108156b5597..108156b5597 100644 --- a/java/src/IceSSL/X509TrustManagerI.java +++ b/java/src/Ice/src/main/java/IceSSL/X509TrustManagerI.java diff --git a/java/src/IceUtil/Cache.java b/java/src/Ice/src/main/java/IceUtil/Cache.java index 064069cc843..064069cc843 100644 --- a/java/src/IceUtil/Cache.java +++ b/java/src/Ice/src/main/java/IceUtil/Cache.java diff --git a/java/src/IceUtil/FileLockException.java b/java/src/Ice/src/main/java/IceUtil/FileLockException.java index 19ddfdffa02..19ddfdffa02 100644 --- a/java/src/IceUtil/FileLockException.java +++ b/java/src/Ice/src/main/java/IceUtil/FileLockException.java diff --git a/java/src/IceUtil/Store.java b/java/src/Ice/src/main/java/IceUtil/Store.java index 1c0988268ac..1c0988268ac 100644 --- a/java/src/IceUtil/Store.java +++ b/java/src/Ice/src/main/java/IceUtil/Store.java diff --git a/java/src/IceUtil/Version.java b/java/src/Ice/src/main/java/IceUtil/Version.java index 599baf1d990..599baf1d990 100644 --- a/java/src/IceUtil/Version.java +++ b/java/src/Ice/src/main/java/IceUtil/Version.java diff --git a/java/src/IceUtilInternal/Assert.java b/java/src/Ice/src/main/java/IceUtilInternal/Assert.java index 965d7b175e3..965d7b175e3 100644 --- a/java/src/IceUtilInternal/Assert.java +++ b/java/src/Ice/src/main/java/IceUtilInternal/Assert.java diff --git a/java/src/IceUtilInternal/Base64.java b/java/src/Ice/src/main/java/IceUtilInternal/Base64.java index ba0b4918153..ba0b4918153 100644 --- a/java/src/IceUtilInternal/Base64.java +++ b/java/src/Ice/src/main/java/IceUtilInternal/Base64.java diff --git a/java/src/IceUtilInternal/FileLock.java b/java/src/Ice/src/main/java/IceUtilInternal/FileLock.java index 5ff24ccf0f7..5ff24ccf0f7 100644 --- a/java/src/IceUtilInternal/FileLock.java +++ b/java/src/Ice/src/main/java/IceUtilInternal/FileLock.java diff --git a/java/src/IceUtilInternal/Options.java b/java/src/Ice/src/main/java/IceUtilInternal/Options.java index 9e0167018ed..9e0167018ed 100644 --- a/java/src/IceUtilInternal/Options.java +++ b/java/src/Ice/src/main/java/IceUtilInternal/Options.java diff --git a/java/src/IceUtilInternal/OutputBase.java b/java/src/Ice/src/main/java/IceUtilInternal/OutputBase.java index e36d7c898b0..e36d7c898b0 100644 --- a/java/src/IceUtilInternal/OutputBase.java +++ b/java/src/Ice/src/main/java/IceUtilInternal/OutputBase.java diff --git a/java/src/IceUtilInternal/StopWatch.java b/java/src/Ice/src/main/java/IceUtilInternal/StopWatch.java index 8231e852fbc..8231e852fbc 100644 --- a/java/src/IceUtilInternal/StopWatch.java +++ b/java/src/Ice/src/main/java/IceUtilInternal/StopWatch.java diff --git a/java/src/IceUtilInternal/StringUtil.java b/java/src/Ice/src/main/java/IceUtilInternal/StringUtil.java index 68d93a8e322..68d93a8e322 100644 --- a/java/src/IceUtilInternal/StringUtil.java +++ b/java/src/Ice/src/main/java/IceUtilInternal/StringUtil.java diff --git a/java/src/IceUtilInternal/XMLOutput.java b/java/src/Ice/src/main/java/IceUtilInternal/XMLOutput.java index 22ccd557b55..22ccd557b55 100644 --- a/java/src/IceUtilInternal/XMLOutput.java +++ b/java/src/Ice/src/main/java/IceUtilInternal/XMLOutput.java diff --git a/java/src/Ice/src_Ice.iml b/java/src/Ice/src_Ice.iml new file mode 100644 index 00000000000..577b1eae9a4 --- /dev/null +++ b/java/src/Ice/src_Ice.iml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/build/classes/main" /> + <output-test url="file://$MODULE_DIR$/build/classes/test" /> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> + <excludeFolder url="file://$MODULE_DIR$/.gradle" /> + <excludeFolder url="file://$MODULE_DIR$/build/classes" /> + <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" /> + <excludeFolder url="file://$MODULE_DIR$/build/tmp" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module> + diff --git a/java/src/IceBox/build.gradle b/java/src/IceBox/build.gradle new file mode 100644 index 00000000000..160ea6d43e2 --- /dev/null +++ b/java/src/IceBox/build.gradle @@ -0,0 +1,27 @@ +slice { + java { + include = ["${sliceDir}"] + args = "--ice --tie --checksum IceBox.SliceChecksums" + files = fileTree(dir: "$sliceDir/IceBox", includes:['*.ice'], excludes:["*F.ice"]) + } +} + +idea.module { + excludeDirs -= file(buildDir) + buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it } +} + +dependencies { + compile project(':src/Ice') +} + +jar { + archiveName = "IceBox.jar" + destinationDir = new File("$rootProject.projectDir/lib/") +} + +task copyJars(type: Copy) { + from new File("$rootProject.projectDir/lib/IceBox.jar") + into "${prefix}/lib" +} +task install(dependsOn: copyJars) diff --git a/java/src/IceBox/Admin.java b/java/src/IceBox/src/main/java/IceBox/Admin.java index 6432bd849b9..6432bd849b9 100644 --- a/java/src/IceBox/Admin.java +++ b/java/src/IceBox/src/main/java/IceBox/Admin.java diff --git a/java/src/IceBox/Server.java b/java/src/IceBox/src/main/java/IceBox/Server.java index 59d85d0e824..59d85d0e824 100644 --- a/java/src/IceBox/Server.java +++ b/java/src/IceBox/src/main/java/IceBox/Server.java diff --git a/java/src/IceBox/ServiceManagerI.java b/java/src/IceBox/src/main/java/IceBox/ServiceManagerI.java index 03f949ef43d..03f949ef43d 100644 --- a/java/src/IceBox/ServiceManagerI.java +++ b/java/src/IceBox/src/main/java/IceBox/ServiceManagerI.java diff --git a/java/src/IceBox/src_IceBox.iml b/java/src/IceBox/src_IceBox.iml new file mode 100644 index 00000000000..f9a8f3d8110 --- /dev/null +++ b/java/src/IceBox/src_IceBox.iml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/build/classes/main" /> + <output-test url="file://$MODULE_DIR$/build/classes/test" /> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> + <excludeFolder url="file://$MODULE_DIR$/.gradle" /> + <excludeFolder url="file://$MODULE_DIR$/build/classes" /> + <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" /> + <excludeFolder url="file://$MODULE_DIR$/build/tmp" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="src_Ice" exported="" /> + </component> +</module> + diff --git a/java/src/IceDiscovery/build.gradle b/java/src/IceDiscovery/build.gradle new file mode 100644 index 00000000000..788a43680bb --- /dev/null +++ b/java/src/IceDiscovery/build.gradle @@ -0,0 +1,27 @@ +slice { + java { + include = ["${sliceDir}"] + args = "--ice" + files = fileTree(dir: "$sliceDir/IceDiscovery", includes:['*.ice'], excludes:["*F.ice"]) + } +} + +idea.module { + excludeDirs -= file(buildDir) + buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it } +} + +dependencies { + compile project(':src/Ice') +} + +jar { + archiveName = "IceDiscovery.jar" + destinationDir = new File("$rootProject.projectDir/lib/") +} + +task copyJars(type: Copy) { + from new File("$rootProject.projectDir/lib/IceDiscovery.jar") + into "${prefix}/lib" +} +task install(dependsOn: copyJars) diff --git a/java/src/IceDiscovery/LocatorI.java b/java/src/IceDiscovery/src/main/java/IceDiscovery/LocatorI.java index 0a11bc7028c..0a11bc7028c 100644 --- a/java/src/IceDiscovery/LocatorI.java +++ b/java/src/IceDiscovery/src/main/java/IceDiscovery/LocatorI.java diff --git a/java/src/IceDiscovery/LocatorRegistryI.java b/java/src/IceDiscovery/src/main/java/IceDiscovery/LocatorRegistryI.java index 5628236d6cc..5628236d6cc 100644 --- a/java/src/IceDiscovery/LocatorRegistryI.java +++ b/java/src/IceDiscovery/src/main/java/IceDiscovery/LocatorRegistryI.java diff --git a/java/src/IceDiscovery/LookupI.java b/java/src/IceDiscovery/src/main/java/IceDiscovery/LookupI.java index c3aaf296364..c3aaf296364 100644 --- a/java/src/IceDiscovery/LookupI.java +++ b/java/src/IceDiscovery/src/main/java/IceDiscovery/LookupI.java diff --git a/java/src/IceDiscovery/LookupReplyI.java b/java/src/IceDiscovery/src/main/java/IceDiscovery/LookupReplyI.java index 9e072221a4a..9e072221a4a 100644 --- a/java/src/IceDiscovery/LookupReplyI.java +++ b/java/src/IceDiscovery/src/main/java/IceDiscovery/LookupReplyI.java diff --git a/java/src/IceDiscovery/PluginFactory.java b/java/src/IceDiscovery/src/main/java/IceDiscovery/PluginFactory.java index 2efeaf3a831..2efeaf3a831 100644 --- a/java/src/IceDiscovery/PluginFactory.java +++ b/java/src/IceDiscovery/src/main/java/IceDiscovery/PluginFactory.java diff --git a/java/src/IceDiscovery/PluginI.java b/java/src/IceDiscovery/src/main/java/IceDiscovery/PluginI.java index 6be47ee2750..6be47ee2750 100644 --- a/java/src/IceDiscovery/PluginI.java +++ b/java/src/IceDiscovery/src/main/java/IceDiscovery/PluginI.java diff --git a/java/src/IceDiscovery/src_IceDiscovery.iml b/java/src/IceDiscovery/src_IceDiscovery.iml new file mode 100644 index 00000000000..b96135a8ded --- /dev/null +++ b/java/src/IceDiscovery/src_IceDiscovery.iml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/build/classes/main" /> + <output-test url="file://$MODULE_DIR$/build/classes/test" /> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> + <excludeFolder url="file://$MODULE_DIR$/.gradle" /> + <excludeFolder url="file://$MODULE_DIR$/build/classes" /> + <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" /> + <excludeFolder url="file://$MODULE_DIR$/build/tmp" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="src_Ice" exported="" /> + </component> +</module> + diff --git a/java/src/IceGrid/build.gradle b/java/src/IceGrid/build.gradle new file mode 100644 index 00000000000..ceefa61aea4 --- /dev/null +++ b/java/src/IceGrid/build.gradle @@ -0,0 +1,28 @@ +slice { + java { + include = ["${sliceDir}"] + args = "--ice --tie --checksum IceGrid.SliceChecksums" + files = fileTree(dir: "$sliceDir/IceGrid", includes:['*.ice'], excludes:["*F.ice"]) + } +} + +idea.module { + excludeDirs -= file(buildDir) + buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it } +} + +dependencies { + compile project(':src/Ice') + compile project(':src/Glacier2') +} + +jar { + archiveName = "IceGrid.jar" + destinationDir = new File("$rootProject.projectDir/lib/") +} + +task copyJars(type: Copy) { + from new File("$rootProject.projectDir/lib/IceGrid.jar") + into "${prefix}/lib" +} +task install(dependsOn: copyJars) diff --git a/java/src/IceGrid/DiscoveryPluginFactoryI.java b/java/src/IceGrid/src/main/java/IceGrid/DiscoveryPluginFactoryI.java index 2c79ceeb5f7..2c79ceeb5f7 100644 --- a/java/src/IceGrid/DiscoveryPluginFactoryI.java +++ b/java/src/IceGrid/src/main/java/IceGrid/DiscoveryPluginFactoryI.java diff --git a/java/src/IceGrid/DiscoveryPluginI.java b/java/src/IceGrid/src/main/java/IceGrid/DiscoveryPluginI.java index 30c9c02301c..30c9c02301c 100644 --- a/java/src/IceGrid/DiscoveryPluginI.java +++ b/java/src/IceGrid/src/main/java/IceGrid/DiscoveryPluginI.java diff --git a/java/src/IceGrid/src_IceGrid.iml b/java/src/IceGrid/src_IceGrid.iml new file mode 100644 index 00000000000..4be1d46932c --- /dev/null +++ b/java/src/IceGrid/src_IceGrid.iml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/build/classes/main" /> + <output-test url="file://$MODULE_DIR$/build/classes/test" /> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> + <excludeFolder url="file://$MODULE_DIR$/.gradle" /> + <excludeFolder url="file://$MODULE_DIR$/build/classes" /> + <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" /> + <excludeFolder url="file://$MODULE_DIR$/build/tmp" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="src_Ice" exported="" /> + <orderEntry type="module" module-name="src_Glacier2" exported="" /> + </component> +</module> + diff --git a/java/src/IceGridGUI/build.gradle b/java/src/IceGridGUI/build.gradle new file mode 100644 index 00000000000..45c7aca88cc --- /dev/null +++ b/java/src/IceGridGUI/build.gradle @@ -0,0 +1,24 @@ +apply plugin: 'application' +apply from: "../../gradle/javafx7.gradle" + +dependencies { + compile project(':src/Ice') + compile project(':src/IceBox') + compile project(':src/IceGrid') + compile 'com.jgoodies:jgoodies-common:1.8.0' + compile 'com.jgoodies:jgoodies-looks:2.6.0' + compile 'com.jgoodies:jgoodies-forms:1.8.0' +} + +mainClassName = "IceGridGUI.Main" + +jar { + archiveName = "IceGridGUI.jar" + destinationDir = new File("$rootProject.projectDir/lib/") +} + +task copyJars(type: Copy) { + from new File("$rootProject.projectDir/lib/IceGridGUI.jar") + into "${prefix}/lib" +} +task install(dependsOn: copyJars) diff --git a/java/src/IceGridGUI/AdapterObserverI.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/AdapterObserverI.java index 7b92ad11acb..7b92ad11acb 100644 --- a/java/src/IceGridGUI/AdapterObserverI.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/AdapterObserverI.java diff --git a/java/src/IceGridGUI/AdminRouter.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/AdminRouter.java index 4d4d9557e88..4d4d9557e88 100644 --- a/java/src/IceGridGUI/AdminRouter.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/AdminRouter.java diff --git a/java/src/IceGridGUI/Application/AbstractServerEditor.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/AbstractServerEditor.java index 9b55bafc5c5..9b55bafc5c5 100644 --- a/java/src/IceGridGUI/Application/AbstractServerEditor.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/AbstractServerEditor.java diff --git a/java/src/IceGridGUI/Application/Adapter.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/Adapter.java index 63be0308d4b..63be0308d4b 100644 --- a/java/src/IceGridGUI/Application/Adapter.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/Adapter.java diff --git a/java/src/IceGridGUI/Application/AdapterEditor.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/AdapterEditor.java index 007796ad7b2..007796ad7b2 100644 --- a/java/src/IceGridGUI/Application/AdapterEditor.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/AdapterEditor.java diff --git a/java/src/IceGridGUI/Application/ApplicationEditor.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ApplicationEditor.java index 2192e20ec43..2192e20ec43 100644 --- a/java/src/IceGridGUI/Application/ApplicationEditor.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ApplicationEditor.java diff --git a/java/src/IceGridGUI/Application/ArrayMapField.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ArrayMapField.java index f187607abd8..f187607abd8 100644 --- a/java/src/IceGridGUI/Application/ArrayMapField.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ArrayMapField.java diff --git a/java/src/IceGridGUI/Application/Communicator.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/Communicator.java index eb501e09a8a..eb501e09a8a 100644 --- a/java/src/IceGridGUI/Application/Communicator.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/Communicator.java diff --git a/java/src/IceGridGUI/Application/CommunicatorChildEditor.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/CommunicatorChildEditor.java index b3e72b8f91d..b3e72b8f91d 100644 --- a/java/src/IceGridGUI/Application/CommunicatorChildEditor.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/CommunicatorChildEditor.java diff --git a/java/src/IceGridGUI/Application/CommunicatorSubEditor.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/CommunicatorSubEditor.java index 66d1785e082..66d1785e082 100644 --- a/java/src/IceGridGUI/Application/CommunicatorSubEditor.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/CommunicatorSubEditor.java diff --git a/java/src/IceGridGUI/Application/DbEnv.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/DbEnv.java index 7f1743bf678..7f1743bf678 100644 --- a/java/src/IceGridGUI/Application/DbEnv.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/DbEnv.java diff --git a/java/src/IceGridGUI/Application/DbEnvEditor.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/DbEnvEditor.java index f4c6dfcc531..f4c6dfcc531 100644 --- a/java/src/IceGridGUI/Application/DbEnvEditor.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/DbEnvEditor.java diff --git a/java/src/IceGridGUI/Application/DescriptorHolder.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/DescriptorHolder.java index 6fb9abf0573..6fb9abf0573 100644 --- a/java/src/IceGridGUI/Application/DescriptorHolder.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/DescriptorHolder.java diff --git a/java/src/IceGridGUI/Application/Editable.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/Editable.java index f6cd02d3b52..f6cd02d3b52 100644 --- a/java/src/IceGridGUI/Application/Editable.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/Editable.java diff --git a/java/src/IceGridGUI/Application/Editor.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/Editor.java index 48908b6f74b..48908b6f74b 100644 --- a/java/src/IceGridGUI/Application/Editor.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/Editor.java diff --git a/java/src/IceGridGUI/Application/ListTextField.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ListTextField.java index a329cf14439..a329cf14439 100644 --- a/java/src/IceGridGUI/Application/ListTextField.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ListTextField.java diff --git a/java/src/IceGridGUI/Application/ListTreeNode.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ListTreeNode.java index 3f0ca2b498b..3f0ca2b498b 100644 --- a/java/src/IceGridGUI/Application/ListTreeNode.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ListTreeNode.java diff --git a/java/src/IceGridGUI/Application/Node.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/Node.java index 3c7062425e2..3c7062425e2 100644 --- a/java/src/IceGridGUI/Application/Node.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/Node.java diff --git a/java/src/IceGridGUI/Application/NodeEditor.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/NodeEditor.java index d26c32bc8fe..d26c32bc8fe 100644 --- a/java/src/IceGridGUI/Application/NodeEditor.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/NodeEditor.java diff --git a/java/src/IceGridGUI/Application/Nodes.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/Nodes.java index f8fc97f0912..f8fc97f0912 100644 --- a/java/src/IceGridGUI/Application/Nodes.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/Nodes.java diff --git a/java/src/IceGridGUI/Application/ParameterValuesField.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ParameterValuesField.java index ad4adb5c88c..ad4adb5c88c 100644 --- a/java/src/IceGridGUI/Application/ParameterValuesField.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ParameterValuesField.java diff --git a/java/src/IceGridGUI/Application/ParametersField.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ParametersField.java index 80d68d737ef..80d68d737ef 100644 --- a/java/src/IceGridGUI/Application/ParametersField.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ParametersField.java diff --git a/java/src/IceGridGUI/Application/PlainServer.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/PlainServer.java index 774b346fc7a..774b346fc7a 100644 --- a/java/src/IceGridGUI/Application/PlainServer.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/PlainServer.java diff --git a/java/src/IceGridGUI/Application/PlainServerEditor.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/PlainServerEditor.java index 74070353be0..74070353be0 100644 --- a/java/src/IceGridGUI/Application/PlainServerEditor.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/PlainServerEditor.java diff --git a/java/src/IceGridGUI/Application/PlainService.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/PlainService.java index fd4305763ec..fd4305763ec 100644 --- a/java/src/IceGridGUI/Application/PlainService.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/PlainService.java diff --git a/java/src/IceGridGUI/Application/PlainServiceEditor.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/PlainServiceEditor.java index d99a9bd774c..d99a9bd774c 100644 --- a/java/src/IceGridGUI/Application/PlainServiceEditor.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/PlainServiceEditor.java diff --git a/java/src/IceGridGUI/Application/PropertiesField.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/PropertiesField.java index 983b6de1f51..983b6de1f51 100644 --- a/java/src/IceGridGUI/Application/PropertiesField.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/PropertiesField.java diff --git a/java/src/IceGridGUI/Application/PropertySet.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/PropertySet.java index d7675eace42..d7675eace42 100644 --- a/java/src/IceGridGUI/Application/PropertySet.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/PropertySet.java diff --git a/java/src/IceGridGUI/Application/PropertySetEditor.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/PropertySetEditor.java index 70a7e35d3de..70a7e35d3de 100644 --- a/java/src/IceGridGUI/Application/PropertySetEditor.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/PropertySetEditor.java diff --git a/java/src/IceGridGUI/Application/PropertySetParent.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/PropertySetParent.java index 39bf95e5204..39bf95e5204 100644 --- a/java/src/IceGridGUI/Application/PropertySetParent.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/PropertySetParent.java diff --git a/java/src/IceGridGUI/Application/PropertySets.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/PropertySets.java index 933757a1e81..933757a1e81 100644 --- a/java/src/IceGridGUI/Application/PropertySets.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/PropertySets.java diff --git a/java/src/IceGridGUI/Application/ReplicaGroup.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ReplicaGroup.java index e49d98271dc..e49d98271dc 100644 --- a/java/src/IceGridGUI/Application/ReplicaGroup.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ReplicaGroup.java diff --git a/java/src/IceGridGUI/Application/ReplicaGroupEditor.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ReplicaGroupEditor.java index da7e2e07cc1..da7e2e07cc1 100644 --- a/java/src/IceGridGUI/Application/ReplicaGroupEditor.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ReplicaGroupEditor.java diff --git a/java/src/IceGridGUI/Application/ReplicaGroups.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ReplicaGroups.java index 9aef88b7426..9aef88b7426 100644 --- a/java/src/IceGridGUI/Application/ReplicaGroups.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ReplicaGroups.java diff --git a/java/src/IceGridGUI/Application/Root.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/Root.java index 31f00581390..31f00581390 100644 --- a/java/src/IceGridGUI/Application/Root.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/Root.java diff --git a/java/src/IceGridGUI/Application/Server.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/Server.java index 96fa4f9a556..96fa4f9a556 100644 --- a/java/src/IceGridGUI/Application/Server.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/Server.java diff --git a/java/src/IceGridGUI/Application/ServerInstance.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ServerInstance.java index fc76d2181b2..fc76d2181b2 100644 --- a/java/src/IceGridGUI/Application/ServerInstance.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ServerInstance.java diff --git a/java/src/IceGridGUI/Application/ServerInstanceEditor.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ServerInstanceEditor.java index 0401daf4567..0401daf4567 100644 --- a/java/src/IceGridGUI/Application/ServerInstanceEditor.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ServerInstanceEditor.java diff --git a/java/src/IceGridGUI/Application/ServerInstancePropertySetEditor.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ServerInstancePropertySetEditor.java index 4292cd868ae..4292cd868ae 100644 --- a/java/src/IceGridGUI/Application/ServerInstancePropertySetEditor.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ServerInstancePropertySetEditor.java diff --git a/java/src/IceGridGUI/Application/ServerSubEditor.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ServerSubEditor.java index 6c3f079c202..6c3f079c202 100644 --- a/java/src/IceGridGUI/Application/ServerSubEditor.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ServerSubEditor.java diff --git a/java/src/IceGridGUI/Application/ServerTemplate.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ServerTemplate.java index 896fb30705a..896fb30705a 100644 --- a/java/src/IceGridGUI/Application/ServerTemplate.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ServerTemplate.java diff --git a/java/src/IceGridGUI/Application/ServerTemplateEditor.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ServerTemplateEditor.java index f6f45252dc8..f6f45252dc8 100644 --- a/java/src/IceGridGUI/Application/ServerTemplateEditor.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ServerTemplateEditor.java diff --git a/java/src/IceGridGUI/Application/ServerTemplates.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ServerTemplates.java index 5e2458ae29f..5e2458ae29f 100644 --- a/java/src/IceGridGUI/Application/ServerTemplates.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ServerTemplates.java diff --git a/java/src/IceGridGUI/Application/Service.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/Service.java index 67fea4652db..67fea4652db 100644 --- a/java/src/IceGridGUI/Application/Service.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/Service.java diff --git a/java/src/IceGridGUI/Application/ServiceInstance.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ServiceInstance.java index aa21a9ce37d..aa21a9ce37d 100644 --- a/java/src/IceGridGUI/Application/ServiceInstance.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ServiceInstance.java diff --git a/java/src/IceGridGUI/Application/ServiceInstanceEditor.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ServiceInstanceEditor.java index 9edbfe39927..9edbfe39927 100644 --- a/java/src/IceGridGUI/Application/ServiceInstanceEditor.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ServiceInstanceEditor.java diff --git a/java/src/IceGridGUI/Application/ServiceSubEditor.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ServiceSubEditor.java index 37ad5ada3c8..37ad5ada3c8 100644 --- a/java/src/IceGridGUI/Application/ServiceSubEditor.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ServiceSubEditor.java diff --git a/java/src/IceGridGUI/Application/ServiceTemplate.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ServiceTemplate.java index b8210f000ec..b8210f000ec 100644 --- a/java/src/IceGridGUI/Application/ServiceTemplate.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ServiceTemplate.java diff --git a/java/src/IceGridGUI/Application/ServiceTemplateEditor.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ServiceTemplateEditor.java index 7dba325e896..7dba325e896 100644 --- a/java/src/IceGridGUI/Application/ServiceTemplateEditor.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ServiceTemplateEditor.java diff --git a/java/src/IceGridGUI/Application/ServiceTemplates.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ServiceTemplates.java index a4a3412afc7..a4a3412afc7 100644 --- a/java/src/IceGridGUI/Application/ServiceTemplates.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/ServiceTemplates.java diff --git a/java/src/IceGridGUI/Application/SimpleMapField.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/SimpleMapField.java index 7a9bbda1389..7a9bbda1389 100644 --- a/java/src/IceGridGUI/Application/SimpleMapField.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/SimpleMapField.java diff --git a/java/src/IceGridGUI/Application/TemplateEditor.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/TemplateEditor.java index 3a5117291ba..3a5117291ba 100644 --- a/java/src/IceGridGUI/Application/TemplateEditor.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/TemplateEditor.java diff --git a/java/src/IceGridGUI/Application/TemplateInstance.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/TemplateInstance.java index aabce8900fd..aabce8900fd 100644 --- a/java/src/IceGridGUI/Application/TemplateInstance.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/TemplateInstance.java diff --git a/java/src/IceGridGUI/Application/Templates.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/Templates.java index 2394ed71dcb..2394ed71dcb 100644 --- a/java/src/IceGridGUI/Application/Templates.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/Templates.java diff --git a/java/src/IceGridGUI/Application/TreeNode.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/TreeNode.java index f67e46d887f..f67e46d887f 100644 --- a/java/src/IceGridGUI/Application/TreeNode.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/TreeNode.java diff --git a/java/src/IceGridGUI/Application/UpdateFailedException.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/UpdateFailedException.java index d81d5802fc0..d81d5802fc0 100644 --- a/java/src/IceGridGUI/Application/UpdateFailedException.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Application/UpdateFailedException.java diff --git a/java/src/IceGridGUI/ApplicationActions.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/ApplicationActions.java index 4abd75f6261..4abd75f6261 100644 --- a/java/src/IceGridGUI/ApplicationActions.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/ApplicationActions.java diff --git a/java/src/IceGridGUI/ApplicationObserverI.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/ApplicationObserverI.java index feaf4306b88..feaf4306b88 100644 --- a/java/src/IceGridGUI/ApplicationObserverI.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/ApplicationObserverI.java diff --git a/java/src/IceGridGUI/ApplicationPane.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/ApplicationPane.java index 52e5d9076b4..52e5d9076b4 100644 --- a/java/src/IceGridGUI/ApplicationPane.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/ApplicationPane.java diff --git a/java/src/IceGridGUI/BareBonesBrowserLaunch.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/BareBonesBrowserLaunch.java index af6b0e0a5e3..af6b0e0a5e3 100644 --- a/java/src/IceGridGUI/BareBonesBrowserLaunch.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/BareBonesBrowserLaunch.java diff --git a/java/src/IceGridGUI/CellRenderer.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/CellRenderer.java index 4e319329755..4e319329755 100644 --- a/java/src/IceGridGUI/CellRenderer.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/CellRenderer.java diff --git a/java/src/IceGridGUI/Coordinator.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Coordinator.java index e7397bd1a60..e7397bd1a60 100644 --- a/java/src/IceGridGUI/Coordinator.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Coordinator.java diff --git a/java/src/IceGridGUI/EditorBase.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/EditorBase.java index 6b045e67454..6b045e67454 100644 --- a/java/src/IceGridGUI/EditorBase.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/EditorBase.java diff --git a/java/src/IceGridGUI/Fallback.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Fallback.java index d1d93ff35b3..d1d93ff35b3 100644 --- a/java/src/IceGridGUI/Fallback.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Fallback.java diff --git a/java/src/IceGridGUI/LiveActions.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveActions.java index dbfbc237143..dbfbc237143 100644 --- a/java/src/IceGridGUI/LiveActions.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveActions.java diff --git a/java/src/IceGridGUI/LiveDeployment/Adapter.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/Adapter.java index d169c653477..d169c653477 100644 --- a/java/src/IceGridGUI/LiveDeployment/Adapter.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/Adapter.java diff --git a/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/AdapterEditor.java index 2c19d4ea883..2c19d4ea883 100644 --- a/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/AdapterEditor.java diff --git a/java/src/IceGridGUI/LiveDeployment/ApplicationDetailsDialog.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/ApplicationDetailsDialog.java index 8784f8812a2..8784f8812a2 100644 --- a/java/src/IceGridGUI/LiveDeployment/ApplicationDetailsDialog.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/ApplicationDetailsDialog.java diff --git a/java/src/IceGridGUI/LiveDeployment/CommunicatorEditor.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/CommunicatorEditor.java index 19a8b63def2..19a8b63def2 100644 --- a/java/src/IceGridGUI/LiveDeployment/CommunicatorEditor.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/CommunicatorEditor.java diff --git a/java/src/IceGridGUI/LiveDeployment/DbEnv.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/DbEnv.java index 2788f3ee5ad..2788f3ee5ad 100644 --- a/java/src/IceGridGUI/LiveDeployment/DbEnv.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/DbEnv.java diff --git a/java/src/IceGridGUI/LiveDeployment/DbEnvEditor.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/DbEnvEditor.java index 03a9596db66..03a9596db66 100644 --- a/java/src/IceGridGUI/LiveDeployment/DbEnvEditor.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/DbEnvEditor.java diff --git a/java/src/IceGridGUI/LiveDeployment/Editor.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/Editor.java index 7ed53021c5a..7ed53021c5a 100644 --- a/java/src/IceGridGUI/LiveDeployment/Editor.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/Editor.java diff --git a/java/src/IceGridGUI/LiveDeployment/GraphView.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/GraphView.java index 2ee498b2f74..2ee498b2f74 100644 --- a/java/src/IceGridGUI/LiveDeployment/GraphView.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/GraphView.java diff --git a/java/src/IceGridGUI/LiveDeployment/ListArrayTreeNode.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/ListArrayTreeNode.java index 5dbb1d6520d..5dbb1d6520d 100644 --- a/java/src/IceGridGUI/LiveDeployment/ListArrayTreeNode.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/ListArrayTreeNode.java diff --git a/java/src/IceGridGUI/LiveDeployment/ListTreeNode.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/ListTreeNode.java index b28a5824ea2..b28a5824ea2 100644 --- a/java/src/IceGridGUI/LiveDeployment/ListTreeNode.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/ListTreeNode.java diff --git a/java/src/IceGridGUI/LiveDeployment/LogFilterDialog.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/LogFilterDialog.java index e75a5e64730..e75a5e64730 100644 --- a/java/src/IceGridGUI/LiveDeployment/LogFilterDialog.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/LogFilterDialog.java diff --git a/java/src/IceGridGUI/LiveDeployment/LogPrefsDialog.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/LogPrefsDialog.java index d6068df89de..d6068df89de 100644 --- a/java/src/IceGridGUI/LiveDeployment/LogPrefsDialog.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/LogPrefsDialog.java diff --git a/java/src/IceGridGUI/LiveDeployment/MetricsFieldContext.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/MetricsFieldContext.java index 7cf6625a32a..7cf6625a32a 100644 --- a/java/src/IceGridGUI/LiveDeployment/MetricsFieldContext.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/MetricsFieldContext.java diff --git a/java/src/IceGridGUI/LiveDeployment/MetricsView.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/MetricsView.java index 2840f21de09..2840f21de09 100644 --- a/java/src/IceGridGUI/LiveDeployment/MetricsView.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/MetricsView.java diff --git a/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/MetricsViewEditor.java index a54d26039a3..a54d26039a3 100644 --- a/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/MetricsViewEditor.java diff --git a/java/src/IceGridGUI/LiveDeployment/Node.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/Node.java index 3cfbb4a003a..3cfbb4a003a 100644 --- a/java/src/IceGridGUI/LiveDeployment/Node.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/Node.java diff --git a/java/src/IceGridGUI/LiveDeployment/NodeEditor.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/NodeEditor.java index 9f8b58e8003..9f8b58e8003 100644 --- a/java/src/IceGridGUI/LiveDeployment/NodeEditor.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/NodeEditor.java diff --git a/java/src/IceGridGUI/LiveDeployment/ObjectDialog.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/ObjectDialog.java index 0725d3ba1cc..0725d3ba1cc 100644 --- a/java/src/IceGridGUI/LiveDeployment/ObjectDialog.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/ObjectDialog.java diff --git a/java/src/IceGridGUI/LiveDeployment/RegistryEditor.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/RegistryEditor.java index a3940cc0c67..a3940cc0c67 100644 --- a/java/src/IceGridGUI/LiveDeployment/RegistryEditor.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/RegistryEditor.java diff --git a/java/src/IceGridGUI/LiveDeployment/Root.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/Root.java index 6625687ebbb..6625687ebbb 100644 --- a/java/src/IceGridGUI/LiveDeployment/Root.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/Root.java diff --git a/java/src/IceGridGUI/LiveDeployment/Server.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/Server.java index ce790055380..ce790055380 100644 --- a/java/src/IceGridGUI/LiveDeployment/Server.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/Server.java diff --git a/java/src/IceGridGUI/LiveDeployment/ServerEditor.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/ServerEditor.java index 900920d8c21..900920d8c21 100644 --- a/java/src/IceGridGUI/LiveDeployment/ServerEditor.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/ServerEditor.java diff --git a/java/src/IceGridGUI/LiveDeployment/Service.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/Service.java index 6a2de665305..6a2de665305 100644 --- a/java/src/IceGridGUI/LiveDeployment/Service.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/Service.java diff --git a/java/src/IceGridGUI/LiveDeployment/ServiceEditor.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/ServiceEditor.java index d43a1dec103..d43a1dec103 100644 --- a/java/src/IceGridGUI/LiveDeployment/ServiceEditor.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/ServiceEditor.java diff --git a/java/src/IceGridGUI/LiveDeployment/ShowIceLogDialog.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/ShowIceLogDialog.java index 6e11695bf60..6e11695bf60 100644 --- a/java/src/IceGridGUI/LiveDeployment/ShowIceLogDialog.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/ShowIceLogDialog.java diff --git a/java/src/IceGridGUI/LiveDeployment/ShowLogFileDialog.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/ShowLogFileDialog.java index fb256b326bd..fb256b326bd 100644 --- a/java/src/IceGridGUI/LiveDeployment/ShowLogFileDialog.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/ShowLogFileDialog.java diff --git a/java/src/IceGridGUI/LiveDeployment/Slave.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/Slave.java index 75d4158f5b3..75d4158f5b3 100644 --- a/java/src/IceGridGUI/LiveDeployment/Slave.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/Slave.java diff --git a/java/src/IceGridGUI/LiveDeployment/SlaveEditor.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/SlaveEditor.java index 25d3081ae51..25d3081ae51 100644 --- a/java/src/IceGridGUI/LiveDeployment/SlaveEditor.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/SlaveEditor.java diff --git a/java/src/IceGridGUI/LiveDeployment/TableField.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/TableField.java index 405bb90553f..405bb90553f 100644 --- a/java/src/IceGridGUI/LiveDeployment/TableField.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/TableField.java diff --git a/java/src/IceGridGUI/LiveDeployment/TreeNode.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/TreeNode.java index be37680715c..be37680715c 100644 --- a/java/src/IceGridGUI/LiveDeployment/TreeNode.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/TreeNode.java diff --git a/java/src/IceGridGUI/LiveDeployment/WriteMessageDialog.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/WriteMessageDialog.java index 7645fb1435f..7645fb1435f 100644 --- a/java/src/IceGridGUI/LiveDeployment/WriteMessageDialog.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/WriteMessageDialog.java diff --git a/java/src/IceGridGUI/LiveDeploymentPane.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeploymentPane.java index eda638a63e2..eda638a63e2 100644 --- a/java/src/IceGridGUI/LiveDeploymentPane.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeploymentPane.java diff --git a/java/src/IceGridGUI/Logger.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Logger.java index 7e914d17502..7e914d17502 100644 --- a/java/src/IceGridGUI/Logger.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Logger.java diff --git a/java/src/IceGridGUI/Main.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Main.java index 8d030d61df6..8d030d61df6 100644 --- a/java/src/IceGridGUI/Main.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Main.java diff --git a/java/src/IceGridGUI/MainPane.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/MainPane.java index 2a7dffccc96..2a7dffccc96 100644 --- a/java/src/IceGridGUI/MainPane.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/MainPane.java diff --git a/java/src/IceGridGUI/MainProxy.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/MainProxy.java index dd681dcb9ba..dd681dcb9ba 100644 --- a/java/src/IceGridGUI/MainProxy.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/MainProxy.java diff --git a/java/src/IceGridGUI/NodeObserverI.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/NodeObserverI.java index 8bb9d9dddf9..8bb9d9dddf9 100644 --- a/java/src/IceGridGUI/NodeObserverI.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/NodeObserverI.java diff --git a/java/src/IceGridGUI/ObjectObserverI.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/ObjectObserverI.java index 2d721d0769d..2d721d0769d 100644 --- a/java/src/IceGridGUI/ObjectObserverI.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/ObjectObserverI.java diff --git a/java/src/IceGridGUI/RegistryObserverI.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/RegistryObserverI.java index 5013a4cd0c5..5013a4cd0c5 100644 --- a/java/src/IceGridGUI/RegistryObserverI.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/RegistryObserverI.java diff --git a/java/src/IceGridGUI/SessionKeeper.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/SessionKeeper.java index 52f9536fac5..52f9536fac5 100644 --- a/java/src/IceGridGUI/SessionKeeper.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/SessionKeeper.java diff --git a/java/src/IceGridGUI/SimpleInternalFrame.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/SimpleInternalFrame.java index 14b0a514911..14b0a514911 100644 --- a/java/src/IceGridGUI/SimpleInternalFrame.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/SimpleInternalFrame.java diff --git a/java/src/IceGridGUI/StatusBar.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/StatusBar.java index 002be41ba8d..002be41ba8d 100644 --- a/java/src/IceGridGUI/StatusBar.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/StatusBar.java diff --git a/java/src/IceGridGUI/Tab.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Tab.java index 5a069b2c802..5a069b2c802 100644 --- a/java/src/IceGridGUI/Tab.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Tab.java diff --git a/java/src/IceGridGUI/TreeNodeBase.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/TreeNodeBase.java index 0da28bb420a..0da28bb420a 100644 --- a/java/src/IceGridGUI/TreeNodeBase.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/TreeNodeBase.java diff --git a/java/src/IceGridGUI/Utils.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Utils.java index 3126875cb96..3126875cb96 100644 --- a/java/src/IceGridGUI/Utils.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Utils.java diff --git a/java/src/IceGridGUI/XMLWriter.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/XMLWriter.java index 17304dc895c..17304dc895c 100644 --- a/java/src/IceGridGUI/XMLWriter.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/XMLWriter.java diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/adapter_active.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/adapter_active.png Binary files differnew file mode 100644 index 00000000000..5cd2e043d97 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/adapter_active.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/adapter_inactive.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/adapter_inactive.png Binary files differnew file mode 100644 index 00000000000..0e14ed4bf51 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/adapter_inactive.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/application_closed.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/application_closed.png Binary files differnew file mode 100644 index 00000000000..0eda25bd526 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/application_closed.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/application_open.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/application_open.png Binary files differnew file mode 100644 index 00000000000..37cd1862483 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/application_open.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/database.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/database.png Binary files differnew file mode 100644 index 00000000000..37f076b152f --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/database.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/default.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/default.png Binary files differnew file mode 100644 index 00000000000..a5846da73af --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/default.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/disable.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/disable.png Binary files differnew file mode 100644 index 00000000000..63be8645bbf --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/disable.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/enable.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/enable.png Binary files differnew file mode 100644 index 00000000000..a5846da73af --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/enable.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/file_bound_application.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/file_bound_application.png Binary files differnew file mode 100644 index 00000000000..89adb367c3a --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/file_bound_application.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/folder_closed.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/folder_closed.png Binary files differnew file mode 100644 index 00000000000..df3080fd664 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/folder_closed.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/folder_open.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/folder_open.png Binary files differnew file mode 100644 index 00000000000..7a6585aaf2b --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/folder_open.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/goto.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/goto.png Binary files differnew file mode 100644 index 00000000000..5be576a7c0c --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/goto.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/grid.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/grid.png Binary files differnew file mode 100644 index 00000000000..1b53bc756b0 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/grid.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_activating.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_activating.png Binary files differnew file mode 100644 index 00000000000..e9f07965398 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_activating.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_active.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_active.png Binary files differnew file mode 100644 index 00000000000..ff64212d495 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_active.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_deactivating.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_deactivating.png Binary files differnew file mode 100644 index 00000000000..a71034e4921 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_deactivating.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_destroyed.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_destroyed.png Binary files differnew file mode 100644 index 00000000000..e6a96d845cd --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_destroyed.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_destroying.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_destroying.png Binary files differnew file mode 100644 index 00000000000..e6a96d845cd --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_destroying.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_disabled_activating.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_disabled_activating.png Binary files differnew file mode 100644 index 00000000000..59253ff7d76 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_disabled_activating.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_disabled_active.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_disabled_active.png Binary files differnew file mode 100644 index 00000000000..0406e5a5ce9 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_disabled_active.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_disabled_deactivating.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_disabled_deactivating.png Binary files differnew file mode 100644 index 00000000000..3aa4001df91 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_disabled_deactivating.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_disabled_destroyed.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_disabled_destroyed.png Binary files differnew file mode 100644 index 00000000000..4e9afa0e2ea --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_disabled_destroyed.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_disabled_destroying.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_disabled_destroying.png Binary files differnew file mode 100644 index 00000000000..4e9afa0e2ea --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_disabled_destroying.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_disabled_inactive.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_disabled_inactive.png Binary files differnew file mode 100644 index 00000000000..3686ddc8b82 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_disabled_inactive.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_inactive.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_inactive.png Binary files differnew file mode 100644 index 00000000000..0b64fe6d558 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_inactive.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_template.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_template.png Binary files differnew file mode 100644 index 00000000000..4f845b21dd9 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_template.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_unknown.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_unknown.png Binary files differnew file mode 100644 index 00000000000..f4e183d6113 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/icebox_server_unknown.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/live_deployment.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/live_deployment.png Binary files differnew file mode 100644 index 00000000000..bba9d8dd079 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/live_deployment.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/metrics.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/metrics.png Binary files differnew file mode 100755 index 00000000000..a5530ec07b5 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/metrics.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/metrics_disabled.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/metrics_disabled.png Binary files differnew file mode 100755 index 00000000000..17860ee9ed3 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/metrics_disabled.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/metrics_graph.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/metrics_graph.png Binary files differnew file mode 100755 index 00000000000..124b2a219c6 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/metrics_graph.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/node.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/node.png Binary files differnew file mode 100644 index 00000000000..776fc3b5b5b --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/node.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/node_down.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/node_down.png Binary files differnew file mode 100644 index 00000000000..44c340c4906 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/node_down.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/node_up.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/node_up.png Binary files differnew file mode 100644 index 00000000000..27a716235da --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/node_up.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/pause.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/pause.png Binary files differnew file mode 100644 index 00000000000..76ad4e00710 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/pause.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/property_set.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/property_set.png Binary files differnew file mode 100644 index 00000000000..aa7206953e2 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/property_set.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/registry.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/registry.png Binary files differnew file mode 100644 index 00000000000..d6801fc8967 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/registry.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/registry_bound_application.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/registry_bound_application.png Binary files differnew file mode 100644 index 00000000000..75e7cdd56f6 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/registry_bound_application.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/replica_group.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/replica_group.png Binary files differnew file mode 100644 index 00000000000..40671a77967 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/replica_group.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/server_activating.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/server_activating.png Binary files differnew file mode 100644 index 00000000000..7e367eb8ca2 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/server_activating.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/server_active.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/server_active.png Binary files differnew file mode 100644 index 00000000000..c297ec16708 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/server_active.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/server_deactivating.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/server_deactivating.png Binary files differnew file mode 100644 index 00000000000..0ce720a13df --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/server_deactivating.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/server_destroyed.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/server_destroyed.png Binary files differnew file mode 100644 index 00000000000..666b5a4a3cc --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/server_destroyed.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/server_destroying.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/server_destroying.png Binary files differnew file mode 100644 index 00000000000..666b5a4a3cc --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/server_destroying.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/server_disabled_activating.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/server_disabled_activating.png Binary files differnew file mode 100644 index 00000000000..a126dbfd798 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/server_disabled_activating.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/server_disabled_active.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/server_disabled_active.png Binary files differnew file mode 100644 index 00000000000..4579ae9063f --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/server_disabled_active.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/server_disabled_deactivating.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/server_disabled_deactivating.png Binary files differnew file mode 100644 index 00000000000..6637d6685f6 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/server_disabled_deactivating.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/server_disabled_destroyed.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/server_disabled_destroyed.png Binary files differnew file mode 100644 index 00000000000..e50bb39a9b0 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/server_disabled_destroyed.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/server_disabled_destroying.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/server_disabled_destroying.png Binary files differnew file mode 100644 index 00000000000..e50bb39a9b0 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/server_disabled_destroying.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/server_disabled_inactive.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/server_disabled_inactive.png Binary files differnew file mode 100644 index 00000000000..a7bc21a0eae --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/server_disabled_inactive.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/server_inactive.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/server_inactive.png Binary files differnew file mode 100644 index 00000000000..b6f7b260ef9 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/server_inactive.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/server_template.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/server_template.png Binary files differnew file mode 100644 index 00000000000..976ab9a595e --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/server_template.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/server_unknown.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/server_unknown.png Binary files differnew file mode 100644 index 00000000000..a463dbe6f06 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/server_unknown.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/service.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/service.png Binary files differnew file mode 100644 index 00000000000..7b662ae7150 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/service.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/service_running.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/service_running.png Binary files differnew file mode 100644 index 00000000000..98ceeee5f66 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/service_running.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/service_template.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/service_template.png Binary files differnew file mode 100644 index 00000000000..33975d1b948 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/service_template.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/start.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/start.png Binary files differnew file mode 100644 index 00000000000..a3d6af90855 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/start.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/stop.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/stop.png Binary files differnew file mode 100644 index 00000000000..87a75102892 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/stop.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/16x16/transparent.png b/java/src/IceGridGUI/src/main/resources/icons/16x16/transparent.png Binary files differnew file mode 100644 index 00000000000..d665e179efd --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/16x16/transparent.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/24x24/back.png b/java/src/IceGridGUI/src/main/resources/icons/24x24/back.png Binary files differnew file mode 100644 index 00000000000..0bf45507068 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/24x24/back.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/24x24/copy.png b/java/src/IceGridGUI/src/main/resources/icons/24x24/copy.png Binary files differnew file mode 100644 index 00000000000..6a95437620e --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/24x24/copy.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/24x24/delete.png b/java/src/IceGridGUI/src/main/resources/icons/24x24/delete.png Binary files differnew file mode 100644 index 00000000000..f1e4441e353 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/24x24/delete.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/24x24/discard.png b/java/src/IceGridGUI/src/main/resources/icons/24x24/discard.png Binary files differnew file mode 100644 index 00000000000..536ead8f2b5 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/24x24/discard.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/24x24/forward.png b/java/src/IceGridGUI/src/main/resources/icons/24x24/forward.png Binary files differnew file mode 100644 index 00000000000..ccd9e70c111 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/24x24/forward.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/24x24/login.png b/java/src/IceGridGUI/src/main/resources/icons/24x24/login.png Binary files differnew file mode 100644 index 00000000000..383b21d459b --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/24x24/login.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/24x24/logout.png b/java/src/IceGridGUI/src/main/resources/icons/24x24/logout.png Binary files differnew file mode 100644 index 00000000000..252eda793ce --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/24x24/logout.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/24x24/move_down.png b/java/src/IceGridGUI/src/main/resources/icons/24x24/move_down.png Binary files differnew file mode 100644 index 00000000000..69021b6d4e5 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/24x24/move_down.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/24x24/move_up.png b/java/src/IceGridGUI/src/main/resources/icons/24x24/move_up.png Binary files differnew file mode 100644 index 00000000000..46411b88110 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/24x24/move_up.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/24x24/open_from_file.png b/java/src/IceGridGUI/src/main/resources/icons/24x24/open_from_file.png Binary files differnew file mode 100644 index 00000000000..d128a11107c --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/24x24/open_from_file.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/24x24/open_from_registry.png b/java/src/IceGridGUI/src/main/resources/icons/24x24/open_from_registry.png Binary files differnew file mode 100644 index 00000000000..2b599a7d7e1 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/24x24/open_from_registry.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/24x24/paste.png b/java/src/IceGridGUI/src/main/resources/icons/24x24/paste.png Binary files differnew file mode 100644 index 00000000000..32108744ce3 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/24x24/paste.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/24x24/save.png b/java/src/IceGridGUI/src/main/resources/icons/24x24/save.png Binary files differnew file mode 100644 index 00000000000..dc9207d54ca --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/24x24/save.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/24x24/save_to_file.png b/java/src/IceGridGUI/src/main/resources/icons/24x24/save_to_file.png Binary files differnew file mode 100644 index 00000000000..cbe8220104a --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/24x24/save_to_file.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/24x24/save_to_registry.png b/java/src/IceGridGUI/src/main/resources/icons/24x24/save_to_registry.png Binary files differnew file mode 100644 index 00000000000..95385c3f420 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/24x24/save_to_registry.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/24x24/save_without_restart.png b/java/src/IceGridGUI/src/main/resources/icons/24x24/save_without_restart.png Binary files differnew file mode 100644 index 00000000000..72e6886df2d --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/24x24/save_without_restart.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/24x24/show_vars.png b/java/src/IceGridGUI/src/main/resources/icons/24x24/show_vars.png Binary files differnew file mode 100644 index 00000000000..37c7e9c49b0 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/24x24/show_vars.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/24x24/substitute.png b/java/src/IceGridGUI/src/main/resources/icons/24x24/substitute.png Binary files differnew file mode 100644 index 00000000000..c030b250d7f --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/24x24/substitute.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/24x24/view_filter.png b/java/src/IceGridGUI/src/main/resources/icons/24x24/view_filter.png Binary files differnew file mode 100644 index 00000000000..fe2ad8d29e4 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/24x24/view_filter.png diff --git a/java/src/IceGridGUI/src/main/resources/icons/icegrid.icns b/java/src/IceGridGUI/src/main/resources/icons/icegrid.icns Binary files differnew file mode 100644 index 00000000000..d9cf0303c46 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/icegrid.icns diff --git a/java/src/IceGridGUI/src/main/resources/icons/icegrid.ico b/java/src/IceGridGUI/src/main/resources/icons/icegrid.ico Binary files differnew file mode 100644 index 00000000000..dc53e47077d --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/icons/icegrid.ico diff --git a/java/src/IceGridGUI/src/main/resources/metrics.cfg b/java/src/IceGridGUI/src/main/resources/metrics.cfg new file mode 100644 index 00000000000..f52598ce9d7 --- /dev/null +++ b/java/src/IceGridGUI/src/main/resources/metrics.cfg @@ -0,0 +1,386 @@ + +# +# Metrics sort +# +IceGridGUI.Metrics = Topic Subscriber Session Dispatch Invocation Connection Thread ConnectionEstablishment EndpointLookup + +# +# Metrics Display Names +# +IceGridGUI.Metrics.Topic = IceStorm Topics +IceGridGUI.Metrics.Subscriber = IceStorm Subscribers +IceGridGUI.Metrics.Dispatch = Operation Dispatch +IceGridGUI.Metrics.Invocation = Invocations +IceGridGUI.Metrics.Connection = Connections +IceGridGUI.Metrics.Thread = Threads +IceGridGUI.Metrics.ConnectionEstablishment = Connection Establishments +IceGridGUI.Metrics.EndpointLookup = Endpoint Lookups +IceGridGUI.Metrics.Session = Glacier2 Sessions + +# +# Dispatch fields +# +IceGridGUI.Metrics.Dispatch.fields = id current total average averageLifetime size replySize userException failures + +IceGridGUI.Metrics.Dispatch.id.columnName = Id +IceGridGUI.Metrics.Dispatch.id.columnToolTip = Identity + +IceGridGUI.Metrics.Dispatch.userException.columnName = UE +IceGridGUI.Metrics.Dispatch.userException.columnToolTip = User exception count + +IceGridGUI.Metrics.Dispatch.current.columnName = Current + +IceGridGUI.Metrics.Dispatch.total.columnName = Total + +IceGridGUI.Metrics.Dispatch.average.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$DeltaAverageMetricsField +IceGridGUI.Metrics.Dispatch.average.dataField = total +IceGridGUI.Metrics.Dispatch.average.columnName = Avg Cnt +IceGridGUI.Metrics.Dispatch.average.columnToolTip = Average dispatch count (count/s) +IceGridGUI.Metrics.Dispatch.average.scaleFactor = 1000.0d + +IceGridGUI.Metrics.Dispatch.averageLifetime.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$AverageLifetimeMetricsField +IceGridGUI.Metrics.Dispatch.averageLifetime.scaleFactor = 1000.0d +IceGridGUI.Metrics.Dispatch.averageLifetime.columnName = Avg LfT +IceGridGUI.Metrics.Dispatch.averageLifetime.columnToolTip = <html>Average dispatch lifetime (ms)<br><br><p style="width: 300px;">The lifetime of a dispatch is the interval between the time the header of the message is read and the time the response is sent to the client.</p></html> + +IceGridGUI.Metrics.Dispatch.size.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$DeltaAverageMetricsField +IceGridGUI.Metrics.Dispatch.size.dataField = size +IceGridGUI.Metrics.Dispatch.size.columnName = Avg Sz +IceGridGUI.Metrics.Dispatch.size.columnToolTip = <html>Average dispatch size (bytes)<br><br><p style="width: 300px;">The size of a dispatch is the size of the request data: object identity, facet name, operation name, mode, context and encapsulation for the request input parameters.</p></html> +IceGridGUI.Metrics.Dispatch.size.scaleFactor = 1000.0d + +IceGridGUI.Metrics.Dispatch.replySize.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$DeltaAverageMetricsField +IceGridGUI.Metrics.Dispatch.replySize.dataField = replySize +IceGridGUI.Metrics.Dispatch.replySize.columnName = Avg ReplySz +IceGridGUI.Metrics.Dispatch.replySize.columnToolTip = <html>Average dispatch reply size (bytes)<br><br><p style="width: 300px;">The size of the reply is the size of the reply data: the reply status byte and the encapsulation for the request output parameters.</p></html> +IceGridGUI.Metrics.Dispatch.replySize.scaleFactor = 1000.0d + +IceGridGUI.Metrics.Dispatch.failures.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$FailuresMetricsField +IceGridGUI.Metrics.Dispatch.failures.columnName = Failures + +# +# Invocation fields +# +IceGridGUI.Metrics.Invocation.fields = id current total remotes collocated average averageLifetime userException failures + +IceGridGUI.Metrics.Invocation.id.columnName = Id +IceGridGUI.Metrics.Invocation.id.columnToolTip = Identity + +IceGridGUI.Metrics.Invocation.userException.columnName = UE +IceGridGUI.Metrics.Invocation.userException.columnToolTip = User exception count + +IceGridGUI.Metrics.Invocation.current.columnName = Current + +IceGridGUI.Metrics.Invocation.total.columnName = Total + +IceGridGUI.Metrics.Invocation.remotes.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$SubMetricsField +IceGridGUI.Metrics.Invocation.remotes.columnName = Remotes + + # + # Remotes sub metric + # + IceGridGUI.Metrics.Invocation.remotes.fields = id current total failures average averageLifetime size replySize + IceGridGUI.Metrics.Invocation.remotes.id.columnName = Id + IceGridGUI.Metrics.Invocation.remotes.id.columnToolTip = Identity + IceGridGUI.Metrics.Invocation.remotes.current.columnName = Current + IceGridGUI.Metrics.Invocation.remotes.total.columnName = Total + IceGridGUI.Metrics.Invocation.remotes.failures.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$FailuresMetricsField + IceGridGUI.Metrics.Invocation.remotes.failures.columnName = Failures + IceGridGUI.Metrics.Invocation.remotes.average.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$DeltaAverageMetricsField + IceGridGUI.Metrics.Invocation.remotes.average.dataField = total + IceGridGUI.Metrics.Invocation.remotes.average.columnName = Avg Cnt + IceGridGUI.Metrics.Invocation.remotes.average.columnToolTip = Average remotes count (count/s) + IceGridGUI.Metrics.Invocation.remotes.average.scaleFactor = 1000.0d + + IceGridGUI.Metrics.Invocation.remotes.averageLifetime.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$AverageLifetimeMetricsField + IceGridGUI.Metrics.Invocation.remotes.averageLifetime.scaleFactor = 1000.0d + IceGridGUI.Metrics.Invocation.remotes.averageLifetime.columnName = Avg LfT + IceGridGUI.Metrics.Invocation.remotes.averageLifetime.columnToolTip = <html>Average remote invocation lifetime (ms)<br><br><p style="width: 300px;">The lifetime starts when the marshalled invocation is passed to the Ice connection for sending and ends when the Ice connection either sent the invocation (for oneway) or received the response (for twoway). This time doesn't include the marshalling of the invocation or un-marshalling of the response.</p></html> + + IceGridGUI.Metrics.Invocation.remotes.size.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$DeltaAverageMetricsField + IceGridGUI.Metrics.Invocation.remotes.size.dataField = size + IceGridGUI.Metrics.Invocation.remotes.size.columnName = Avg Sz + IceGridGUI.Metrics.Invocation.remotes.size.columnToolTip = <html>Average invocation size (bytes)<br><br><p style="width: 300px;">The size of an invocation is the size of the request data: object identity, facet name, operation name, mode, context and encapsulation for the request input parameters.</p></html> + IceGridGUI.Metrics.Invocation.remotes.size.scaleFactor = 1000.0d + + IceGridGUI.Metrics.Invocation.remotes.replySize.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$DeltaAverageMetricsField + IceGridGUI.Metrics.Invocation.remotes.replySize.dataField = replySize + IceGridGUI.Metrics.Invocation.remotes.replySize.columnName = Avg ReplySz + IceGridGUI.Metrics.Invocation.remotes.replySize.columnToolTip = <html>Average invocation reply size (bytes)<br><br><p style="width: 300px;">The size of the reply is the size of the reply data: the reply status byte and the encapsulation for the request output parameters.</p></html> + IceGridGUI.Metrics.Invocation.remotes.replySize.scaleFactor = 1000.0d + +IceGridGUI.Metrics.Invocation.collocated.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$SubMetricsField +IceGridGUI.Metrics.Invocation.collocated.columnName = Collocated + + # + # Collocated sub metric + # + IceGridGUI.Metrics.Invocation.collocated.fields = id current total failures average averageLifetime size replySize + IceGridGUI.Metrics.Invocation.collocated.id.columnName = Id + IceGridGUI.Metrics.Invocation.collocated.id.columnToolTip = Identity + IceGridGUI.Metrics.Invocation.collocated.current.columnName = Current + IceGridGUI.Metrics.Invocation.collocated.total.columnName = Total + IceGridGUI.Metrics.Invocation.collocated.failures.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$FailuresMetricsField + IceGridGUI.Metrics.Invocation.collocated.failures.columnName = Failures + IceGridGUI.Metrics.Invocation.collocated.average.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$DeltaAverageMetricsField + IceGridGUI.Metrics.Invocation.collocated.average.dataField = total + IceGridGUI.Metrics.Invocation.collocated.average.columnName = Avg Cnt + IceGridGUI.Metrics.Invocation.collocated.average.columnToolTip = Average collocated count (count/s) + IceGridGUI.Metrics.Invocation.collocated.average.scaleFactor = 1000.0d + + IceGridGUI.Metrics.Invocation.collocated.averageLifetime.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$AverageLifetimeMetricsField + IceGridGUI.Metrics.Invocation.collocated.averageLifetime.scaleFactor = 1000.0d + IceGridGUI.Metrics.Invocation.collocated.averageLifetime.columnName = Avg LfT + IceGridGUI.Metrics.Invocation.collocated.averageLifetime.columnToolTip = <html>Average remote invocation lifetime (ms)<br><br><p style="width: 300px;">The lifetime starts when the marshalled invocation is passed to the Ice connection for sending and ends when the Ice connection either sent the invocation (for oneway) or received the response (for twoway). This time doesn't include the marshalling of the invocation or un-marshalling of the response.</p></html> + + IceGridGUI.Metrics.Invocation.collocated.size.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$DeltaAverageMetricsField + IceGridGUI.Metrics.Invocation.collocated.size.dataField = size + IceGridGUI.Metrics.Invocation.collocated.size.columnName = Avg Sz + IceGridGUI.Metrics.Invocation.collocated.size.columnToolTip = <html>Average invocation size (bytes)<br><br><p style="width: 300px;">The size of an invocation is the size of the request data: object identity, facet name, operation name, mode, context and encapsulation for the request input parameters.</p></html> + IceGridGUI.Metrics.Invocation.collocated.size.scaleFactor = 1000.0d + + IceGridGUI.Metrics.Invocation.collocated.replySize.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$DeltaAverageMetricsField + IceGridGUI.Metrics.Invocation.collocated.replySize.dataField = replySize + IceGridGUI.Metrics.Invocation.collocated.replySize.columnName = Avg ReplySz + IceGridGUI.Metrics.Invocation.collocated.replySize.columnToolTip = <html>Average invocation reply size (bytes)<br><br><p style="width: 300px;">The size of the reply is the size of the reply data: the reply status byte and the encapsulation for the request output parameters.</p></html> + IceGridGUI.Metrics.Invocation.collocated.replySize.scaleFactor = 1000.0d + +IceGridGUI.Metrics.Invocation.average.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$DeltaAverageMetricsField +IceGridGUI.Metrics.Invocation.average.dataField = total +IceGridGUI.Metrics.Invocation.average.columnName = Avg Cnt +IceGridGUI.Metrics.Invocation.average.columnToolTip = Average invocation count (count/s) +IceGridGUI.Metrics.Invocation.average.scaleFactor = 1000.0d + +IceGridGUI.Metrics.Invocation.averageLifetime.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$AverageLifetimeMetricsField +IceGridGUI.Metrics.Invocation.averageLifetime.scaleFactor = 1000.0d +IceGridGUI.Metrics.Invocation.averageLifetime.columnName = Avg LfT +IceGridGUI.Metrics.Invocation.averageLifetime.columnToolTip = <html>Average invocation lifetime (ms)<br><br><p style="width: 300px;">The lifetime starts when the invocation is called on the proxy and ends when it completes. A synchronous operation completes when it returns. An Asynchronous operations completes when the AMI response or exception callback return.</p></html> + +IceGridGUI.Metrics.Invocation.failures.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$FailuresMetricsField +IceGridGUI.Metrics.Invocation.failures.columnName = Failures + +# +# Connection fields +# +IceGridGUI.Metrics.Connection.fields = id current total receivedBytes receivedSpeed sentBytes sentSpeed average averageLifetime failures + +IceGridGUI.Metrics.Connection.id.columnName = Id +IceGridGUI.Metrics.Connection.id.columnToolTip = Identity + +IceGridGUI.Metrics.Connection.current.columnName = Current + +IceGridGUI.Metrics.Connection.total.columnName = Total + +IceGridGUI.Metrics.Connection.receivedBytes.columnName = Rx +IceGridGUI.Metrics.Connection.receivedBytes.columnToolTip = Received bytes (bytes) + +IceGridGUI.Metrics.Connection.receivedSpeed.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$DeltaAverageMetricsField +IceGridGUI.Metrics.Connection.receivedSpeed.dataField = receivedBytes +IceGridGUI.Metrics.Connection.receivedSpeed.columnName = Rx Bw +IceGridGUI.Metrics.Connection.receivedSpeed.columnToolTip = Receive bandwidth (bytes/s) +IceGridGUI.Metrics.Connection.receivedSpeed.scaleFactor = 1000.0d + +IceGridGUI.Metrics.Connection.sentBytes.columnName = Tx +IceGridGUI.Metrics.Connection.sentBytes.columnToolTip = Sent bytes (bytes) + +IceGridGUI.Metrics.Connection.sentSpeed.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$DeltaAverageMetricsField +IceGridGUI.Metrics.Connection.sentSpeed.dataField = sentBytes +IceGridGUI.Metrics.Connection.sentSpeed.columnName = Tx Bw +IceGridGUI.Metrics.Connection.sentSpeed.columnToolTip = Send bandwidth (bytes/s) +IceGridGUI.Metrics.Connection.sentSpeed.scaleFactor = 1000.0d + +IceGridGUI.Metrics.Connection.average.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$DeltaAverageMetricsField +IceGridGUI.Metrics.Connection.average.dataField = total +IceGridGUI.Metrics.Connection.average.columnName = Avg Cnt +IceGridGUI.Metrics.Connection.average.columnToolTip = Average connection count (count/s) +IceGridGUI.Metrics.Connection.average.scaleFactor = 1000.0d + +IceGridGUI.Metrics.Connection.averageLifetime.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$AverageLifetimeMetricsField +IceGridGUI.Metrics.Connection.averageLifetime.scaleFactor = 1000000.0d +IceGridGUI.Metrics.Connection.averageLifetime.columnName = Avg LfT +IceGridGUI.Metrics.Connection.averageLifetime.columnToolTip = Average connection lifetime (s) + +IceGridGUI.Metrics.Connection.failures.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$FailuresMetricsField +IceGridGUI.Metrics.Connection.failures.columnName = Failures + +# +# Thread fields +# +IceGridGUI.Metrics.Thread.fields = id current total inUseForIO inUseForUser inUseForOther failures + +IceGridGUI.Metrics.Thread.id.columnName = Id +IceGridGUI.Metrics.Thread.id.columnToolTip = Identity + +IceGridGUI.Metrics.Thread.current.columnName = Current + +IceGridGUI.Metrics.Thread.total.columnName = Total + +IceGridGUI.Metrics.Thread.inUseForIO.columnName = IO +IceGridGUI.Metrics.Thread.inUseForIO.columnToolTip = In Use For IO + +IceGridGUI.Metrics.Thread.inUseForUser.columnName = User +IceGridGUI.Metrics.Thread.inUseForUser.columnToolTip = In Use For User + +IceGridGUI.Metrics.Thread.inUseForOther.columnName = Other +IceGridGUI.Metrics.Thread.inUseForOther.columnToolTip = In Use For Other + +IceGridGUI.Metrics.Thread.failures.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$FailuresMetricsField +IceGridGUI.Metrics.Thread.failures.columnName = Failures + +# +# ConnectionEstablishment fields +# +IceGridGUI.Metrics.ConnectionEstablishment.fields = id current total failures + +IceGridGUI.Metrics.ConnectionEstablishment.id.columnName = Id +IceGridGUI.Metrics.ConnectionEstablishment.id.columnToolTip = Identity + +IceGridGUI.Metrics.ConnectionEstablishment.current.columnName = Current + +IceGridGUI.Metrics.ConnectionEstablishment.total.columnName = Total + +IceGridGUI.Metrics.ConnectionEstablishment.failures.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$FailuresMetricsField +IceGridGUI.Metrics.ConnectionEstablishment.failures.columnName = Failures + +# +# EndpointLookup fields +# +IceGridGUI.Metrics.EndpointLookup.fields = id current total average averageLifetime failures + +IceGridGUI.Metrics.EndpointLookup.id.columnName = Id +IceGridGUI.Metrics.EndpointLookup.id.columnToolTip = Identity + +IceGridGUI.Metrics.EndpointLookup.current.columnName = Current + +IceGridGUI.Metrics.EndpointLookup.total.columnName = Total + +IceGridGUI.Metrics.EndpointLookup.average.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$DeltaAverageMetricsField +IceGridGUI.Metrics.EndpointLookup.average.dataField = total +IceGridGUI.Metrics.EndpointLookup.average.columnName = Avg Cnt +IceGridGUI.Metrics.EndpointLookup.average.columnToolTip = Average endpoint lookup count (count/s) +IceGridGUI.Metrics.EndpointLookup.average.scaleFactor = 1000.0d + +IceGridGUI.Metrics.EndpointLookup.averageLifetime.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$AverageLifetimeMetricsField +IceGridGUI.Metrics.EndpointLookup.averageLifetime.scaleFactor = 1000.0d +IceGridGUI.Metrics.EndpointLookup.averageLifetime.columnName = Avg LfT +IceGridGUI.Metrics.EndpointLookup.averageLifetime.columnToolTip = Average endpoint lookup lifetime (ms) + +IceGridGUI.Metrics.EndpointLookup.failures.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$FailuresMetricsField +IceGridGUI.Metrics.EndpointLookup.failures.columnName = Failures + +# +# IceStorm Topic fields +# +IceGridGUI.Metrics.Topic.fields = id current total published forwarded averageLifetime failures + +IceGridGUI.Metrics.Topic.id.columnName = Id +IceGridGUI.Metrics.Topic.id.columnToolTip = Identity + +IceGridGUI.Metrics.Topic.current.columnName = Current + +IceGridGUI.Metrics.Topic.total.columnName = Total + +IceGridGUI.Metrics.Topic.published.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$DeltaAverageMetricsField +IceGridGUI.Metrics.Topic.published.dataField = published +IceGridGUI.Metrics.Topic.published.columnName = Published +IceGridGUI.Metrics.Topic.published.columnToolTip = <html>Average published event count (count/s)<br><br><p style="width: 300px;">Published events are received over the topic publisher object.</p></html> +IceGridGUI.Metrics.Topic.published.scaleFactor = 1000.0d + +IceGridGUI.Metrics.Topic.forwarded.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$DeltaAverageMetricsField +IceGridGUI.Metrics.Topic.forwarded.dataField = forwarded +IceGridGUI.Metrics.Topic.forwarded.columnName = Forwarded +IceGridGUI.Metrics.Topic.forwarded.columnToolTip = <html>Average forwarded event count (count/s)<br><br><p style="width: 300px;">Forwarded events are received from linked topics.</p></html> +IceGridGUI.Metrics.Topic.forwarded.scaleFactor = 1000.0d + +IceGridGUI.Metrics.Topic.averageLifetime.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$AverageLifetimeMetricsField +IceGridGUI.Metrics.Topic.averageLifetime.scaleFactor = 1000.0d +IceGridGUI.Metrics.Topic.averageLifetime.columnName = Avg LfT +IceGridGUI.Metrics.Topic.averageLifetime.columnToolTip = Average topic lifetime (ms) + +IceGridGUI.Metrics.Topic.failures.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$FailuresMetricsField +IceGridGUI.Metrics.Topic.failures.columnName = Failures + +# +# IceStorm Subscriber fields +# +IceGridGUI.Metrics.Subscriber.fields = id current total queued outstanding delivered averageLifetime failures + +IceGridGUI.Metrics.Subscriber.id.columnName = Identity + +IceGridGUI.Metrics.Subscriber.current.columnName = Current + +IceGridGUI.Metrics.Subscriber.total.columnName = Total + +IceGridGUI.Metrics.Subscriber.queued.dataField = queued +IceGridGUI.Metrics.Subscriber.queued.columnName = Queued +IceGridGUI.Metrics.Subscriber.queued.columnToolTip = <html>Queued event count<br><br><p style="width: 300px;">Queued events are events waiting to be sent to the subscriber.</p></html> + +IceGridGUI.Metrics.Subscriber.outstanding.dataField = outstanding +IceGridGUI.Metrics.Subscriber.outstanding.columnName = Outstanding +IceGridGUI.Metrics.Subscriber.outstanding.columnToolTip = <html>Outstanding event count<br><br><p style="width: 300px;">Outstanding event are event which were sent by not yet delivered to the subcriber.</p></html> + +IceGridGUI.Metrics.Subscriber.delivered.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$DeltaAverageMetricsField +IceGridGUI.Metrics.Subscriber.delivered.dataField = delivered +IceGridGUI.Metrics.Subscriber.delivered.columnName = Delivered +IceGridGUI.Metrics.Subscriber.delivered.columnToolTip = Average delivered event count (count/s) +IceGridGUI.Metrics.Subscriber.delivered.scaleFactor = 1000.0d + +IceGridGUI.Metrics.Subscriber.averageLifetime.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$AverageLifetimeMetricsField +IceGridGUI.Metrics.Subscriber.averageLifetime.scaleFactor = 1000.0d +IceGridGUI.Metrics.Subscriber.averageLifetime.columnName = Avg LfT +IceGridGUI.Metrics.Subscriber.averageLifetime.columnToolTip = Average subscriber lifetime (ms) + +IceGridGUI.Metrics.Subscriber.failures.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$FailuresMetricsField +IceGridGUI.Metrics.Subscriber.failures.columnName = Failures + +# +# Glacier2 session fields +# +IceGridGUI.Metrics.Session.fields = id current total routingTableSize forwardedClient queuedClient overriddenClient forwardedServer queuedServer overriddenServer averageLifetime failures + +IceGridGUI.Metrics.Session.id.columnName = Identity + +IceGridGUI.Metrics.Session.current.columnName = Current + +IceGridGUI.Metrics.Session.total.columnName = Total + +IceGridGUI.Metrics.Session.routingTableSize.columnName = RT Sz +IceGridGUI.Metrics.Session.routingTableSize.columnToolTip = Routing table size + +IceGridGUI.Metrics.Session.forwardedClient.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$DeltaAverageMetricsField +IceGridGUI.Metrics.Session.forwardedClient.dataField = forwardedClient +IceGridGUI.Metrics.Session.forwardedClient.columnName = Clt Fwd +IceGridGUI.Metrics.Session.forwardedClient.columnToolTip = Average forwarded request count on the client side (count/s) +IceGridGUI.Metrics.Session.forwardedClient.scaleFactor = 1000.0d + +IceGridGUI.Metrics.Session.queuedClient.columnName = Clt Qd +IceGridGUI.Metrics.Session.queuedClient.columnToolTip = Queued request count on the client side + +IceGridGUI.Metrics.Session.overriddenClient.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$DeltaAverageMetricsField +IceGridGUI.Metrics.Session.overriddenClient.dataField = overriddenClient +IceGridGUI.Metrics.Session.overriddenClient.columnName = Clt Ovrd +IceGridGUI.Metrics.Session.overriddenClient.columnToolTip = Average overridden request count on the client side (count/s) +IceGridGUI.Metrics.Session.overriddenClient.scaleFactor = 1000.0d + +IceGridGUI.Metrics.Session.forwardedServer.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$DeltaAverageMetricsField +IceGridGUI.Metrics.Session.forwardedServer.dataField = forwardedServer +IceGridGUI.Metrics.Session.forwardedServer.columnName = Srv Fwd +IceGridGUI.Metrics.Session.forwardedServer.columnToolTip = Average forwarded request count on the server side (count/s) +IceGridGUI.Metrics.Session.forwardedServer.scaleFactor = 1000.0d + +IceGridGUI.Metrics.Session.queuedServer.columnName = Srv Qd +IceGridGUI.Metrics.Session.queuedServer.columnToolTip = Queued request count on the server side + +IceGridGUI.Metrics.Session.overriddenServer.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$DeltaAverageMetricsField +IceGridGUI.Metrics.Session.overriddenServer.dataField = overriddenServer +IceGridGUI.Metrics.Session.overriddenServer.columnName = Srv Ovrd +IceGridGUI.Metrics.Session.overriddenServer.columnToolTip = Average overridden request count on the server side (count/s) +IceGridGUI.Metrics.Session.overriddenServer.scaleFactor = 1000.0d + +IceGridGUI.Metrics.Session.averageLifetime.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$AverageLifetimeMetricsField +IceGridGUI.Metrics.Session.averageLifetime.scaleFactor = 1000.0d +IceGridGUI.Metrics.Session.averageLifetime.columnName = Avg LfT +IceGridGUI.Metrics.Session.averageLifetime.columnToolTip = Average session lifetime (ms) + +IceGridGUI.Metrics.Session.failures.fieldClass = IceGridGUI.LiveDeployment.MetricsViewEditor$FailuresMetricsField +IceGridGUI.Metrics.Session.failures.columnName = Failures diff --git a/java/src/IceGridGUI/src_IceGridGUI.iml b/java/src/IceGridGUI/src_IceGridGUI.iml new file mode 100644 index 00000000000..e5c74c4cdd7 --- /dev/null +++ b/java/src/IceGridGUI/src_IceGridGUI.iml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/build/classes/main" /> + <output-test url="file://$MODULE_DIR$/build/classes/test" /> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> + <excludeFolder url="file://$MODULE_DIR$/.gradle" /> + <excludeFolder url="file://$MODULE_DIR$/build" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="src_Ice" exported="" /> + <orderEntry type="module" module-name="src_IceBox" exported="" /> + <orderEntry type="module" module-name="src_IceGrid" exported="" /> + <orderEntry type="library" exported="" name="Gradle: jgoodies-common-1.8.0" level="project" /> + <orderEntry type="library" exported="" name="Gradle: jgoodies-looks-2.6.0" level="project" /> + <orderEntry type="library" exported="" name="Gradle: jgoodies-forms-1.8.0" level="project" /> + </component> +</module> + diff --git a/java/src/IcePatch2/build.gradle b/java/src/IcePatch2/build.gradle new file mode 100644 index 00000000000..e0d87342420 --- /dev/null +++ b/java/src/IcePatch2/build.gradle @@ -0,0 +1,27 @@ +slice { + java { + include = ["${sliceDir}"] + args = "--ice --tie --checksum IcePatch2.SliceChecksums" + files = fileTree(dir: "$sliceDir/IcePatch2", includes:['*.ice'], excludes:["*F.ice"]) + } +} + +idea.module { + excludeDirs -= file(buildDir) + buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it } +} + +dependencies { + compile project(':src/Ice') +} + +jar { + archiveName = "IcePatch2.jar" + destinationDir = new File("$rootProject.projectDir/lib/") +} + +task copyJars(type: Copy) { + from new File("$rootProject.projectDir/lib/IcePatch2.jar") + into "${prefix}/lib" +} +task install(dependsOn: copyJars) diff --git a/java/src/IcePatch2/src_IcePatch2.iml b/java/src/IcePatch2/src_IcePatch2.iml new file mode 100644 index 00000000000..f9a8f3d8110 --- /dev/null +++ b/java/src/IcePatch2/src_IcePatch2.iml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/build/classes/main" /> + <output-test url="file://$MODULE_DIR$/build/classes/test" /> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> + <excludeFolder url="file://$MODULE_DIR$/.gradle" /> + <excludeFolder url="file://$MODULE_DIR$/build/classes" /> + <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" /> + <excludeFolder url="file://$MODULE_DIR$/build/tmp" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="src_Ice" exported="" /> + </component> +</module> + diff --git a/java/src/IceStorm/build.gradle b/java/src/IceStorm/build.gradle new file mode 100644 index 00000000000..2c11e4de956 --- /dev/null +++ b/java/src/IceStorm/build.gradle @@ -0,0 +1,27 @@ +slice { + java { + include = ["${sliceDir}"] + args = "--ice --tie --checksum IceStorm.SliceChecksums" + files = fileTree(dir: "$sliceDir/IceStorm", includes:['*.ice'], excludes:["*F.ice"]) + } +} + +idea.module { + excludeDirs -= file(buildDir) + buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it } +} + +dependencies { + compile project(':src/Ice') +} + +jar { + archiveName = "IceStorm.jar" + destinationDir = new File("$rootProject.projectDir/lib/") +} + +task copyJars(type: Copy) { + from new File("$rootProject.projectDir/lib/IceStorm.jar") + into "${prefix}/lib" +} +task install(dependsOn: copyJars) diff --git a/java/src/IceStorm/src_IceStorm.iml b/java/src/IceStorm/src_IceStorm.iml new file mode 100644 index 00000000000..f9a8f3d8110 --- /dev/null +++ b/java/src/IceStorm/src_IceStorm.iml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="java" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/build/classes/main" /> + <output-test url="file://$MODULE_DIR$/build/classes/test" /> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> + <excludeFolder url="file://$MODULE_DIR$/.gradle" /> + <excludeFolder url="file://$MODULE_DIR$/build/classes" /> + <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" /> + <excludeFolder url="file://$MODULE_DIR$/build/tmp" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="src_Ice" exported="" /> + </component> +</module> + |
